巡查接口添加

guoshilong

2023-07-26 7baafa1e59f4402688e3323d166906f418592ede

巡查接口添加

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupController.java

@@ -172,4 +172,12 @@
    public R getPatrolGroupByTaskId(String taskId) {
        return R.data(patrolGroupService.getPatrolGroupByTaskId(taskId));
    }

    /**
     * 根据任务id获取巡查组，返回组下的record(web任务详情)
     */
    @GetMapping(value = "/getGroupDTORecord")
    public R getGroupDTORecord(String taskId){
        return R.data(patrolGroupService.getGroupDTORecord(taskId));
    }
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java

@@ -171,4 +171,5 @@
    public R getHistoryRecord(PatrolRecordVO patrolRecordVO){
        return R.data(patrolRecordService.getHistoryRecord(patrolRecordVO));
    }

}

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

@@ -37,4 +37,6 @@
    List<PatrolGroupDTO> getPatrolGroupDTO(@Param("taskId") String taskId);

    List<PatrolGroup> getPatrolGroupByTaskId(String taskId);

    List<PatrolGroupDTO> getGroupDTORecord(@Param("taskId")String taskId);
}

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

@@ -143,4 +143,24 @@
       AND R.STATUS = 2
       AND R.TASK_ID = #{taskId}
    </select>
    <select id="getGroupDTORecord" resultMap="patrolGroupDTO">
        SELECT G.ID,
               G.NAME AS gname,
               R.ID AS rId,
               R.VIDEOS,
               R.IMAGES,
               R.STATUS,
               R.IS_DELETED,
               R.ITEM_ID  AS itemId,
               I.ITEMS_NAME AS itemsName,
               R.TASK_ID AS taskId ,
               R.SOLUTION,
               R.CONTENT
        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
        WHERE G.IS_DELETED = 0
          AND R.STATUS = 2
          AND R.TASK_ID = #{taskId}
    </select>
</mapper>

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

@@ -7,11 +7,13 @@
        SELECT
        spt.*,spt2.name as patrolTypeName,
        route.ROUTE_COORDINATES routeRange,
        u.real_name toUserName
        u.real_name toUserName,
        u2.real_name createUserName
        FROM sm_patrol_task spt
        left join sm_patrol_type spt2 on spt.task_type = spt2.id
        LEFT JOIN sm_patrol_route route ON route.id = spt.route_id
        LEFT JOIN blade_user u ON u.id = spt.to_user_id
        LEFT JOIN blade_user u2 ON u2.id = spt.create_user
        WHERE spt.is_deleted = 0
        <if test="patrolTask.title !=null and patrolTask.title!=''">
            AND spt.title LIKE CONCAT('%',#{patrolTask.title},'%')
@@ -34,6 +36,9 @@
        <if test="patrolTask.state != null and patrolTask.state !=''">
            AND spt.state = #{patrolTask.state}
        </if>
        <if test="patrolTask.taskType != null and patrolTask.taskType !='' ">
            AND spt.task_type = #{patrolTask.taskType}
        </if>
    </select>
    <!--获取全部-->
    <select id="getAll" resultType="cn.gistack.sm.patrol.entity.PatrolTask">

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

@@ -41,4 +41,6 @@
    List<PatrolGroupDTO> getPatrolGroupDTO(String taskId);

    List<PatrolGroup> getPatrolGroupByTaskId(String taskId);

    List<PatrolGroupDTO> getGroupDTORecord(String taskId);
}

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

@@ -66,4 +66,9 @@
    public List<PatrolGroup> getPatrolGroupByTaskId(String taskId) {
        return baseMapper.getPatrolGroupByTaskId(taskId);
    }

    @Override
    public List<PatrolGroupDTO> getGroupDTORecord(String taskId) {
        return baseMapper.getGroupDTORecord(taskId);
    }
}

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

@@ -20,6 +20,8 @@
     */
    private String toUserName;

    private String createUserName;

    /**
     * 任务类型名称
     */