fit：1、督察任务发布任务（禁酒督察修改为六项规定督察）2、六项规定督察、重点人员管控补充督察要求

sql/20250722.sql

@@ -126,3 +126,6 @@ CREATE TABLE `data_mailbox` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 SET FOREIGN_KEY_CHECKS = 1;
+
+
+ALTER TABLE sup_task  ADD COLUMN supervise_require TEXT COMMENT '督察要求';

src/main/java/com/biutag/supervision/pojo/dto/TaskManagementDto.java

@@ -31,6 +31,8 @@ public class TaskManagementDto {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private List<Date> times = new ArrayList<>();
+    //任务要求
+    private String superviseRequire;
     //督察人员
     private List<SupTaskPerson> persons = new ArrayList<>();
     //督察对象方式（禁酒督察）

src/main/java/com/biutag/supervision/pojo/entity/SupTask.java

@@ -48,6 +48,9 @@ public class SupTask {
     // 任务状态
     private String taskStatus;
 
+    @TableField("supervise_require")
+    private String superviseRequire;
+
     @TableField("files")
     private String files;
 }

src/main/java/com/biutag/supervision/service/TaskManagementService.java

@@ -75,13 +75,15 @@ public class TaskManagementService {
         if(CollectionUtil.isNotEmpty(dto.getFileList())){
             task.setFiles(JSON.toJSONString(dto.getFileList()));
         }
+        log.info("---------------------");
+        log.info(String.valueOf("六项规定督察".equals(dto.getSpecialType())));
         if("日常督察".equals(dto.getSupervisionType())){
             task.setTaskType("inspection");
         }else{
             if("所队自查".equals(dto.getSpecialType())){
                 task.setTaskType("selfexamination");
             }
-            if("禁酒督察".equals(dto.getSpecialType())) {
+            else if("六项规定督察".equals(dto.getSpecialType())) {
                 task.setTaskType("testing_alcohol");
                 if (CollectionUtil.isNotEmpty(dto.getUserList())) {
                     Set<String> departIds = dto.getUserList().stream().map(SupTaskTestingAlcoholPeople::getDepartId).collect(Collectors.toSet());
@@ -145,7 +147,7 @@ public class TaskManagementService {
                 return selfexaminationContentService.saveBatch(dto.getSelfContents());
 
             }
-            if("禁酒督察".equals(dto.getSpecialType())){
+            if("六项规定督察".equals(dto.getSpecialType())){
                 SupTaskTestingAlcohol testingAlcohol = new SupTaskTestingAlcohol();
                 BeanUtils.copyProperties(dto, testingAlcohol);
                 testingAlcohol.setTaskId(task.getId());
@@ -256,7 +258,7 @@ public class TaskManagementService {
                 taskManagementDto.setSelfContents(contents);
                 break;
             case "testing_alcohol":
-                taskManagementDto.setSpecialType("禁酒督察");
+                taskManagementDto.setSpecialType("六项规定督察");
                 taskManagementDto.setSupervisionType("专项督察");
                 SupTaskTestingAlcohol testingAlcohol = testingAlcoholService.getOne(new LambdaQueryWrapper<SupTaskTestingAlcohol>().eq(SupTaskTestingAlcohol::getTaskId,id));