BJ_FS / urbanops

Commit 2ae793ba00264fec0c9d4d043eb244d0587f27ff

Authored by wangqian
1 parent 66bba7b9

派单查询条件修改

Inline Side-by-side
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
  View file @2ae793b
... ... @@ -147,4 +147,8 @@ public class MainInfoRespVO {
147 147 private String companyName;
148 148 @Schema(description = "提交人电话")
149 149 private String userMobile;
  150 + /**
  151 + * 实施人员名称
  152 + */
  153 + private String workerName;
150 154 }
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/AssignTasksInfoController.java
  View file @2ae793b
... ... @@ -86,9 +86,9 @@ public class AssignTasksInfoController {
86 86 @PreAuthorize("@ss.hasPermission('garden:assign-tasks-info:query')")
87 87 public CommonResult<AssignTasksInfoRespVO> getAssignTasksInfo(@RequestParam("id") Long id) {
88 88 AssignTasksInfoDO assignTasksInfo = assignTasksInfoService.getAssignTasksInfo(id);
89   - AssignTasksDO tasksDO = assignTasksService.getAssignTasks(assignTasksInfo.getTaskId());
90   - return success(AssignTaskConvert.INSTANCE.buildTask(assignTasksInfo, tasksDO));
91   - //return success(BeanUtils.toBean(assignTasksInfo, AssignTasksInfoRespVO.class));
  89 +// AssignTasksDO tasksDO = assignTasksService.getAssignTasks(assignTasksInfo.getTaskId());
  90 +// return success(AssignTaskConvert.INSTANCE.buildTask(assignTasksInfo, tasksDO));
  91 + return success(BeanUtils.toBean(assignTasksInfo, AssignTasksInfoRespVO.class));
92 92 }
93 93  
94 94 @GetMapping("/page")
... ... @@ -96,52 +96,52 @@ public class AssignTasksInfoController {
96 96 @PreAuthorize("@ss.hasPermission('garden:assign-tasks-info:query')")
97 97 public CommonResult<PageResult<AssignTasksInfoRespVO>> getAssignTasksInfoPage(@Valid AssignTasksInfoPageReqVO pageReqVO) {
98 98 PageResult<AssignTasksInfoDO> pageResult = assignTasksInfoService.getAssignTasksInfoPage(pageReqVO);
99   - if (pageResult == null || pageResult.getList() == null || pageResult.getList().isEmpty()) {
100   - return success(BeanUtils.toBean(pageResult, AssignTasksInfoRespVO.class));
101   - }
102   - List<Long> assignIds = pageResult.getList().stream()
103   - .map(AssignTasksInfoDO::getTaskId)
104   - .distinct()
105   - .collect(Collectors.toList());
106   - List<AssignTasksDO> taskList = assignTasksService.getAssignTasksList(assignIds);
107   - if (CollectionUtils.isNotEmpty(taskList)) {
108   - Map<Long, AssignTasksDO> taskMap = taskList.stream()
109   - .collect(Collectors.toMap(
110   - AssignTasksDO::getId, // Key：任务ID
111   - task -> task,
112   - (existing, replacement) -> replacement
113   - ));
114   - return success(AssignTaskConvert.INSTANCE.buildTaskPage(pageResult, taskMap));
115   - } else {
116   - return CommonResult.error(BAD_REQUEST.getCode(), "派单数据异常");
117   - }
118   - //return success(BeanUtils.toBean(pageResult, AssignTasksInfoRespVO.class));
  99 +// if (pageResult == null || pageResult.getList() == null || pageResult.getList().isEmpty()) {
  100 +// return success(BeanUtils.toBean(pageResult, AssignTasksInfoRespVO.class));
  101 +// }
  102 +// List<Long> assignIds = pageResult.getList().stream()
  103 +// .map(AssignTasksInfoDO::getTaskId)
  104 +// .distinct()
  105 +// .collect(Collectors.toList());
  106 +// List<AssignTasksDO> taskList = assignTasksService.getAssignTasksList(assignIds);
  107 +// if (CollectionUtils.isNotEmpty(taskList)) {
  108 +// Map<Long, AssignTasksDO> taskMap = taskList.stream()
  109 +// .collect(Collectors.toMap(
  110 +// AssignTasksDO::getId, // Key：任务ID
  111 +// task -> task,
  112 +// (existing, replacement) -> replacement
  113 +// ));
  114 +// return success(AssignTaskConvert.INSTANCE.buildTaskPage(pageResult, taskMap));
  115 +// } else {
  116 +// return CommonResult.error(BAD_REQUEST.getCode(), "派单数据异常");
  117 +// }
  118 + return success(BeanUtils.toBean(pageResult, AssignTasksInfoRespVO.class));
119 119 }
120 120 @GetMapping("/list")
121 121 @Operation(summary = "获得派单任务-单位关联表（记录单位接收派单后的执行详情）分页")
122 122 @PreAuthorize("@ss.hasPermission('garden:assign-tasks-info:query')")
123 123 public CommonResult<PageResult<AssignTasksInfoRespVO>> list(@Valid AssignTasksInfoPageReqVO pageReqVO) {
124 124 PageResult<AssignTasksInfoDO> pageResult = assignTasksInfoService.getAssignTasksInfoPage(pageReqVO);
125   - if (pageResult == null || pageResult.getList() == null || pageResult.getList().isEmpty()) {
126   - return success(BeanUtils.toBean(pageResult, AssignTasksInfoRespVO.class));
127   - }
128   - List<Long> assignIds = pageResult.getList().stream()
129   - .map(AssignTasksInfoDO::getTaskId)
130   - .distinct()
131   - .collect(Collectors.toList());
132   - List<AssignTasksDO> taskList = assignTasksService.getAssignTasksList(assignIds);
133   - if (CollectionUtils.isNotEmpty(taskList)) {
134   - Map<Long, AssignTasksDO> taskMap = taskList.stream()
135   - .collect(Collectors.toMap(
136   - AssignTasksDO::getId, // Key：任务ID
137   - task -> task,
138   - (existing, replacement) -> replacement
139   - ));
140   - return success(AssignTaskConvert.INSTANCE.buildTaskPage(pageResult, taskMap));
141   - } else {
142   - return CommonResult.error(BAD_REQUEST.getCode(), "派单数据异常");
143   - }
144   - //return success(BeanUtils.toBean(pageResult, AssignTasksInfoRespVO.class));
  125 +// if (pageResult == null || pageResult.getList() == null || pageResult.getList().isEmpty()) {
  126 +// return success(BeanUtils.toBean(pageResult, AssignTasksInfoRespVO.class));
  127 +// }
  128 +// List<Long> assignIds = pageResult.getList().stream()
  129 +// .map(AssignTasksInfoDO::getTaskId)
  130 +// .distinct()
  131 +// .collect(Collectors.toList());
  132 +// List<AssignTasksDO> taskList = assignTasksService.getAssignTasksList(assignIds);
  133 +// if (CollectionUtils.isNotEmpty(taskList)) {
  134 +// Map<Long, AssignTasksDO> taskMap = taskList.stream()
  135 +// .collect(Collectors.toMap(
  136 +// AssignTasksDO::getId, // Key：任务ID
  137 +// task -> task,
  138 +// (existing, replacement) -> replacement
  139 +// ));
  140 +// return success(AssignTaskConvert.INSTANCE.buildTaskPage(pageResult, taskMap));
  141 +// } else {
  142 +// return CommonResult.error(BAD_REQUEST.getCode(), "派单数据异常");
  143 +// }
  144 + return success(BeanUtils.toBean(pageResult, AssignTasksInfoRespVO.class));
145 145 }
146 146 @GetMapping("/export-excel")
147 147 @Operation(summary = "导出派单任务-单位关联表（记录单位接收派单后的执行详情） Excel")
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoPageReqVO.java
  View file @2ae793b
... ... @@ -20,6 +20,12 @@ public class AssignTasksInfoPageReqVO extends PageParam {
20 20 @Schema(description = "填报人ID（单位指定的任务负责人）", example = "28216")
21 21 private String writePersonId;
22 22  
  23 + @Schema(description = "任务名称", example = "张三")
  24 + private String taskName;
  25 +
  26 + @Schema(description = "任务类型（关联数据字典，如：日常巡检、紧急维修等）", example = "1")
  27 + private String taskType;
  28 +
23 29 @Schema(description = "单位任务完成状态（0：未完成，1：已完成）")
24 30 private Integer finish;
25 31  
... ... @@ -32,6 +38,9 @@ public class AssignTasksInfoPageReqVO extends PageParam {
32 38 @Schema(description = "关联记录创建时间（派单给单位的时间）")
33 39 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
34 40 private LocalDateTime[] createTime;
  41 + @Schema(description = "任务截止时间")
  42 + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
  43 + private LocalDateTime[] deadline;
35 44  
36 45 @Schema(description = "是否打回0：正常 1：打回")
37 46 private Integer isReject;
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasksinfo/AssignTasksInfoDO.java
  View file @2ae793b
... ... @@ -36,6 +36,18 @@ public class AssignTasksInfoDO extends BaseDO {
36 36 */
37 37 private Long taskId;
38 38 /**
  39 + * 任务名称
  40 + */
  41 + private String taskName;
  42 + /**
  43 + * 任务类型（关联数据字典，如：日常巡检、紧急维修等）
  44 + */
  45 + private String taskType;
  46 + /**
  47 + * 任务截止时间
  48 + */
  49 + private LocalDateTime deadline;
  50 + /**
39 51 * 单位ID（关联单位表主键）
40 52 */
41 53 private Long companyId;
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/assigntasksinfo/AssignTasksInfoMapper.java
  View file @2ae793b
... ... @@ -20,11 +20,14 @@ public interface AssignTasksInfoMapper extends BaseMapperX&lt;AssignTasksInfoDO&gt; {
20 20  
21 21 default PageResult<AssignTasksInfoDO> selectPage(AssignTasksInfoPageReqVO reqVO) {
22 22 return selectPage(reqVO, new LambdaQueryWrapperX<AssignTasksInfoDO>()
  23 + .likeIfPresent(AssignTasksInfoDO::getTaskName, reqVO.getTaskName())
  24 + .eqIfPresent(AssignTasksInfoDO::getTaskType, reqVO.getTaskType())
23 25 .eqIfPresent(AssignTasksInfoDO::getCompanyId, reqVO.getCompanyId())
24 26 .eqIfPresent(AssignTasksInfoDO::getWritePersonId, reqVO.getWritePersonId())
25 27 .eqIfPresent(AssignTasksInfoDO::getFinish, reqVO.getFinish())
26 28 .eqIfPresent(AssignTasksInfoDO::getIsOverdue, reqVO.getIsOverdue())
27 29 .betweenIfPresent(AssignTasksInfoDO::getCreateTime, reqVO.getCreateTime())
  30 + .betweenIfPresent(AssignTasksInfoDO::getDeadline, reqVO.getDeadline())
28 31 .eqIfPresent(AssignTasksInfoDO::getIsReject, reqVO.getIsReject())
29 32 .orderByDesc(AssignTasksInfoDO::getId));
30 33 }
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java
  View file @2ae793b
... ... @@ -145,6 +145,9 @@ public class AssignTasksInfoServiceImpl implements AssignTasksInfoService {
145 145 assignTaskInfo.setCompanyId(companyId);
146 146 assignTaskInfo.setCompanyName(companyIdToNameMap.get(Long.valueOf(companyId)));
147 147 assignTaskInfo.setTaskId(assignTasks.getId());
  148 + assignTaskInfo.setTaskName(assignTasks.getTaskName());
  149 + assignTaskInfo.setTaskType(assignTasks.getTaskType());
  150 + assignTaskInfo.setDeadline(assignTasks.getDeadline());
148 151 assignTasksInfoMapper.insert(assignTaskInfo);
149 152 }
150 153 }
... ...