fit: 测酒任务新增是否违规宴请

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`;

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<>();
 

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;
 

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;
 

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);
     }

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