BJ_FS / urbanops

Commit c474baa9fa97756d1ca094162abd43002d756e35

Authored by wangqian
1 parent bc539300

派单修改

Inline Side-by-side
Showing 3 changed files with 16 additions and 7 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoUpdReqVO.java
  View file @c474baa
... ... @@ -13,6 +13,7 @@ import java.util.List;
13 13 public class AssignTasksInfoUpdReqVO {
14 14  
15 15 @Schema(description = "自增ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12148")
  16 + @NotNull
16 17 private Long id;
17 18 @Schema(description = "驳回备注（当finish=2时，说明驳回原因）", example = "你说的对")
18 19 private String rejectRemark;
... ... @@ -20,6 +21,6 @@ public class AssignTasksInfoUpdReqVO {
20 21 @Schema(description = "备注", example = "你猜")
21 22 private String remark;
22 23 @Schema(description = "单位提交的任务文件路径（如：填报表格、现场照片等）")
23   - private List<String> dataFile;
  24 + private List dataFile;
24 25  
25 26 }
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasksinfo/AssignTasksInfoDO.java
  View file @c474baa
... ... @@ -83,7 +83,7 @@ public class AssignTasksInfoDO extends BaseDO {
83 83 * 单位提交的任务文件路径（如：填报表格、现场照片等）
84 84 */
85 85 @TableField(typeHandler = JacksonTypeHandler.class)
86   - private List<String> dataFile;
  86 + private List dataFile;
87 87 /**
88 88 * 催缴次数（未完成时的提醒次数）
89 89 */
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java
  View file @c474baa
... ... @@ -29,10 +29,7 @@ import org.springframework.validation.annotation.Validated;
29 29 import java.time.LocalDateTime;
30 30 import java.time.ZoneId;
31 31 import java.time.format.DateTimeFormatter;
32   -import java.util.HashMap;
33   -import java.util.List;
34   -import java.util.Map;
35   -import java.util.Objects;
  32 +import java.util.*;
36 33 import java.util.stream.Collectors;
37 34  
38 35 import static com.zteits.urbanops.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST;
... ... @@ -117,7 +114,18 @@ public class AssignTasksInfoServiceImpl implements AssignTasksInfoService {
117 114  
118 115 @Override
119 116 public AssignTasksInfoDO getAssignTasksInfo(Long id) {
120   - return assignTasksInfoMapper.selectById(id);
  117 + AssignTasksInfoDO assignTasksInfoDO = assignTasksInfoMapper.selectById(id);
  118 + //分公司管理员查看，变为已读
  119 + if (assignTasksInfoDO != null) {
  120 + Integer newFlag = assignTasksInfoDO.getNewFlag();
  121 + if (newFlag != null && newFlag == 0) {
  122 + //更新为已读
  123 + assignTasksInfoDO.setNewFlag(AssignTasksConstants.ASSIGN_TASK_NEWFLAG_1);
  124 + assignTasksInfoDO.setNewFlagTime(LocalDateTime.now());
  125 + assignTasksInfoMapper.updateById(assignTasksInfoDO);
  126 + }
  127 + }
  128 + return assignTasksInfoDO;
121 129 }
122 130  
123 131 @Override
... ...