From 746b036f98df95e26c1a9248f72fe98edc3cd7e2 Mon Sep 17 00:00:00 2001
From: wxc <191104855@qq.com>
Date: Wed, 18 Jun 2025 16:09:08 +0800
Subject: [PATCH] =?UTF-8?q?fit:=20=E6=B5=8B=E9=85=92=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=98=AF=E5=90=A6=E8=BF=9D=E8=A7=84=E5=AE=B4?=
 =?UTF-8?q?=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/20250618.sql                                          | 2 ++
 .../supervision/pojo/dto/TaskTestingAlcoholPeopleDto.java | 8 +++++++-
 .../pojo/entity/SupTaskTestingAlcoholPeople.java          | 3 +++
 .../supervision/pojo/vo/TaskTestingAlcoholPeopleVo.java   | 3 +++
 .../service/SupTaskTestingAlcoholPeopleService.java       | 5 +++--
 .../mapper/SupTaskTestingAlcoholPeopleMapper.xml          | 1 +
 6 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 sql/20250618.sql

diff --git a/sql/20250618.sql b/sql/20250618.sql
new file mode 100644
index 0000000..86a3841
--- /dev/null
+++ b/sql/20250618.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `negative`.`sup_task_testing_alcohol_people`
+    ADD COLUMN `is_illegal_banquet` varchar(255) NULL COMMENT '是否存在违规宴请' AFTER `alcohol_content`;
\ No newline at end of file
diff --git a/src/main/java/com/biutag/supervision/pojo/dto/TaskTestingAlcoholPeopleDto.java b/src/main/java/com/biutag/supervision/pojo/dto/TaskTestingAlcoholPeopleDto.java
index f60e782..8638b7c 100644
--- a/src/main/java/com/biutag/supervision/pojo/dto/TaskTestingAlcoholPeopleDto.java
+++ b/src/main/java/com/biutag/supervision/pojo/dto/TaskTestingAlcoholPeopleDto.java
@@ -35,9 +35,15 @@ public class TaskTestingAlcoholPeopleDto {
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
     private LocalDateTime testingTime;
 
-    // 未检测情况说明
+    // 未检测原因
     private String unTestingDesc;
 
+    // 其他 未检测原因
+    private String unTestingDescOther;
+
+    // 是否存在违规宴请
+    private String isIllegalBanquet;
+
     // 检测照片
     private List<FileVo> testingFiles = new ArrayList<>();
 
diff --git a/src/main/java/com/biutag/supervision/pojo/entity/SupTaskTestingAlcoholPeople.java b/src/main/java/com/biutag/supervision/pojo/entity/SupTaskTestingAlcoholPeople.java
index b5e2d50..947f260 100644
--- a/src/main/java/com/biutag/supervision/pojo/entity/SupTaskTestingAlcoholPeople.java
+++ b/src/main/java/com/biutag/supervision/pojo/entity/SupTaskTestingAlcoholPeople.java
@@ -54,6 +54,9 @@ public class SupTaskTestingAlcoholPeople {
     // 未检测情况说明
     private String unTestingDesc;
 
+    // 是否存在违规宴请
+    private String isIllegalBanquet;
+
     // 检测照片
     private String testingFiles;
 
diff --git a/src/main/java/com/biutag/supervision/pojo/vo/TaskTestingAlcoholPeopleVo.java b/src/main/java/com/biutag/supervision/pojo/vo/TaskTestingAlcoholPeopleVo.java
index a91cbe1..97df601 100644
--- a/src/main/java/com/biutag/supervision/pojo/vo/TaskTestingAlcoholPeopleVo.java
+++ b/src/main/java/com/biutag/supervision/pojo/vo/TaskTestingAlcoholPeopleVo.java
@@ -52,6 +52,9 @@ public class TaskTestingAlcoholPeopleVo {
     // 未检测情况说明
     private String unTestingDesc;
 
+    // 是否存在违规宴请
+    private String isIllegalBanquet;
+
     // 检测照片
     private String testingFiles;
 
diff --git a/src/main/java/com/biutag/supervision/service/SupTaskTestingAlcoholPeopleService.java b/src/main/java/com/biutag/supervision/service/SupTaskTestingAlcoholPeopleService.java
index 081e234..2d562dc 100644
--- a/src/main/java/com/biutag/supervision/service/SupTaskTestingAlcoholPeopleService.java
+++ b/src/main/java/com/biutag/supervision/service/SupTaskTestingAlcoholPeopleService.java
@@ -49,12 +49,13 @@ public class SupTaskTestingAlcoholPeopleService extends ServiceImpl<SupTaskTesti
                 .set(SupTaskTestingAlcoholPeople::getTestingResult, dto.getTestingResult());
         if ("已检测".equals(dto.getTestingResult())) {
             updateWrapper.set(SupTaskTestingAlcoholPeople::getDrinkResult, dto.getDrinkResult())
-                    .set(SupTaskTestingAlcoholPeople::getTestingFiles, JSON.toJSONString(dto.getTestingFiles()));
+                    .set(SupTaskTestingAlcoholPeople::getTestingFiles, JSON.toJSONString(dto.getTestingFiles()))
+                    .set(SupTaskTestingAlcoholPeople::getIsIllegalBanquet, dto.getIsIllegalBanquet());
             if ("饮酒".equals(dto.getDrinkResult())) {
                 updateWrapper.set(SupTaskTestingAlcoholPeople::getAlcoholContent, dto.getAlcoholContent());
             }
         } else {
-            updateWrapper.set(SupTaskTestingAlcoholPeople::getUnTestingDesc, dto.getUnTestingDesc());
+            updateWrapper.set(SupTaskTestingAlcoholPeople::getUnTestingDesc, "其他".equals(dto.getUnTestingDesc()) ? dto.getUnTestingDescOther() : dto.getUnTestingDesc());
         }
         return update(updateWrapper);
     }
diff --git a/src/main/resources/mapper/SupTaskTestingAlcoholPeopleMapper.xml b/src/main/resources/mapper/SupTaskTestingAlcoholPeopleMapper.xml
index df487f9..8d12946 100644
--- a/src/main/resources/mapper/SupTaskTestingAlcoholPeopleMapper.xml
+++ b/src/main/resources/mapper/SupTaskTestingAlcoholPeopleMapper.xml
@@ -19,6 +19,7 @@
             peo.alcohol_content,
             peo.testing_time,
             peo.un_testing_desc,
+            peo.is_illegal_banquet,
             peo.status,
             peo.testing_files
         FROM