派单bug修改

wangqian
1 parent ec3fa013
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
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksSaveReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasks/AssignTasksDO.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/service/assigntasks/AssignTasksServiceImpl.java
@@ -26,7 +26,7 @@ public class AssignTasksRespVO {
     private String taskName;
     @Schema(description = "任务类型（关联数据字典，1=日常任务,2=古树任务,3=屋顶绿化）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    private String taskType;
+    private Integer taskType;
     @ExcelProperty(value = "任务类型")
     private String taskTypeName;
@@ -82,17 +82,17 @@ public class AssignTasksRespVO {
         }
     }
-    public void setTaskType(String taskType) {
+    public void setTaskType(Integer taskType) {
         this.taskType = taskType;
         //1=日常任务,2=古树任务,3=屋顶绿化
         switch (taskType) {
-            case "1":
+            case 1:
                 this.taskTypeName = "日常任务";
                 break;
-            case "2":
+            case 2:
                 this.taskTypeName = "古树任务";
                 break;
-            case "3":
+            case 3:
                 this.taskTypeName = "屋顶绿化";
                 break;
             default:
@@ -23,8 +23,8 @@ public class AssignTasksSaveReqVO {
     private String taskName;
     @Schema(description = "任务类型（关联数据字典，如：日常巡检、紧急维修等）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotEmpty(message = "任务类型（关联数据字典，如：日常巡检、紧急维修等）不能为空")
-    private String taskType;
+    @NotNull(message = "任务类型（关联数据字典，如：日常巡检、紧急维修等）不能为空")
+    private Integer taskType;
     @Schema(description = "任务截止时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "任务截止时间不能为空")
@@ -29,7 +29,7 @@ public class AssignTasksInfoRespVO {
     private String taskName;
     @Schema(description = "任务类型（关联数据字典，1=日常任务,2=古树任务,3=屋顶绿化）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    private String taskType;
+    private Integer taskType;
     @ExcelProperty(value = "任务类型")
     private String taskTypeName;
@@ -119,17 +119,17 @@ public class AssignTasksInfoRespVO {
     @ExcelProperty("0:正常1:停用")
     private Integer status;
-    public void setTaskType(String taskType) {
+    public void setTaskType(Integer taskType) {
         this.taskType = taskType;
         //1=日常任务,2=古树任务,3=屋顶绿化
         switch (taskType) {
-            case "1":
+            case 1:
                 this.taskTypeName = "日常任务";
                 break;
-            case "2":
+            case 2:
                 this.taskTypeName = "古树任务";
                 break;
-            case "3":
+            case 3:
                 this.taskTypeName = "屋顶绿化";
                 break;
             default:
@@ -36,7 +36,7 @@ public class AssignTasksDO extends BaseDO {
     /**
      * 任务类型（关联数据字典，如：日常巡检、紧急维修等）
      */
-    private String taskType;
+    private Integer taskType;
     /**
      * 任务截止时间
      */
@@ -42,7 +42,7 @@ public class AssignTasksInfoDO extends BaseDO {
     /**
      * 任务类型（关联数据字典，如：日常巡检、紧急维修等）
      */
-    private String taskType;
+    private Integer taskType;
     /**
      * 任务截止时间
      */
@@ -26,6 +26,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -95,7 +96,7 @@ public class AssignTasksServiceImpl implements AssignTasksService {
         List<Long> companyIds = updateReqVO.getCompanyIds();
         // add by wq 20251116
         List<AssignTasksInfoDO> assignTaskInfoList = assignTasksInfoMapper.selectList(AssignTasksInfoDO::getTaskId, updateObj.getId());
-        if (CollectionUtils.isEmpty(assignTaskInfoList)) {
+        if (!CollectionUtils.isEmpty(assignTaskInfoList)) {
             // 检查当前派单的公司ID是否不在保留列表中
             for (AssignTasksInfoDO taskInfo : assignTaskInfoList) {
                 // 检查当前派单的公司ID是否不在保留列表中
@@ -107,6 +108,12 @@ public class AssignTasksServiceImpl implements AssignTasksService {
                         // 未读状态，执行删除操作
                         assignTasksInfoService.deleteAssignTasksInfo(taskInfo.getId());
                     }
+                } else {
+                    //修改派单信息
+                    taskInfo.setTaskName(updateReqVO.getTaskName());
+                    taskInfo.setTaskType(updateReqVO.getTaskType());
+                    taskInfo.setDeadline(updateReqVO.getDeadline().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
+                    assignTasksInfoMapper.updateById(taskInfo);
                 }
             }
         }