fit: 完善12337台账导出

fit: 移动督察 重点人员保存督察记录时，如何失控或无法确认生成督察问题

src/main/java/com/biutag/supervision/controller/books/NegativeBookController.java

@@ -258,17 +258,6 @@ public class NegativeBookController {
             item.setVerifiedIsover(overProcessings.contains(item.getProcessingStatus()) ? "核查完结" : null);
             // 是否处分处理
             List<NegativeBlame> blames = negativeBlames.stream().filter(blame -> blame.getNegativeId().equals(item.getId())).toList();
-            List<String> internalIds = new ArrayList<>();
-            blames.stream().filter(blame -> StrUtil.isNotBlank(blame.getHandleResultCode())).forEach(blame -> {
-                internalIds.addAll(Arrays.stream(blame.getHandleResultCode().split(",")).toList());
-            });
-            if (!internalIds.isEmpty()) {
-                List<SupDictHandleResultMaping> handleResultMapings = dictHandleResultMapingService.listByInternalId(internalIds);
-                // 处理结论形态（获取第一个）
-                item.setProcessResType(handleResultMapings.stream().findFirst().map(SupDictHandleResultMaping::getExternalType).orElse(null));
-                // 处理结论结果
-                item.setProcessResDes(handleResultMapings.stream().map(SupDictHandleResultMaping::getExternalName).collect(Collectors.joining("、")));
-            }
             if (InspectCaseEnum.isItTure(item.getCheckStatus()) && blames.stream().anyMatch(blame -> !blame.getHandleResultName().contains("不予追责"))) {
                 item.setIsPunish("是");
             } else {

src/main/java/com/biutag/supervision/controller/system/DictController.java

@@ -8,9 +8,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.biutag.supervision.pojo.Result;
 import com.biutag.supervision.pojo.dto.DictDataDto;
 import com.biutag.supervision.pojo.dto.DictTypeDto;
+import com.biutag.supervision.pojo.entity.SupDict12337HandleResult;
 import com.biutag.supervision.pojo.entity.SupDictData;
 import com.biutag.supervision.pojo.entity.SupDictType;
 import com.biutag.supervision.pojo.vo.DictProblemSourceTree;
+import com.biutag.supervision.pojo.vo.SelectOption;
+import com.biutag.supervision.pojo.vo.SelectOptionGroup;
+import com.biutag.supervision.service.SupDict12337HandleResultService;
 import com.biutag.supervision.service.SupDictDataService;
 import com.biutag.supervision.service.SupDictProblemSourceService;
 import com.biutag.supervision.service.SupDictTypeService;
@@ -18,7 +22,10 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
+import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @RequiredArgsConstructor
 @RequestMapping("dict")
@@ -31,6 +38,8 @@ public class DictController {
 
     private final SupDictProblemSourceService dictProblemSourceService;
 
+    private final SupDict12337HandleResultService dict12337HandleResultService;
+
     @GetMapping
     public Result<Page<SupDictType>> page(Page<SupDictType> page, String dictName, String dictType) {
         LambdaQueryWrapper<SupDictType> queryWrapper = new LambdaQueryWrapper<SupDictType>()
@@ -102,4 +111,27 @@ public class DictController {
         return Result.success(dictProblemSourceService.buildTree());
     }
 
+    @GetMapping("12337HandleResult")
+    public Result<List<SelectOptionGroup>> handleResult() {
+        List<SupDict12337HandleResult> list = dict12337HandleResultService.list();
+        Map<String, List<SupDict12337HandleResult>> collect = list.stream().collect(Collectors.groupingBy(SupDict12337HandleResult::getGroupName));
+        List<String> groups = List.of("第一种形态", "第二种形态","第三种形态","第四种形态");
+        List<SelectOptionGroup> result = collect.keySet().stream()
+                // 排序
+                .sorted(Comparator.comparingInt(groups::indexOf))
+                .map(label -> {
+            SelectOptionGroup group = new SelectOptionGroup();
+            group.setLabel(label);
+            group.setOptions(collect.get(label).stream().map(o -> {
+                SelectOption option = new SelectOption();
+                option.setText(o.getName());
+                option.setValue(o.getName());
+                return option;
+            }).toList());
+            return group;
+        }).toList();
+
+        return Result.success(result);
+    }
+
 }

src/main/java/com/biutag/supervision/mapper/SupDict12337HandleResultMapper.java

@@ -0,0 +1,8 @@
+package com.biutag.supervision.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.biutag.supervision.pojo.entity.SupDict12337HandleResult;
+
+public interface SupDict12337HandleResultMapper extends BaseMapper<SupDict12337HandleResult> {
+
+}

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

@@ -40,6 +40,10 @@ public class TaskProblemDto {
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
     private LocalDateTime supTime;
 
+    private String empNo;
+
+    private String supRecordId;
+
     @Setter
     @Getter
     public static class People {

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

@@ -324,4 +324,8 @@ public class Negative {
 
     private String visitingLeaderEmpNo;
 
+    private String handleResult12337;
+
+    private String handleResult12337Group;
+
 }

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

@@ -0,0 +1,31 @@
+package com.biutag.supervision.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+@TableName("sup_dict_12337_handle_result")
+@Setter
+@Getter
+public class SupDict12337HandleResult {
+
+    // 
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    // 
+    @TableField("name")
+    private String name;
+
+    // 
+    @TableField("group_name")
+    private String groupName;
+
+    private Integer sortId;
+
+}

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

@@ -14,10 +14,10 @@ import java.time.LocalDateTime;
 public class SupRiskPersonalSupRecord {
 
     @TableId(value = "id", type = IdType.AUTO)
-    private int id;
+    private Integer id;
 
     @TableField("task_id")
-    private int taskId;
+    private String taskId;
     //重点人员姓名
     @TableField("name")
     private String name;

src/main/java/com/biutag/supervision/pojo/vo/DataPetition12337ExportVo.java

@@ -350,13 +350,13 @@ public class DataPetition12337ExportVo implements Serializable {
      * 处理结论形态
      */
     @ExcelProperty("处理结论形态")
-    private String processResType;
+    private String handleResult12337Group;
 
     /**
      * 处理结论结果
      */
     @ExcelProperty("处理结论结果")
-    private String processResDes;
+    private String handleResult12337;
 
     /**
      * 处分处理情况

src/main/java/com/biutag/supervision/pojo/vo/SelectOption.java

@@ -0,0 +1,18 @@
+package com.biutag.supervision.pojo.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wxc
+ * @date 2025/7/25
+ */
+@Setter
+@Getter
+public class SelectOption {
+
+    private String text;
+
+    private String value;
+
+}

src/main/java/com/biutag/supervision/pojo/vo/SelectOptionGroup.java

@@ -0,0 +1,21 @@
+package com.biutag.supervision.pojo.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author wxc
+ * @date 2025/7/25
+ */
+@Setter
+@Getter
+public class SelectOptionGroup {
+
+    private String label;
+
+    private List<SelectOption> options = new ArrayList<>();
+
+}

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

@@ -0,0 +1,11 @@
+package com.biutag.supervision.service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.biutag.supervision.pojo.entity.SupDict12337HandleResult;
+import com.biutag.supervision.mapper.SupDict12337HandleResultMapper;
+import org.springframework.stereotype.Service;
+
+@Service
+public class SupDict12337HandleResultService extends ServiceImpl<SupDict12337HandleResultMapper, SupDict12337HandleResult> {
+
+}

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

@@ -1,9 +1,10 @@
 package com.biutag.supervision.service;
 
-import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.biutag.supervision.mapper.SupRiskPersonalSupRecordMapper;
+import com.biutag.supervision.pojo.dto.TaskProblemDto;
+import com.biutag.supervision.pojo.entity.SupRiskPersonal;
 import com.biutag.supervision.pojo.entity.SupRiskPersonalSupRecord;
 import com.biutag.supervision.pojo.vo.FileVo;
 import com.biutag.supervision.util.JSON;
@@ -11,8 +12,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
-import java.io.ByteArrayInputStream;
-import java.util.Base64;
 import java.util.List;
 
 @RequiredArgsConstructor
@@ -23,8 +22,12 @@ public class SupRiskPersonalSupRecordAsyncService {
 
     private final SupRiskPersonalSupRecordMapper baseMapper;
 
+    private final SupTaskProblemService taskProblemService;
+
+    private final SupRiskPersonalService riskPersonalService;
+
     @Async
-    public void uploadFile(List<FileVo> files, Integer id) {
+    public void uploadFile(List<FileVo> files, SupRiskPersonalSupRecord supRecord) {
         if (!files.isEmpty()) {
             for (FileVo file : files) {
                 if (StrUtil.isNotBlank(file.getFilePath())) {
@@ -36,10 +39,30 @@ public class SupRiskPersonalSupRecordAsyncService {
                 file.setBase64(null);
             }
             LambdaUpdateWrapper<SupRiskPersonalSupRecord> updateWrapper = new LambdaUpdateWrapper<>();
-            updateWrapper.eq(SupRiskPersonalSupRecord::getId, id)
+            String fileString = JSON.toJSONString(files);
-                    .set(SupRiskPersonalSupRecord::getFiles, JSON.toJSONString(files));
+            updateWrapper.eq(SupRiskPersonalSupRecord::getId, supRecord.getId())
+                    .set(SupRiskPersonalSupRecord::getFiles, fileString);
             baseMapper.update(updateWrapper);
+            supRecord.setFiles(fileString);
+        }
+        if ("失控".equals(supRecord.getSupStatus()) || "无法确认".equals(supRecord.getSupStatus())) {
+            // 保存问题
+            saveProblem(files, supRecord);
         }
+
+    }
+
+    public void saveProblem(List<FileVo> files, SupRiskPersonalSupRecord supRecord) {
+        TaskProblemDto problemDto = new TaskProblemDto();
+        problemDto.setHasProblem(true);
+        SupRiskPersonal riskPersonal = riskPersonalService.getById(supRecord.getIdCode());
+        // 责任单位
+        problemDto.setDepartId(riskPersonal.getResponsibleDepartId());
+        problemDto.setTaskId(supRecord.getTaskId());
+        problemDto.setFiles(files);
+        problemDto.setSupRecordId(supRecord.getId().toString());
+        problemDto.setThingDesc(supRecord.getSupDesc());
+        taskProblemService.save(problemDto);
     }
 
 }

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

@@ -53,7 +53,7 @@ public class SupRiskPersonalSupRecordService extends ServiceImpl<SupRiskPersonal
                 taskService.update(new LambdaUpdateWrapper<SupTask>().eq(SupTask::getId, supRecordDto.getTaskId())
                         .set(SupTask::getTaskStatus, WorkStatusEnum.done.name()));
             }
-            riskPersonalSupRecordAsyncService.uploadFile(supRecordDto.getFiles(), supRecord.getId());
+            riskPersonalSupRecordAsyncService.uploadFile(supRecordDto.getFiles(), supRecord);
         }
 
         return b;

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

@@ -50,6 +50,8 @@ public class SupTaskProblemService extends ServiceImpl<SupTaskProblemMapper, Sup
         problem.setDepartName(departService.getById(dto.getDepartId()).getShortName());
         problem.setThingDesc(dto.getThingDesc());
         problem.setContentId(dto.getContentId());
+        problem.setEmpNo(dto.getEmpNo());
+        problem.setSupRecordId(dto.getSupRecordId());
         if (dto.getHasProblem()) {
             problem.setProblemTypeCode(dto.getProblemTypeCode());
             problem.setProblemType(problemTypeService.getFullName(dto.getProblemTypeCode()));

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

@@ -75,6 +75,7 @@ public class SupTaskTestingAlcoholPeopleAsyncService {
                 problemDto.setPeoples(List.of(people));
                 problemDto.setTaskId(dto.getTaskId());
                 problemDto.setFiles(dto.getTestingFiles());
+                problemDto.setEmpNo(dto.getEmpNo());
                 // XX年X月X日X时X分，在“公安部六项规定”督察中，发现“XX”单位的“X”存在“违规宴请”的问题情况，请立即组织核实其当时情况。
                 // XX年X月X日X时X分，在“公安部六项规定”督察中，发现“X”单位的“XX”存在“饮酒”的问题情况，请立即组织核实其当时情况.
                 String thingDesc = String.format("%s，在“公安部六项规定”督察中，", dto.getTestingTime().format(DateTimeFormatter.ofPattern("yyyy年MM月dd日HH时mm分")));

src/main/resources/mapper/DataPetition12337Mapper.xml

@@ -102,7 +102,6 @@
             <result property="secondDepartName" column="second_depart_name" jdbcType="VARCHAR"/>
             <result property="thirdDepartId" column="third_depart_id" jdbcType="VARCHAR"/>
             <result property="thirdDepartName" column="third_depart_name" jdbcType="VARCHAR"/>
-            <result property="distributionstate" column="distributionState" jdbcType="INTEGER"/>
             <result property="isReal" column="is_real" jdbcType="INTEGER"/>
     </resultMap>
 
@@ -169,7 +168,7 @@
     <select id="queryPageExport" resultType="com.biutag.supervision.pojo.vo.DataPetition12337ExportVo">
         SELECT
             p.*, n.handle_second_depart_name, n.handle_polices, n.check_status_desc, n.checkStatus, n.checkStatusName, n.id, n.processing_status,
-            n.accountability_target
+            n.accountability_target, n.handle_result12337, n.handle_result12337_group
         FROM
             data_petition_12337 p left join negative n on p.only_id = n.originId
             ${ew.getCustomSqlSegment}

src/test/java/com/biutag/supervision/tools/GenCodeTests.java

@@ -25,7 +25,7 @@ public class GenCodeTests {
 
     @Test
     public void genEntity() throws TemplateException, IOException {
-        String tableName = "sup_task_selfexamination_content";
+        String tableName = "sup_dict_12337_handle_result";
         String tableSchema = "negative";
         boolean genMapper = true;
         boolean genService = true;