联合巡视任务报告合一

inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java

@@ -1210,6 +1210,20 @@ public class PatrolResultController extends BaseController {
 
                         patrolTaskResultMain.setFileStatus("0");
                         patrolTaskResultMain.setTaskPatrolledId(eqList.get(0).getTaskPatrolledId());
+                        int devCount = tasks.get(0).getDevNo().split(",").length;
+                        if(devCount > 1) {
+                            PatrolTaskResultMain resultMainQuery = new PatrolTaskResultMain();
+                            resultMainQuery.setTaskId(String.valueOf(tasks.get(0).getTaskId()));
+                            //select unified_task_patrolled_id from patrol_task_result_main where task_id = #{taskId} and file_status = 0 and (now() - create_time) <= 120 ORDER BY line_id desc limit 1
+                            String unifiedTaskPatrolledId = iPatrolTaskResultMainService.selectUnifiedTaskPatrolledId(resultMainQuery);
+                            if(unifiedTaskPatrolledId != null) {
+                                patrolTaskResultMain.setUnifiedTaskPatrolledId(unifiedTaskPatrolledId);
+                            } else {
+                                patrolTaskResultMain.setUnifiedTaskPatrolledId(taskResultMain.getTaskId() + "_" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()));
+                            }
+                        } else {
+                            patrolTaskResultMain.setUnifiedTaskPatrolledId(taskResultMain.getTaskId() + "_" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()));
+                        }
                         patrolTaskResultMain.setTaskCode(tasks.get(0).getTaskCode());
                         patrolTaskResultMain.setTaskName(tasks.get(0).getTaskName());
                         patrolTaskResultMain.setTaskType(tasks.get(0).getType());

inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/domain/PatrolTaskResultMain.java

@@ -74,6 +74,8 @@ public class PatrolTaskResultMain extends BaseEntity {
     )
     private String checkPerson;
     private String taskPatrolledId;
+    private String unifiedTaskPatrolledId;
+
     @JsonFormat(
             pattern = "yyyy-MM-dd"
     )

inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/mapper/PatrolTaskResultMainMapper.java

@@ -13,6 +13,8 @@ public interface PatrolTaskResultMainMapper {
 
     List<PatrolTaskResultMain> selectPatrolTaskResultMain(PatrolTaskResultMain resultMain);
 
+    String selectUnifiedTaskPatrolledId(PatrolTaskResultMain resultMain);
+
     int insertPatrolTaskResultMain(PatrolTaskResultMain resultMain);
 
     int updatePatrolTaskResultMain(PatrolTaskResultMain resultMain);

inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/IPatrolTaskResultMainService.java

@@ -11,6 +11,8 @@ public interface IPatrolTaskResultMainService {
 
     List<PatrolTaskResultMain> selectPatrolTaskResultMain(PatrolTaskResultMain patrolTaskResultMain);
 
+    String selectUnifiedTaskPatrolledId(PatrolTaskResultMain patrolTaskResultMain);
+
     int insertPatrolTaskResultMain(PatrolTaskResultMain patrolTaskResultMain);
 
     int updatePatrolTaskResultMain(PatrolTaskResultMain patrolTaskResultMain);

inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/impl/PatrolTaskResultMainServiceImpl.java

@@ -30,6 +30,10 @@ public class PatrolTaskResultMainServiceImpl implements IPatrolTaskResultMainSer
         return this.patrolTaskResultMainMapper.selectPatrolTaskResultMain(patrolTaskResultMain);
     }
 
+    public String selectUnifiedTaskPatrolledId(PatrolTaskResultMain patrolTaskResultMain) {
+        return this.patrolTaskResultMainMapper.selectUnifiedTaskPatrolledId(patrolTaskResultMain);
+    }
+
     public int insertPatrolTaskResultMain(PatrolTaskResultMain patrolTaskResultMain) {
         patrolTaskResultMain.setCreateTime(DateUtils.getNowDate());
         this.patrolTaskResultMainMapper.insertPatrolTaskResultMain(patrolTaskResultMain);

inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java

@@ -670,6 +670,7 @@ public class PatrolTaskStatusController extends BaseController {
         return toAjax(1);
     }
 
+    //设置任务暂停或终止接口
     @GetMapping({"/taskStatusChange"})
     public AjaxResult taskStatusChange(PatrolTaskStatus params) {
         if (StringUtils.isEmpty(params.getLineId() + "")) {

inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskResultMainMapper.xml

@@ -22,12 +22,14 @@
         <result property="checkPerson" column="check_person"/>
         <result property="checkTime" column="check_time"/>
         <result property="taskPatrolledId" column="task_patrolled_id"/>
+        <result property="unifiedTaskPatrolledId" column="unified_task_patrolled_id"/>
     </resultMap>
 
     <sql id="selectPatrolTaskResultMainVo">
         select line_id,
                task_id,
                task_patrolled_id,
+               unified_task_patrolled_id,
                task_name,
                task_code,
                create_time,
@@ -114,6 +116,10 @@
         ORDER BY a.line_id desc
     </select>
 
+    <select id="selectUnifiedTaskPatrolledId" parameterType="PatrolTaskResultMain" resultType="java.lang.String">
+        select unified_task_patrolled_id from patrol_task_result_main where task_id = #{taskId} and file_status = 0 and (now() - create_time) &lt;= 120 ORDER BY line_id desc limit 1
+    </select>
+
     <select id="selectPatrolTaskResultMainByLineId" parameterType="Long" resultMap="PatrolTaskResultMainResult">
         <include refid="selectPatrolTaskResultMainVo"/>
         where line_id = #{lineId}
@@ -151,6 +157,7 @@
             <if test="checkPerson != null">check_person,</if>
             <if test="checkTime != null">check_time,</if>
             <if test="taskPatrolledId != null">task_patrolled_id,</if>
+            <if test="unifiedTaskPatrolledId != null">unified_task_patrolled_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="taskId != null">#{taskId},</if>
@@ -169,6 +176,7 @@
             <if test="checkPerson != null">#{checkPerson},</if>
             <if test="checkTime != null">#{checkTime},</if>
             <if test="taskPatrolledId != null">#{taskPatrolledId},</if>
+            <if test="unifiedTaskPatrolledId != null">#{unifiedTaskPatrolledId},</if>
         </trim>
     </insert>
 
@@ -191,6 +199,7 @@
             <if test="checkPerson != null">check_person = #{checkPerson},</if>
             <if test="checkTime != null">check_time = #{checkTime},</if>
             <if test="taskPatrolledId != null">task_patrolled_id = #{taskPatrolledId},</if>
+            <if test="unifiedTaskPatrolledId != null">unified_task_patrolled_id = #{unifiedTaskPatrolledId},</if>
         </trim>
         where line_id = #{lineId}
     </update>