update User_task_batt_test and relatedReference

whycrzh

2021-01-26 850831885dfd3e617517b216f0d4752a6e791bcd

update User_task_batt_test and relatedReference

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

@@ -26,7 +26,6 @@
    
    public User_task_batt_template() {
        super();
        // TODO Auto-generated constructor stub
    }
    public Integer getTemplate_id() {
        return template_id;

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

@@ -11,7 +11,7 @@
    private Integer num;
    private Integer task_id;
    private String task_usr_ids;
    private Integer BattGroupId;
    private Integer battGroupId;
    private Integer task_enabled;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "Asia/Shanghai")
    private Date task_exe_date;
@@ -57,12 +57,15 @@
    public void setTask_usr_ids(String task_usr_ids) {
        this.task_usr_ids = task_usr_ids;
    }

    public Integer getBattGroupId() {
        return BattGroupId;
        return battGroupId;
    }

    public void setBattGroupId(Integer battGroupId) {
        BattGroupId = battGroupId;
        this.battGroupId = battGroupId;
    }

    public Integer getTask_enabled() {
        return task_enabled;
    }
@@ -148,24 +151,28 @@
    public void setNote(String note) {
        this.note = note;
    }

    @Override
    public String toString() {
        return "User_task_batt_test [num=" + num + ", task_id=" + task_id
                + ", task_usr_ids=" + task_usr_ids + ", BattGroupId="
                + BattGroupId + ", task_enabled=" + task_enabled
                + ", task_exe_date=" + task_exe_date + ", task_exe_date1="
                + task_exe_date1 + ", task_close_date=" + task_close_date
                + ", task_notice_starttime=" + task_notice_starttime
                + ", task_notice_endtime=" + task_notice_endtime
                + ", task_notice_count=" + task_notice_count
                + ", task_notice_latesttime=" + task_notice_latesttime
                + ", task_notice_master=" + task_notice_master
                + ", test_complete=" + test_complete + ", test_completetime="
                + test_completetime + ", test_starttime=" + test_starttime
                + ", test_record_count_id=" + test_record_count_id + ", note="
                + note + "]";
        return "User_task_batt_test{" +
                "num=" + num +
                ", task_id=" + task_id +
                ", task_usr_ids='" + task_usr_ids + '\'' +
                ", battGroupId=" + battGroupId +
                ", task_enabled=" + task_enabled +
                ", task_exe_date=" + task_exe_date +
                ", task_exe_date1=" + task_exe_date1 +
                ", task_close_date=" + task_close_date +
                ", task_notice_starttime=" + task_notice_starttime +
                ", task_notice_endtime=" + task_notice_endtime +
                ", task_notice_count=" + task_notice_count +
                ", task_notice_latesttime=" + task_notice_latesttime +
                ", task_notice_master=" + task_notice_master +
                ", test_complete=" + test_complete +
                ", test_completetime=" + test_completetime +
                ", test_starttime=" + test_starttime +
                ", test_record_count_id=" + test_record_count_id +
                ", note='" + note + '\'' +
                '}';
    }
	
	

}

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

@@ -51,7 +51,7 @@
            "from db_user.tb_user_inf ,db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr " +
            "where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id " +
            "and db_user.tb_user_battgroup_baojigroup_usr.uId=db_user.tb_user_inf.uid " +
            "and db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=#{BattGroupId} and db_user.tb_user_inf.uBaojiUsr=1 ")
            "and db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=#{battGroupId} and db_user.tb_user_inf.uBaojiUsr=1 ")
    public List<User_inf> searchByBattGroupId(User_battgroup_baojigroup_battgroup obj);

    //根据uId查用户姓名

 src/main/resources/mapper/BattInfMapper.xml

@@ -4413,13 +4413,13 @@
            where db_batt_testdata.tb_batttestdata_inf.test_type in(#{tdata.test_type},2,3) and to_days(record_time)>=to_days(#{tdata.record_time}) and
            to_days(record_time) <![CDATA[<=]]> to_days(#{tdata.record_time}))
        </if>
        <if test="binf.BattGroupId==0">
        <if test="binf.battGroupId==0">
            and db_battinf.tb_battinf.battgroupid!=#{binf.battGroupId}
        </if>
        <if test="binf.BattGroupId!=0">
        <if test="binf.battGroupId!=0">
            and db_battinf.tb_battinf.battgroupid=#{binf.battGroupId}
        </if>
        <if test="binf.BattGroupName=='其他'">
        <if test="binf.battGroupName=='其他'">
            and BattGroupName1 like '%${binf.battGroupName1}%'
        </if>
        <if test="binf.BattGroupName!='其他'">