历史巡查修改

guoshilong

2024-02-26 cb2d91135598d294c2f797671ab0f80a759cd9b5

历史巡查修改

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml

@@ -205,6 +205,8 @@
            <result property="taskId" column="taskId"/>
            <result property="solution" column="solution"/>
            <result property="content" column="content"/>
            <result property="state" column="state"/>
            <result property="recordType" column="recordType"/>
        </collection>
    </resultMap>

@@ -220,8 +222,10 @@
               R.ITEM_ID  AS itemId,
               I.ITEMS_NAME AS itemsName,
               R.TASK_ID AS taskId ,
               R.SOLUTION,
               R.CONTENT
               R.solution,
               R.CONTENT,
               R.STATE,
               R.record_type as recordType
        FROM SM_PATROL_GROUP G
                 LEFT JOIN SM_PATROL_GROUP_ITEM I ON I.GROUP_ID = G.ID
                 LEFT JOIN SM_PATROL_RECORD R ON R.ITEM_ID = I.ID
@@ -235,6 +239,15 @@
        <if test="vo.recordType !=null and vo.recordType !=''">
            AND R.record_type = #{vo.recordType}
        </if>
        <if test="vo.status !=null and vo.status !=''">
            AND R.status = #{vo.status}
        </if>
        <if test="vo.state !=null and vo.state !=''">
            AND R.status = #{vo.state}
        </if>
        <if test="vo.solution !=null and vo.solution !=''">
            AND R.status = #{vo.solution}
        </if>

    </select>


 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java

@@ -170,7 +170,8 @@
            BladeFlow flow = res.getData();
            String taskId = flow.getTaskId();
            String processInstanceId = patrolTask.getProcessInstanceId();
            String comment = patrolTask.getReport() ? "巡查任务发现问题" : "巡查任务完成，未发现问题";
//            String comment = patrolTask.getReport() ? "巡查任务发现问题" : "巡查任务完成，未发现问题";
            String comment = patrolTask.getComment();
            // 创建变量
            Map<String, Object> variables = flow.getVariables();
            if (variables == null) {
@@ -183,8 +184,9 @@
            // 完成任务
            flowClient.completeTask(taskId, processInstanceId, comment, variables);
            //保存巡查记录
            patrolRecordService.saveBatch(patrolTask.getPatrolRecordList());

            if (patrolTask.getPatrolRecordList() != null && patrolTask.getPatrolRecordList().size() > 0){
                patrolRecordService.saveBatch(patrolTask.getPatrolRecordList());
            }

//            //查监测预警表，看是否有这个任务，有的话修改任务状态
//            Boolean finishDamTask = nkyClient.finishTask(patrolTask.getId().toString());

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolTaskVO.java

@@ -70,4 +70,6 @@
    private String lon;

    private String lat;

    private String comment;
}