diff --git a/src/main/java/com/biutag/supervision/pojo/dto/TaskManagementDto.java b/src/main/java/com/biutag/supervision/pojo/dto/TaskManagementDto.java index 3fc7b59..d026471 100644 --- a/src/main/java/com/biutag/supervision/pojo/dto/TaskManagementDto.java +++ b/src/main/java/com/biutag/supervision/pojo/dto/TaskManagementDto.java @@ -3,6 +3,7 @@ package com.biutag.supervision.pojo.dto; import com.biutag.supervision.pojo.entity.SupTaskPerson; import com.biutag.supervision.pojo.entity.SupTaskSelfexaminationContent; import com.biutag.supervision.pojo.entity.SupTaskTestingAlcoholPeople; +import com.biutag.supervision.pojo.vo.FileVo; import com.biutag.supervision.pojo.vo.TemperancePoliceVo; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Getter; @@ -30,6 +31,9 @@ public class TaskManagementDto { private List persons = new ArrayList<>(); //督察对象方式(禁酒督察) private String samplingTarget; + //附件 + private List fileList; + //excel 导入的数据 private List policeVos; //选择的禁闭规则 @@ -46,6 +50,8 @@ public class TaskManagementDto { private List selfContents; //重点督察人员列表 private List supRiskDtoList; + //附件 + private String files; } diff --git a/src/main/java/com/biutag/supervision/pojo/entity/SupTask.java b/src/main/java/com/biutag/supervision/pojo/entity/SupTask.java index 6e14997..84a124f 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/SupTask.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/SupTask.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; @Getter public class SupTask { - // + // @TableId(type = IdType.AUTO) private Integer id; @@ -47,4 +47,6 @@ public class SupTask { // 任务状态 private String taskStatus; -} \ No newline at end of file + @TableField("files") + private String files; +} diff --git a/src/main/java/com/biutag/supervision/service/TaskManagementService.java b/src/main/java/com/biutag/supervision/service/TaskManagementService.java index 2543040..d93632b 100644 --- a/src/main/java/com/biutag/supervision/service/TaskManagementService.java +++ b/src/main/java/com/biutag/supervision/service/TaskManagementService.java @@ -15,6 +15,9 @@ import com.biutag.supervision.pojo.param.TaskQueryParam; import com.biutag.supervision.pojo.vo.TaskVo; import com.biutag.supervision.pojo.vo.TemperancePoliceVo; import com.biutag.supervision.util.CommonUtil; +import com.biutag.supervision.util.JSON; +import dm.jdbc.filter.stat.json.JSONString; +import io.swagger.v3.core.util.Json; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; @@ -69,6 +72,9 @@ public class TaskManagementService { task.setTaskStatus(TaskStatusEnum.todo.name()); task.setBeginTime(dto.getTimes().get(0)); task.setEndTime(dto.getTimes().get(1)); + if(CollectionUtil.isNotEmpty(dto.getFileList())){ + task.setFiles(JSON.toJSONString(dto.getFileList())); + } if("日常督察".equals(dto.getSupervisionType())){ task.setTaskType("inspection"); }else{ @@ -223,7 +229,9 @@ public class TaskManagementService { times.add(supTask.getEndTime()); taskManagementDto.setTimes(times); - + if(StrUtil.isNotBlank(supTask.getFiles())){ + taskManagementDto.setFiles(supTask.getFiles()); + } switch (supTask.getTaskType()){ case "inspection": taskManagementDto.setSupervisionType("日常督察");