whycrzh
2021-01-20 95f9967a7d602f8194cc8ebf6a679c6f84b9bbb1
update userTask.byTask
2个文件已修改
116 ■■■■■ 已修改文件
src/main/java/com/fgkj/services/User_taskService.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/UserTaskMapper.xml 101 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fgkj/services/User_taskService.java
@@ -499,8 +499,21 @@
    public ServiceModel serchByTask(Task_Batt_Test tbt){
        ServiceModel model = new ServiceModel();
        List<Task_Batt_Test> list=mapper.serchByTask(tbt);
        System.out.println(list.size());
        for (int i = 0; i < list.size(); i++) {
            PageBean pageBean = new PageBean();
            list.get(i).setPageBean(pageBean);
            list.get(i).setUinf(new User_inf());//封装结果集原有
        }
//        System.out.println(list.size());
        int index = 0;
        if(list!=null&&list.size()>0){
            System.out.println("tbt.getPageBean() = " + tbt.getPageBean());
            int i1 = (tbt.getPageBean().getPageCurr() - 1) * tbt.getPageBean().getPageSize();
            int i2 = tbt.getPageBean().getPageSize() * tbt.getPageBean().getPageCurr();
            for (int i = i1; i < i2 && i < list.size(); i++) {
                list.get(index++).getPageBean().setPageAll(list.size());
            }
            for(int i=0;i<list.size();i++){
                list.get(i).getUinf().setuName(UtilityFactory.UidsToUnames(list.get(i).getBinf().getStationName1()));
            }
src/main/resources/mapper/UserTaskMapper.xml
@@ -51,6 +51,70 @@
        <association property="binf" javaType="BattInf"></association>
        <association property="pageBean" javaType="Page"></association>
    </resultMap>
    <resultMap id="BaseResultMaptestcheck" type="Task_Batt_Test">
        <association property="utest" javaType="User_task_batt_test">
            <result column="num" property="num"></result>
            <result column="task_id" property="task_id"></result>
            <result column="task_usr_ids" property="task_usr_ids"></result>
            <result column="battgroupid" property="battGroupId"></result>
            <result column="task_enabled" property="task_enabled"></result>
            <result column="task_exe_date" property="task_exe_date"></result>
            <result column="task_close_date" property="task_close_date"></result>
            <result column="task_notice_starttime" property="task_notice_starttime"></result>
            <result column="task_notice_endtime" property="task_notice_endtime"></result>
            <result column="task_notice_count" property="task_notice_count"></result>
            <result column="task_notice_latesttime" property="task_notice_latesttime"></result>
            <result column="task_notice_master" property="task_notice_master"></result>
            <result column="test_complete" property="test_complete"></result>
            <result column="test_completetime" property="test_completetime"></result>
            <result column="test_starttime" property="test_starttime"></result>
            <result column="test_record_count_id" property="test_record_count_id"></result>
            <result column="note" property="note"></result>
        </association>
        <association property="ucheck" javaType="User_task_batt_check">
            <result column="num" property="num"></result>
            <result column="task_id" property="task_id"></result>
            <result column="task_usr_ids" property="task_usr_ids"></result>
            <result column="BattGroupId" property="battGroupId"></result>
            <result column="task_enabled" property="task_enabled"></result>
            <result column="task_exe_date" property="task_exe_date"></result>
            <result column="task_close_date" property="task_close_date"></result>
            <result column="test_complete" property="test_complete"></result>
            <result column="test_completetime" property="test_completetime"></result>
            <result column="batt_clean_done" property="batt_clean_done"></result>
            <result column="batt_clean_done_result" property="batt_clean_done_result"></result>
            <result column="batt_clean_done_recheck" property="batt_clean_done_recheck"></result>
            <result column="batt_clean_done_recheck_result" property="batt_clean_done_recheck_result"></result>
            <result column="batt_clean_done_recheck_check" property="batt_clean_done_recheck_check"></result>
            <result column="batt_clean_done_recheck_check_result" property="batt_clean_done_recheck_check_result"></result>
            <result column="battvol_tempe_done" property="battvol_tempe_done"></result>
            <result column="battvol_tempe_done_result" property="battvol_tempe_done_result"></result>
            <result column="battvol_tempe_done_recheck" property="battvol_tempe_done_recheck"></result>
            <result column="battvol_tempe_done_recheck_result" property="battvol_tempe_done_recheck_result"></result>
            <result column="battvol_tempe_done_recheck_check" property="battvol_tempe_done_recheck_check"></result>
            <result column="battvol_tempe_done_recheck_check_result" property="battvol_tempe_done_recheck_check_result"></result>
            <result column="battfault_check_done" property="battfault_check_done"></result>
            <result column="battfault_check_done_result" property="battfault_check_done_result"></result>
            <result column="battfault_check_done_recheck" property="battfault_check_done_recheck"></result>
            <result column="battfault_check_done_recheck_result" property="battfault_check_done_recheck_result"></result>
            <result column="battfault_check_done_recheck_check" property="battfault_check_done_recheck_check"></result>
            <result column="battfault_check_done_recheck_check_result" property="battfault_check_done_recheck_check_result"></result>
        </association>
        <association property="uinf" javaType="User_inf">
        </association>
        <association property="binf" javaType="BattInf">
            <result column="battGroupId" property="battGroupId"></result>
            <result column="stationName" property="stationName"></result>
            <result column="battGroupName" property="battGroupName"></result>
            <result column="task_usr_ids" property="stationName1"></result>
        </association>
        <association property="pageBean" javaType="Page">
        </association>
    </resultMap>
    <!--
    public List getResults(ResultSet rs) {
        List list=new ArrayList();
@@ -825,6 +889,41 @@
        </if>
        order by task_start_date desc
    </select>
    <select id="serchByTask" resultType="java.util.List"></select>
    <select id="serchByTask" resultMap="BaseResultMaptestcheck">
        <if test="utask.task_type!=2">
            select distinct(tb_user_task.task_id)
            ,tb_user_task_batt_test.num,task_usr_ids,tb_user_task_batt_test.BattGroupId,tb_user_task_batt_test.task_enabled,task_exe_date,tb_user_task_batt_test.task_close_date,tb_user_task_batt_test.task_notice_starttime,tb_user_task_batt_test.task_notice_endtime,tb_user_task_batt_test.task_notice_count,tb_user_task_batt_test.task_notice_latesttime,task_notice_master,test_complete,test_completetime,test_starttime,test_record_count_id,tb_user_task_batt_test.note,stationname
            ,battgroupname from db_user.tb_user_task,db_battinf.tb_battinf,db_user.tb_user_task_batt_test where
            tb_user_task.task_id=tb_user_task_batt_test.task_id and
            tb_user_task_batt_test.BattGroupId=db_battinf.tb_battinf.BattGroupId and stationname1 like
            '%${binf.stationName1}%' and stationname
            like '%${binf.stationName}%' and task_type=#{utask.task_type} and (task_complete_date)<![CDATA[>=]]>
            (#{utask.task_complete_date}) and (task_complete_date) <![CDATA[<=]]>
            (#{utask.task_complete_date1}) and (task_exe_date)>=(#{utest.task_exe_date})
            and (task_exe_date) <![CDATA[<=]]> (#{utest.task_exe_date1}) and tb_user_task_batt_test.task_usr_ids like
            '%${utest.task_usr_ids}%'
        </if>
        <if test="utask.task_type==2">
            select distinct(tb_user_task.task_id),
            tb_user_task_batt_check.num,task_usr_ids,tb_user_task_batt_check.BattGroupId,tb_user_task_batt_check.task_enabled,task_exe_date,tb_user_task_batt_check.task_close_date,test_complete,test_completetime,batt_clean_done,batt_clean_done_result,batt_clean_done_recheck,batt_clean_done_recheck_result,batt_clean_done_recheck_check,batt_clean_done_recheck_check_result,battvol_tempe_done,battvol_tempe_done_result,battvol_tempe_done_recheck,battvol_tempe_done_recheck_result,battvol_tempe_done_recheck_check,battvol_tempe_done_recheck_check_result,battfault_check_done,battfault_check_done_result,battfault_check_done_recheck,battfault_check_done_recheck_result,battfault_check_done_recheck_check,battfault_check_done_recheck_check_result,stationname
            ,battgroupname from
            db_user.tb_user_task,db_battinf.tb_battinf,db_user.tb_user_task_batt_check,db_user.tb_user_task_user_list
            where tb_user_task.task_id=tb_user_task_batt_check.task_id and
            tb_user_task_batt_check.BattGroupId=db_battinf.tb_battinf.BattGroupId and stationname1 like
            '%${binf.stationName1}%'
              and  stationname like '%${binf.stationName}%' and task_type=#{utask.task_type} and
            (task_complete_date)>=(#{utask.task_complete_date}) and (task_complete_date) <![CDATA[<=]]>
            (#{utask.task_complete_date1})
            and
            (task_exe_date)>=(#{ucheck.task_exe_date}) and (task_exe_date) <![CDATA[<=]]> (#{ucheck.task_exe_date1}) and
            tb_user_task_batt_check.task_usr_ids like '%${ucheck.task_usr_ids}%'
        </if>
        <if test="utask.task_complete==100"> and tb_user_task.task_complete!=#{utask.task_complete} </if>
        <if test="utask.task_complete!=100"> and tb_user_task.task_complete=#{utask.task_complete} </if>
        <if test="binf.battGroupId==0">and db_battinf.tb_battinf.BattGroupId!=#{binf.battGroupId}</if>
        <if test="binf.battGroupId!=0">and db_battinf.tb_battinf.BattGroupId=#{binf.battGroupId}</if>
        order by tb_user_task.task_id,db_battinf.tb_battinf.BattGroupId
    </select>
    <select id="serchMaxId" resultType="java.util.List"></select>
</mapper>