From 2ae793ba00264fec0c9d4d043eb244d0587f27ff Mon Sep 17 00:00:00 2001 From: wangqian <1406304305@qq.com> Date: Sun, 21 Dec 2025 12:52:51 +0800 Subject: [PATCH] 派单查询条件修改 --- urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/MainInfoRespVO.java | 4 ++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/AssignTasksInfoController.java | 86 +++++++++++++++++++++++++++++++++++++++++++------------------------------------------- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoPageReqVO.java | 9 +++++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasksinfo/AssignTasksInfoDO.java | 12 ++++++++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/assigntasksinfo/AssignTasksInfoMapper.java | 3 +++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java | 3 +++ 6 files changed, 74 insertions(+), 43 deletions(-) diff --git a/urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/MainInfoRespVO.java b/urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/MainInfoRespVO.java index 92a23fa..8d1181e 100644 --- a/urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/MainInfoRespVO.java +++ b/urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/MainInfoRespVO.java @@ -147,4 +147,8 @@ public class MainInfoRespVO { private String companyName; @Schema(description = "提交人电话") private String userMobile; + /** + * 实施人员名称 + */ + private String workerName; } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/AssignTasksInfoController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/AssignTasksInfoController.java index a263297..bef071d 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/AssignTasksInfoController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/AssignTasksInfoController.java @@ -86,9 +86,9 @@ public class AssignTasksInfoController { @PreAuthorize("@ss.hasPermission('garden:assign-tasks-info:query')") public CommonResult 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> getAssignTasksInfoPage(@Valid AssignTasksInfoPageReqVO pageReqVO) { PageResult pageResult = assignTasksInfoService.getAssignTasksInfoPage(pageReqVO); - if (pageResult == null || pageResult.getList() == null || pageResult.getList().isEmpty()) { - return success(BeanUtils.toBean(pageResult, AssignTasksInfoRespVO.class)); - } - List assignIds = pageResult.getList().stream() - .map(AssignTasksInfoDO::getTaskId) - .distinct() - .collect(Collectors.toList()); - List taskList = assignTasksService.getAssignTasksList(assignIds); - if (CollectionUtils.isNotEmpty(taskList)) { - Map 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 assignIds = pageResult.getList().stream() +// .map(AssignTasksInfoDO::getTaskId) +// .distinct() +// .collect(Collectors.toList()); +// List taskList = assignTasksService.getAssignTasksList(assignIds); +// if (CollectionUtils.isNotEmpty(taskList)) { +// Map 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> list(@Valid AssignTasksInfoPageReqVO pageReqVO) { PageResult pageResult = assignTasksInfoService.getAssignTasksInfoPage(pageReqVO); - if (pageResult == null || pageResult.getList() == null || pageResult.getList().isEmpty()) { - return success(BeanUtils.toBean(pageResult, AssignTasksInfoRespVO.class)); - } - List assignIds = pageResult.getList().stream() - .map(AssignTasksInfoDO::getTaskId) - .distinct() - .collect(Collectors.toList()); - List taskList = assignTasksService.getAssignTasksList(assignIds); - if (CollectionUtils.isNotEmpty(taskList)) { - Map 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 assignIds = pageResult.getList().stream() +// .map(AssignTasksInfoDO::getTaskId) +// .distinct() +// .collect(Collectors.toList()); +// List taskList = assignTasksService.getAssignTasksList(assignIds); +// if (CollectionUtils.isNotEmpty(taskList)) { +// Map 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") diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoPageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoPageReqVO.java index 0808551..b3feb50 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoPageReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoPageReqVO.java @@ -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; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasksinfo/AssignTasksInfoDO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasksinfo/AssignTasksInfoDO.java index c98d671..a0d2447 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasksinfo/AssignTasksInfoDO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasksinfo/AssignTasksInfoDO.java @@ -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; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/assigntasksinfo/AssignTasksInfoMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/assigntasksinfo/AssignTasksInfoMapper.java index c071bed..52a59e0 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/assigntasksinfo/AssignTasksInfoMapper.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/assigntasksinfo/AssignTasksInfoMapper.java @@ -20,11 +20,14 @@ public interface AssignTasksInfoMapper extends BaseMapperX { default PageResult selectPage(AssignTasksInfoPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() + .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)); } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java index a3dbc3f..1c8d2bd 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java @@ -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); } } -- libgit2 0.21.4