派单查询条件修改

wangqian
1 parent 66bba7b9
Showing 6 changed files with 74 additions and 43 deletions
urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/MainInfoRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/AssignTasksInfoController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasksinfo/AssignTasksInfoDO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/assigntasksinfo/AssignTasksInfoMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java
@@ -147,4 +147,8 @@ public class MainInfoRespVO {
     private String companyName;
     @Schema(description = "提交人电话")
     private String userMobile;
+    /**
+     * 实施人员名称
+     */
+    private String workerName;
 }
@@ -86,9 +86,9 @@ public class AssignTasksInfoController {
     @PreAuthorize("@ss.hasPermission('garden:assign-tasks-info:query')")
     public CommonResult<AssignTasksInfoRespVO> getAssignTasksInfo(@RequestParam("id") Long id) {
         AssignTasksInfoDO assignTasksInfo = assignTasksInfoService.getAssignTasksInfo(id);
-        AssignTasksDO tasksDO = assignTasksService.getAssignTasks(assignTasksInfo.getTaskId());
-        return success(AssignTaskConvert.INSTANCE.buildTask(assignTasksInfo, tasksDO));
-        //return success(BeanUtils.toBean(assignTasksInfo, AssignTasksInfoRespVO.class));
+//        AssignTasksDO tasksDO = assignTasksService.getAssignTasks(assignTasksInfo.getTaskId());
+//        return success(AssignTaskConvert.INSTANCE.buildTask(assignTasksInfo, tasksDO));
+        return success(BeanUtils.toBean(assignTasksInfo, AssignTasksInfoRespVO.class));
     }
     @GetMapping("/page")
@@ -96,52 +96,52 @@ public class AssignTasksInfoController {
     @PreAuthorize("@ss.hasPermission('garden:assign-tasks-info:query')")
     public CommonResult<PageResult<AssignTasksInfoRespVO>> getAssignTasksInfoPage(@Valid AssignTasksInfoPageReqVO pageReqVO) {
         PageResult<AssignTasksInfoDO> pageResult = assignTasksInfoService.getAssignTasksInfoPage(pageReqVO);
-        if (pageResult == null || pageResult.getList() == null || pageResult.getList().isEmpty()) {
-            return success(BeanUtils.toBean(pageResult, AssignTasksInfoRespVO.class));
-        }
-        List<Long> assignIds = pageResult.getList().stream()
-                .map(AssignTasksInfoDO::getTaskId)
-                .distinct()
-                .collect(Collectors.toList());
-        List<AssignTasksDO> taskList = assignTasksService.getAssignTasksList(assignIds);
-        if (CollectionUtils.isNotEmpty(taskList)) {
-            Map<Long, AssignTasksDO> taskMap = taskList.stream()
-                    .collect(Collectors.toMap(
-                            AssignTasksDO::getId,    // Key：任务ID
-                            task -> task,
-                            (existing, replacement) -> replacement
-                    ));
-            return success(AssignTaskConvert.INSTANCE.buildTaskPage(pageResult, taskMap));
-        } else {
-            return CommonResult.error(BAD_REQUEST.getCode(), "派单数据异常");
-        }
-        //return success(BeanUtils.toBean(pageResult, AssignTasksInfoRespVO.class));
+//        if (pageResult == null || pageResult.getList() == null || pageResult.getList().isEmpty()) {
+//            return success(BeanUtils.toBean(pageResult, AssignTasksInfoRespVO.class));
+//        }
+//        List<Long> assignIds = pageResult.getList().stream()
+//                .map(AssignTasksInfoDO::getTaskId)
+//                .distinct()
+//                .collect(Collectors.toList());
+//        List<AssignTasksDO> taskList = assignTasksService.getAssignTasksList(assignIds);
+//        if (CollectionUtils.isNotEmpty(taskList)) {
+//            Map<Long, AssignTasksDO> taskMap = taskList.stream()
+//                    .collect(Collectors.toMap(
+//                            AssignTasksDO::getId,    // Key：任务ID
+//                            task -> task,
+//                            (existing, replacement) -> replacement
+//                    ));
+//            return success(AssignTaskConvert.INSTANCE.buildTaskPage(pageResult, taskMap));
+//        } else {
+//            return CommonResult.error(BAD_REQUEST.getCode(), "派单数据异常");
+//        }
+        return success(BeanUtils.toBean(pageResult, AssignTasksInfoRespVO.class));
     }
     @GetMapping("/list")
     @Operation(summary = "获得派单任务-单位关联表（记录单位接收派单后的执行详情）分页")
     @PreAuthorize("@ss.hasPermission('garden:assign-tasks-info:query')")
     public CommonResult<PageResult<AssignTasksInfoRespVO>> list(@Valid AssignTasksInfoPageReqVO pageReqVO) {
         PageResult<AssignTasksInfoDO> pageResult = assignTasksInfoService.getAssignTasksInfoPage(pageReqVO);
-        if (pageResult == null || pageResult.getList() == null || pageResult.getList().isEmpty()) {
-            return success(BeanUtils.toBean(pageResult, AssignTasksInfoRespVO.class));
-        }
-        List<Long> assignIds = pageResult.getList().stream()
-                .map(AssignTasksInfoDO::getTaskId)
-                .distinct()
-                .collect(Collectors.toList());
-        List<AssignTasksDO> taskList = assignTasksService.getAssignTasksList(assignIds);
-        if (CollectionUtils.isNotEmpty(taskList)) {
-            Map<Long, AssignTasksDO> taskMap = taskList.stream()
-                    .collect(Collectors.toMap(
-                            AssignTasksDO::getId,    // Key：任务ID
-                            task -> task,
-                            (existing, replacement) -> replacement
-                    ));
-            return success(AssignTaskConvert.INSTANCE.buildTaskPage(pageResult, taskMap));
-        } else {
-            return CommonResult.error(BAD_REQUEST.getCode(), "派单数据异常");
-        }
-        //return success(BeanUtils.toBean(pageResult, AssignTasksInfoRespVO.class));
+//        if (pageResult == null || pageResult.getList() == null || pageResult.getList().isEmpty()) {
+//            return success(BeanUtils.toBean(pageResult, AssignTasksInfoRespVO.class));
+//        }
+//        List<Long> assignIds = pageResult.getList().stream()
+//                .map(AssignTasksInfoDO::getTaskId)
+//                .distinct()
+//                .collect(Collectors.toList());
+//        List<AssignTasksDO> taskList = assignTasksService.getAssignTasksList(assignIds);
+//        if (CollectionUtils.isNotEmpty(taskList)) {
+//            Map<Long, AssignTasksDO> taskMap = taskList.stream()
+//                    .collect(Collectors.toMap(
+//                            AssignTasksDO::getId,    // Key：任务ID
+//                            task -> task,
+//                            (existing, replacement) -> replacement
+//                    ));
+//            return success(AssignTaskConvert.INSTANCE.buildTaskPage(pageResult, taskMap));
+//        } else {
+//            return CommonResult.error(BAD_REQUEST.getCode(), "派单数据异常");
+//        }
+        return success(BeanUtils.toBean(pageResult, AssignTasksInfoRespVO.class));
     }
     @GetMapping("/export-excel")
     @Operation(summary = "导出派单任务-单位关联表（记录单位接收派单后的执行详情） Excel")
@@ -20,6 +20,12 @@ public class AssignTasksInfoPageReqVO extends PageParam {
     @Schema(description = "填报人ID（单位指定的任务负责人）", example = "28216")
     private String writePersonId;
+    @Schema(description = "任务名称", example = "张三")
+    private String taskName;
+
+    @Schema(description = "任务类型（关联数据字典，如：日常巡检、紧急维修等）", example = "1")
+    private String taskType;
+
     @Schema(description = "单位任务完成状态（0：未完成，1：已完成）")
     private Integer finish;
@@ -32,6 +38,9 @@ public class AssignTasksInfoPageReqVO extends PageParam {
     @Schema(description = "关联记录创建时间（派单给单位的时间）")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
+    @Schema(description = "任务截止时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] deadline;
     @Schema(description = "是否打回0：正常 1：打回")
     private Integer isReject;
@@ -36,6 +36,18 @@ public class AssignTasksInfoDO extends BaseDO {
      */
     private Long taskId;
     /**
+     * 任务名称
+     */
+    private String taskName;
+    /**
+     * 任务类型（关联数据字典，如：日常巡检、紧急维修等）
+     */
+    private String taskType;
+    /**
+     * 任务截止时间
+     */
+    private LocalDateTime deadline;
+    /**
      * 单位ID（关联单位表主键）
      */
     private Long companyId;
@@ -20,11 +20,14 @@ public interface AssignTasksInfoMapper extends BaseMapperX&lt;AssignTasksInfoDO&gt; {
     default PageResult<AssignTasksInfoDO> selectPage(AssignTasksInfoPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<AssignTasksInfoDO>()
+                .likeIfPresent(AssignTasksInfoDO::getTaskName, reqVO.getTaskName())
+                .eqIfPresent(AssignTasksInfoDO::getTaskType, reqVO.getTaskType())
                 .eqIfPresent(AssignTasksInfoDO::getCompanyId, reqVO.getCompanyId())
                 .eqIfPresent(AssignTasksInfoDO::getWritePersonId, reqVO.getWritePersonId())
                 .eqIfPresent(AssignTasksInfoDO::getFinish, reqVO.getFinish())
                 .eqIfPresent(AssignTasksInfoDO::getIsOverdue, reqVO.getIsOverdue())
                 .betweenIfPresent(AssignTasksInfoDO::getCreateTime, reqVO.getCreateTime())
+                .betweenIfPresent(AssignTasksInfoDO::getDeadline, reqVO.getDeadline())
                 .eqIfPresent(AssignTasksInfoDO::getIsReject, reqVO.getIsReject())
                 .orderByDesc(AssignTasksInfoDO::getId));
     }
@@ -145,6 +145,9 @@ public class AssignTasksInfoServiceImpl implements AssignTasksInfoService {
                 assignTaskInfo.setCompanyId(companyId);
                 assignTaskInfo.setCompanyName(companyIdToNameMap.get(Long.valueOf(companyId)));
                 assignTaskInfo.setTaskId(assignTasks.getId());
+                assignTaskInfo.setTaskName(assignTasks.getTaskName());
+                assignTaskInfo.setTaskType(assignTasks.getTaskType());
+                assignTaskInfo.setDeadline(assignTasks.getDeadline());
                 assignTasksInfoMapper.insert(assignTaskInfo);
             }
         }