巡查查询接口修改

guoshilong

2023-07-13 e30adfc0ed39bbb1d5ba5d16e383a84c221ec0c2

巡查查询接口修改

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

@@ -149,8 +149,8 @@
     * @return
     */
    @GetMapping(value = "/getByTaskIdAndGroupId")
    public R getByTaskIdAndGroupId(String groupId,String taskId){
        List<PatrolRecord> list = patrolRecordService.getByTaskIdAndGroupId(groupId,taskId);
    public R getByTaskIdAndGroupId(PatrolRecordVO patrolRecordVO){
        List<PatrolRecord> list = patrolRecordService.getByTaskIdAndGroupId(patrolRecordVO);
        return R.data(list);
    }


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

@@ -21,7 +21,7 @@

    PatrolRecordVO getPatrolRecordVO(@Param("itemId") Long itemId, @Param("taskId") String taskId);

    List<PatrolRecord> getByTaskIdAndGroupId(@Param("groupId") String groupId, @Param("taskId") String taskId);
    List<PatrolRecord> getByTaskIdAndGroupId(@Param("vo") PatrolRecordVO patrolRecordVO);

    List<PatrolGroupDTO> getHistoryRecord(@Param("vo") PatrolRecordVO patrolRecordVO);
}

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

@@ -122,12 +122,18 @@
         FROM SM_PATROL_GROUP A
         INNER JOIN SM_PATROL_GROUP_ITEM B ON A.ID = B.GROUP_ID
         WHERE  1=1
         <if test="groupId != null and groupId !=''">
            AND  B.GROUP_ID = #{groupId}
         <if test="vo.groupId != null and vo.groupId !=''">
            AND  B.GROUP_ID = #{vo.groupId}
         </if>
         ORDER BY B.GROUP_ID
        )C ON C.ID = r.ITEM_ID
        WHERE TASK_ID = #{taskId} AND r.state = 0
        WHERE  r.state = 0
        <if test="vo.taskId != null and vo.taskId !=''">
           AND r.task_id = #{vo.taskId}
        </if>
        <if test="vo.flowTaskId != null and vo.flowTaskId !=''">
            AND r.flow_task_id = #{vo.flowTaskId}
        </if>
    </select>

    <resultMap id="patrolGroupDTO" type="cn.gistack.sm.patrol.dto.PatrolGroupDTO">

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

@@ -53,7 +53,7 @@
     */
    List getItemByItemIds(String itemIds, String groupId, String taskId);

    List<PatrolRecord> getByTaskIdAndGroupId(String groupId, String taskId);
    List<PatrolRecord> getByTaskIdAndGroupId(PatrolRecordVO patrolRecordVO);

    Boolean updateThenSaveBatch(RecordBatchVO recordBatchVO);


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

@@ -78,8 +78,8 @@
    }

    @Override
    public List<PatrolRecord> getByTaskIdAndGroupId(String groupId, String taskId) {
        return baseMapper.getByTaskIdAndGroupId(groupId,taskId);
    public List<PatrolRecord> getByTaskIdAndGroupId(PatrolRecordVO patrolRecordVO) {
        return baseMapper.getByTaskIdAndGroupId(patrolRecordVO);
    }

    @Override