BJ_FS / urbanops

Commit a3064327652cea789738507d314bd299964a55d1

Authored by wangqian
1 parent ec3fa013

派单bug修改

Inline Side-by-side
Showing 6 changed files with 22 additions and 15 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksRespVO.java
  View file @a306432
... ... @@ -26,7 +26,7 @@ public class AssignTasksRespVO {
26 26 private String taskName;
27 27  
28 28 @Schema(description = "任务类型（关联数据字典，1=日常任务,2=古树任务,3=屋顶绿化）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
29   - private String taskType;
  29 + private Integer taskType;
30 30 @ExcelProperty(value = "任务类型")
31 31 private String taskTypeName;
32 32  
... ... @@ -82,17 +82,17 @@ public class AssignTasksRespVO {
82 82 }
83 83 }
84 84  
85   - public void setTaskType(String taskType) {
  85 + public void setTaskType(Integer taskType) {
86 86 this.taskType = taskType;
87 87 //1=日常任务,2=古树任务,3=屋顶绿化
88 88 switch (taskType) {
89   - case "1":
  89 + case 1:
90 90 this.taskTypeName = "日常任务";
91 91 break;
92   - case "2":
  92 + case 2:
93 93 this.taskTypeName = "古树任务";
94 94 break;
95   - case "3":
  95 + case 3:
96 96 this.taskTypeName = "屋顶绿化";
97 97 break;
98 98 default:
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksSaveReqVO.java
  View file @a306432
... ... @@ -23,8 +23,8 @@ public class AssignTasksSaveReqVO {
23 23 private String taskName;
24 24  
25 25 @Schema(description = "任务类型（关联数据字典，如：日常巡检、紧急维修等）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
26   - @NotEmpty(message = "任务类型（关联数据字典，如：日常巡检、紧急维修等）不能为空")
27   - private String taskType;
  26 + @NotNull(message = "任务类型（关联数据字典，如：日常巡检、紧急维修等）不能为空")
  27 + private Integer taskType;
28 28  
29 29 @Schema(description = "任务截止时间", requiredMode = Schema.RequiredMode.REQUIRED)
30 30 @NotNull(message = "任务截止时间不能为空")
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoRespVO.java
  View file @a306432
... ... @@ -29,7 +29,7 @@ public class AssignTasksInfoRespVO {
29 29 private String taskName;
30 30  
31 31 @Schema(description = "任务类型（关联数据字典，1=日常任务,2=古树任务,3=屋顶绿化）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
32   - private String taskType;
  32 + private Integer taskType;
33 33 @ExcelProperty(value = "任务类型")
34 34 private String taskTypeName;
35 35  
... ... @@ -119,17 +119,17 @@ public class AssignTasksInfoRespVO {
119 119 @ExcelProperty("0:正常1:停用")
120 120 private Integer status;
121 121  
122   - public void setTaskType(String taskType) {
  122 + public void setTaskType(Integer taskType) {
123 123 this.taskType = taskType;
124 124 //1=日常任务,2=古树任务,3=屋顶绿化
125 125 switch (taskType) {
126   - case "1":
  126 + case 1:
127 127 this.taskTypeName = "日常任务";
128 128 break;
129   - case "2":
  129 + case 2:
130 130 this.taskTypeName = "古树任务";
131 131 break;
132   - case "3":
  132 + case 3:
133 133 this.taskTypeName = "屋顶绿化";
134 134 break;
135 135 default:
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasks/AssignTasksDO.java
  View file @a306432
... ... @@ -36,7 +36,7 @@ public class AssignTasksDO extends BaseDO {
36 36 /**
37 37 * 任务类型（关联数据字典，如：日常巡检、紧急维修等）
38 38 */
39   - private String taskType;
  39 + private Integer taskType;
40 40 /**
41 41 * 任务截止时间
42 42 */
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasksinfo/AssignTasksInfoDO.java
  View file @a306432
... ... @@ -42,7 +42,7 @@ public class AssignTasksInfoDO extends BaseDO {
42 42 /**
43 43 * 任务类型（关联数据字典，如：日常巡检、紧急维修等）
44 44 */
45   - private String taskType;
  45 + private Integer taskType;
46 46 /**
47 47 * 任务截止时间
48 48 */
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasks/AssignTasksServiceImpl.java
  View file @a306432
... ... @@ -26,6 +26,7 @@ import org.springframework.util.CollectionUtils;
26 26 import org.springframework.validation.annotation.Validated;
27 27  
28 28 import java.time.LocalDateTime;
  29 +import java.time.ZoneId;
29 30 import java.util.*;
30 31 import java.util.function.Function;
31 32 import java.util.stream.Collectors;
... ... @@ -95,7 +96,7 @@ public class AssignTasksServiceImpl implements AssignTasksService {
95 96 List<Long> companyIds = updateReqVO.getCompanyIds();
96 97 // add by wq 20251116
97 98 List<AssignTasksInfoDO> assignTaskInfoList = assignTasksInfoMapper.selectList(AssignTasksInfoDO::getTaskId, updateObj.getId());
98   - if (CollectionUtils.isEmpty(assignTaskInfoList)) {
  99 + if (!CollectionUtils.isEmpty(assignTaskInfoList)) {
99 100 // 检查当前派单的公司ID是否不在保留列表中
100 101 for (AssignTasksInfoDO taskInfo : assignTaskInfoList) {
101 102 // 检查当前派单的公司ID是否不在保留列表中
... ... @@ -107,6 +108,12 @@ public class AssignTasksServiceImpl implements AssignTasksService {
107 108 // 未读状态，执行删除操作
108 109 assignTasksInfoService.deleteAssignTasksInfo(taskInfo.getId());
109 110 }
  111 + } else {
  112 + //修改派单信息
  113 + taskInfo.setTaskName(updateReqVO.getTaskName());
  114 + taskInfo.setTaskType(updateReqVO.getTaskType());
  115 + taskInfo.setDeadline(updateReqVO.getDeadline().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
  116 + assignTasksInfoMapper.updateById(taskInfo);
110 117 }
111 118 }
112 119 }
... ...