update User_task_change、User_task_user_list and relatedReference

whycrzh

2021-01-26 1b48cb4e5a2a65e66912868b471b81c9dc0a6c82

update User_task_change、User_task_user_list and relatedReference

 src/main/java/com/fgkj/dto/User_task_change.java

@@ -15,7 +15,7 @@
    private Integer change_type_id;
    private Integer task_type_id;
    private Integer task_rc_num;
    private Integer BattgroupId;
    private Integer battgroupId;
    private String change_reason;
    private String old_executor_ids;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "Asia/Shanghai")
@@ -83,12 +83,15 @@
    public void setTask_rc_num(Integer task_rc_num) {
        this.task_rc_num = task_rc_num;
    }

    public Integer getBattgroupId() {
        return BattgroupId;
        return battgroupId;
    }

    public void setBattgroupId(Integer battgroupId) {
        BattgroupId = battgroupId;
        this.battgroupId = battgroupId;
    }

    public String getChange_reason() {
        return change_reason;
    }
@@ -163,27 +166,31 @@
    public void setRemark(String remark) {
        this.remark = remark;
    }

    @Override
    public String toString() {
        return "User_task_change [num=" + num + ", usr_id=" + usr_id
                + ", master_id=" + master_id + ", appoint_uid=" + appoint_uid
                + ", copy_uids=" + copy_uids + ", change_type_id="
                + change_type_id + ", task_type_id=" + task_type_id
                + ", task_rc_num=" + task_rc_num + ", BattgroupId="
                + BattgroupId + ", change_reason=" + change_reason
                + ", old_executor_ids=" + old_executor_ids
                + ", old_task_exe_time=" + old_task_exe_time
                + ", new_executor_ids=" + new_executor_ids
                + ", new_task_exe_time=" + new_task_exe_time
                + ", change_ask_time=" + change_ask_time
                + ", change_ask_time1=" + change_ask_time1
                + ", change_ask_time_limit=" + change_ask_time_limit
                + ", task_change_approve_time=" + task_change_approve_time
                + ", task_change_approve_time1=" + task_change_approve_time1
                + ", task_change_approve_res=" + task_change_approve_res
                + ", remark=" + remark + "]";
        return "User_task_change{" +
                "num=" + num +
                ", usr_id=" + usr_id +
                ", master_id=" + master_id +
                ", appoint_uid=" + appoint_uid +
                ", copy_uids='" + copy_uids + '\'' +
                ", change_type_id=" + change_type_id +
                ", task_type_id=" + task_type_id +
                ", task_rc_num=" + task_rc_num +
                ", battgroupId=" + battgroupId +
                ", change_reason='" + change_reason + '\'' +
                ", old_executor_ids='" + old_executor_ids + '\'' +
                ", old_task_exe_time=" + old_task_exe_time +
                ", new_executor_ids='" + new_executor_ids + '\'' +
                ", new_task_exe_time=" + new_task_exe_time +
                ", change_ask_time=" + change_ask_time +
                ", change_ask_time1=" + change_ask_time1 +
                ", change_ask_time_limit=" + change_ask_time_limit +
                ", task_change_approve_time=" + task_change_approve_time +
                ", task_change_approve_time1=" + task_change_approve_time1 +
                ", task_change_approve_res=" + task_change_approve_res +
                ", remark='" + remark + '\'' +
                '}';
    }
	
	
	
}

 src/main/java/com/fgkj/dto/User_task_user_list.java

@@ -8,7 +8,7 @@
    
    private Integer num;
    private Integer task_id;
    private Integer UId;
    private Integer uId;
    private Integer usr_type;
    public Integer getNum() {
        return num;
@@ -22,21 +22,29 @@
    public void setTask_id(Integer task_id) {
        this.task_id = task_id;
    }

    public Integer getuId() {
        return UId;
        return uId;
    }

    public void setuId(Integer uId) {
        UId = uId;
        this.uId = uId;
    }

    public Integer getUsr_type() {
        return usr_type;
    }
    public void setUsr_type(Integer usr_type) {
        this.usr_type = usr_type;
    }

    @Override
    public String toString() {
        return "User_task_user_list [num=" + num + ", task_id=" + task_id
                + ", UId=" + UId + ", usr_type=" + usr_type + "]";
        return "User_task_user_list{" +
                "num=" + num +
                ", task_id=" + task_id +
                ", uId=" + uId +
                ", usr_type=" + usr_type +
                '}';
    }
}

 src/main/java/com/fgkj/mapper/impl/User_task_user_listMapper.java

@@ -19,7 +19,7 @@

    public List searchAll() ;
    //4.1作业管理----根据task_id查主管姓名和指派人姓名
    @Select("select num,task_id,uid,usr_type from db_user.tb_user_task_user_list where task_id=#{UId}")
    @Select("select num,task_id,uid,usr_type from db_user.tb_user_task_user_list where task_id=#{uId}")
    public List<User_task_user_list> serchByCondition(User_task_user_list obj);

}

 src/main/resources/mapper/BattInfMapper.xml

@@ -4422,7 +4422,7 @@
        <if test="binf.battGroupName=='其他'">
            and BattGroupName1 like '%${binf.battGroupName1}%'
        </if>
        <if test="binf.BattGroupName!='其他'">
        <if test="binf.battGroupName!='其他'">
            and BattGroupName1 not like '%开关电源系统%' and BattGroupName1 not like '%UPS系统%' and BattGroupName1 not like '%${binf.battGroupName1}%'
        </if>
        <if test="binf.monVolStd==0">

 src/main/resources/mapper/UserTaskChangeMapper.xml

@@ -487,7 +487,7 @@
                                                change_ask_time_limit, task_change_approve_time,
                                                task_change_approve_res, remark)
        values (#{usr_id}, #{master_id}, #{appoint_uid}, #{copy_uids}, #{change_type_id}, #{task_type_id},
                #{task_rc_num}, #{BattgroupId}, #{change_reason}, #{old_executor_ids},
                #{task_rc_num}, #{battgroupId}, #{change_reason}, #{old_executor_ids},
                #{old_task_exe_time}, #{new_executor_ids}, #{new_task_exe_time}, #{change_ask_time},
                #{change_ask_time_limit}, #{task_change_approve_time},
                #{task_change_approve_res}, #{remark})
@@ -535,7 +535,7 @@
               </otherwise>
           </choose>
           <choose>
               <when test="binf.BattGroupId==0">
               <when test="binf.battGroupId==0">
                   and db_battinf.tb_battinf.battgroupid!=#{binf.battGroupId}
               </when>
               <otherwise>
@@ -543,11 +543,11 @@
               </otherwise>
           </choose>
           <choose>
               <when test="binf.BattGroupName1=='其他'">
                   and BattGroupName1 like '%${binf.BattGroupName1}%'
               <when test="binf.battGroupName1=='其他'">
                   and BattGroupName1 like '%${binf.battGroupName1}%'
               </when>
               <otherwise>
                   and BattGroupName1 not like '%开关电源系统%' and BattGroupName1 not like '%UPS系统%' and BattGroupName1 not like '%${binf.BattGroupName1}%'
                   and BattGroupName1 not like '%开关电源系统%' and BattGroupName1 not like '%UPS系统%' and BattGroupName1 not like '%${binf.battGroupName1}%'
               </otherwise>
           </choose>
           <choose>