From c474baa9fa97756d1ca094162abd43002d756e35 Mon Sep 17 00:00:00 2001
From: wangqian <1406304305@qq.com>
Date: Sun, 21 Dec 2025 21:06:31 +0800
Subject: [PATCH] 派单修改

---
 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoUpdReqVO.java |  3 ++-
 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasksinfo/AssignTasksInfoDO.java            |  2 +-
 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java          | 18 +++++++++++++-----
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoUpdReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoUpdReqVO.java
index b483e1f..1ad65c4 100644
--- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoUpdReqVO.java
+++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoUpdReqVO.java
@@ -13,6 +13,7 @@ import java.util.List;
 public class AssignTasksInfoUpdReqVO {
 
     @Schema(description = "自增ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12148")
+    @NotNull
     private Long id;
     @Schema(description = "驳回备注（当finish=2时，说明驳回原因）", example = "你说的对")
     private String rejectRemark;
@@ -20,6 +21,6 @@ public class AssignTasksInfoUpdReqVO {
     @Schema(description = "备注", example = "你猜")
     private String remark;
     @Schema(description = "单位提交的任务文件路径（如：填报表格、现场照片等）")
-    private List<String> dataFile;
+    private List dataFile;
 
 }
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 a0d2447..c058cd4 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
@@ -83,7 +83,7 @@ public class AssignTasksInfoDO extends BaseDO {
      * 单位提交的任务文件路径（如：填报表格、现场照片等）
      */
     @TableField(typeHandler = JacksonTypeHandler.class)
-    private List<String> dataFile;
+    private List dataFile;
     /**
      * 催缴次数（未完成时的提醒次数）
      */
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 1c8d2bd..ded6247 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
@@ -29,10 +29,7 @@ import org.springframework.validation.annotation.Validated;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.zteits.urbanops.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST;
@@ -117,7 +114,18 @@ public class AssignTasksInfoServiceImpl implements AssignTasksInfoService {
 
     @Override
     public AssignTasksInfoDO getAssignTasksInfo(Long id) {
-        return assignTasksInfoMapper.selectById(id);
+        AssignTasksInfoDO assignTasksInfoDO = assignTasksInfoMapper.selectById(id);
+        //分公司管理员查看，变为已读
+        if (assignTasksInfoDO != null) {
+            Integer newFlag = assignTasksInfoDO.getNewFlag();
+            if (newFlag != null && newFlag == 0) {
+                //更新为已读
+                assignTasksInfoDO.setNewFlag(AssignTasksConstants.ASSIGN_TASK_NEWFLAG_1);
+                assignTasksInfoDO.setNewFlagTime(LocalDateTime.now());
+                assignTasksInfoMapper.updateById(assignTasksInfoDO);
+            }
+        }
+        return assignTasksInfoDO;
     }
 
     @Override
--
libgit2 0.21.4