From b9fb833db8d6e99165a97e076b0348c9eb335ef9 Mon Sep 17 00:00:00 2001
From: pengwei <pengwei6411@163.com>
Date: Thu, 24 Jul 2025 11:16:11 +0800
Subject: [PATCH] =?UTF-8?q?fit=EF=BC=9A1=E3=80=81=E7=9D=A3=E5=AF=9F?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8F=91=E5=B8=83=E4=BB=BB=E5=8A=A1=EF=BC=88?=
 =?UTF-8?q?=E7=A6=81=E9=85=92=E7=9D=A3=E5=AF=9F=E4=BF=AE=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E5=85=AD=E9=A1=B9=E8=A7=84=E5=AE=9A=E7=9D=A3=E5=AF=9F=EF=BC=89?=
 =?UTF-8?q?2=E3=80=81=E5=85=AD=E9=A1=B9=E8=A7=84=E5=AE=9A=E7=9D=A3?=
 =?UTF-8?q?=E5=AF=9F=E3=80=81=E9=87=8D=E7=82=B9=E4=BA=BA=E5=91=98=E7=AE=A1?=
 =?UTF-8?q?=E6=8E=A7=E8=A1=A5=E5=85=85=E7=9D=A3=E5=AF=9F=E8=A6=81=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/20250722.sql                                          | 3 +++
 .../biutag/supervision/pojo/dto/TaskManagementDto.java    | 2 ++
 .../java/com/biutag/supervision/pojo/entity/SupTask.java  | 3 +++
 .../biutag/supervision/service/TaskManagementService.java | 8 +++++---
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/sql/20250722.sql b/sql/20250722.sql
index f357892..726f96f 100644
--- a/sql/20250722.sql
+++ b/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 '督察要求';
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 cec73f7..e9d75b4 100644
--- a/src/main/java/com/biutag/supervision/pojo/dto/TaskManagementDto.java
+++ b/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<>();
     //督察对象方式（禁酒督察）
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 578894b..e6ea7c2 100644
--- a/src/main/java/com/biutag/supervision/pojo/entity/SupTask.java
+++ b/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;
 }
diff --git a/src/main/java/com/biutag/supervision/service/TaskManagementService.java b/src/main/java/com/biutag/supervision/service/TaskManagementService.java
index 4435dd3..7123157 100644
--- a/src/main/java/com/biutag/supervision/service/TaskManagementService.java
+++ b/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));