From 0c6066508e0ff3c792034fd21b1a4f2c4438c303 Mon Sep 17 00:00:00 2001 From: wxc <191104855@qq.com> Date: Mon, 28 Jul 2025 15:22:47 +0800 Subject: [PATCH] =?UTF-8?q?fit:=20=E5=AE=8C=E5=96=8412337=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=E5=AF=BC=E5=87=BA=20fit:=20=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=9D=A3=E5=AF=9F=20=E9=87=8D=E7=82=B9=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E7=9D=A3=E5=AF=9F=E8=AE=B0=E5=BD=95=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=A6=82=E4=BD=95=E5=A4=B1=E6=8E=A7=E6=88=96=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E7=A1=AE=E8=AE=A4=E7=94=9F=E6=88=90=E7=9D=A3=E5=AF=9F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../books/NegativeBookController.java | 11 ------ .../controller/system/DictController.java | 32 +++++++++++++++++ .../SupDict12337HandleResultMapper.java | 8 +++++ .../supervision/pojo/dto/TaskProblemDto.java | 4 +++ .../supervision/pojo/entity/Negative.java | 4 +++ .../pojo/entity/SupDict12337HandleResult.java | 31 ++++++++++++++++ .../pojo/entity/SupRiskPersonalSupRecord.java | 4 +-- .../pojo/vo/DataPetition12337ExportVo.java | 4 +-- .../supervision/pojo/vo/SelectOption.java | 18 ++++++++++ .../pojo/vo/SelectOptionGroup.java | 21 +++++++++++ .../SupDict12337HandleResultService.java | 11 ++++++ .../SupRiskPersonalSupRecordAsyncService.java | 35 +++++++++++++++---- .../SupRiskPersonalSupRecordService.java | 2 +- .../service/SupTaskProblemService.java | 2 ++ ...pTaskTestingAlcoholPeopleAsyncService.java | 1 + .../mapper/DataPetition12337Mapper.xml | 3 +- .../supervision/tools/GenCodeTests.java | 2 +- 17 files changed, 168 insertions(+), 25 deletions(-) create mode 100644 src/main/java/com/biutag/supervision/mapper/SupDict12337HandleResultMapper.java create mode 100644 src/main/java/com/biutag/supervision/pojo/entity/SupDict12337HandleResult.java create mode 100644 src/main/java/com/biutag/supervision/pojo/vo/SelectOption.java create mode 100644 src/main/java/com/biutag/supervision/pojo/vo/SelectOptionGroup.java create mode 100644 src/main/java/com/biutag/supervision/service/SupDict12337HandleResultService.java diff --git a/src/main/java/com/biutag/supervision/controller/books/NegativeBookController.java b/src/main/java/com/biutag/supervision/controller/books/NegativeBookController.java index 8ed9899..7e19c5c 100644 --- a/src/main/java/com/biutag/supervision/controller/books/NegativeBookController.java +++ b/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 blames = negativeBlames.stream().filter(blame -> blame.getNegativeId().equals(item.getId())).toList(); - List 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 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 { diff --git a/src/main/java/com/biutag/supervision/controller/system/DictController.java b/src/main/java/com/biutag/supervision/controller/system/DictController.java index 497e52f..d09e789 100644 --- a/src/main/java/com/biutag/supervision/controller/system/DictController.java +++ b/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(Page page, String dictName, String dictType) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() @@ -102,4 +111,27 @@ public class DictController { return Result.success(dictProblemSourceService.buildTree()); } + @GetMapping("12337HandleResult") + public Result> handleResult() { + List list = dict12337HandleResultService.list(); + Map> collect = list.stream().collect(Collectors.groupingBy(SupDict12337HandleResult::getGroupName)); + List groups = List.of("第一种形态", "第二种形态","第三种形态","第四种形态"); + List 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); + } + } diff --git a/src/main/java/com/biutag/supervision/mapper/SupDict12337HandleResultMapper.java b/src/main/java/com/biutag/supervision/mapper/SupDict12337HandleResultMapper.java new file mode 100644 index 0000000..fa29e5a --- /dev/null +++ b/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 { + +} \ No newline at end of file diff --git a/src/main/java/com/biutag/supervision/pojo/dto/TaskProblemDto.java b/src/main/java/com/biutag/supervision/pojo/dto/TaskProblemDto.java index bc4895f..cf86947 100644 --- a/src/main/java/com/biutag/supervision/pojo/dto/TaskProblemDto.java +++ b/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 { diff --git a/src/main/java/com/biutag/supervision/pojo/entity/Negative.java b/src/main/java/com/biutag/supervision/pojo/entity/Negative.java index ff1e874..1ec03c5 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/Negative.java +++ b/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; + } diff --git a/src/main/java/com/biutag/supervision/pojo/entity/SupDict12337HandleResult.java b/src/main/java/com/biutag/supervision/pojo/entity/SupDict12337HandleResult.java new file mode 100644 index 0000000..612adda --- /dev/null +++ b/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; + +} \ No newline at end of file diff --git a/src/main/java/com/biutag/supervision/pojo/entity/SupRiskPersonalSupRecord.java b/src/main/java/com/biutag/supervision/pojo/entity/SupRiskPersonalSupRecord.java index 707b1ef..617c30d 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/SupRiskPersonalSupRecord.java +++ b/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; diff --git a/src/main/java/com/biutag/supervision/pojo/vo/DataPetition12337ExportVo.java b/src/main/java/com/biutag/supervision/pojo/vo/DataPetition12337ExportVo.java index 609c333..8b87c9c 100644 --- a/src/main/java/com/biutag/supervision/pojo/vo/DataPetition12337ExportVo.java +++ b/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; /** * 处分处理情况 diff --git a/src/main/java/com/biutag/supervision/pojo/vo/SelectOption.java b/src/main/java/com/biutag/supervision/pojo/vo/SelectOption.java new file mode 100644 index 0000000..3a4f04c --- /dev/null +++ b/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; + +} diff --git a/src/main/java/com/biutag/supervision/pojo/vo/SelectOptionGroup.java b/src/main/java/com/biutag/supervision/pojo/vo/SelectOptionGroup.java new file mode 100644 index 0000000..24303eb --- /dev/null +++ b/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 options = new ArrayList<>(); + +} diff --git a/src/main/java/com/biutag/supervision/service/SupDict12337HandleResultService.java b/src/main/java/com/biutag/supervision/service/SupDict12337HandleResultService.java new file mode 100644 index 0000000..2c56925 --- /dev/null +++ b/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 { + +} diff --git a/src/main/java/com/biutag/supervision/service/SupRiskPersonalSupRecordAsyncService.java b/src/main/java/com/biutag/supervision/service/SupRiskPersonalSupRecordAsyncService.java index d469d67..35821be 100644 --- a/src/main/java/com/biutag/supervision/service/SupRiskPersonalSupRecordAsyncService.java +++ b/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 files, Integer id) { + public void uploadFile(List 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 updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.eq(SupRiskPersonalSupRecord::getId, id) - .set(SupRiskPersonalSupRecord::getFiles, JSON.toJSONString(files)); + String fileString = 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 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); } } diff --git a/src/main/java/com/biutag/supervision/service/SupRiskPersonalSupRecordService.java b/src/main/java/com/biutag/supervision/service/SupRiskPersonalSupRecordService.java index 7f846f8..5ad5369 100644 --- a/src/main/java/com/biutag/supervision/service/SupRiskPersonalSupRecordService.java +++ b/src/main/java/com/biutag/supervision/service/SupRiskPersonalSupRecordService.java @@ -53,7 +53,7 @@ public class SupRiskPersonalSupRecordService extends ServiceImpl().eq(SupTask::getId, supRecordDto.getTaskId()) .set(SupTask::getTaskStatus, WorkStatusEnum.done.name())); } - riskPersonalSupRecordAsyncService.uploadFile(supRecordDto.getFiles(), supRecord.getId()); + riskPersonalSupRecordAsyncService.uploadFile(supRecordDto.getFiles(), supRecord); } return b; diff --git a/src/main/java/com/biutag/supervision/service/SupTaskProblemService.java b/src/main/java/com/biutag/supervision/service/SupTaskProblemService.java index d8733e7..042f567 100644 --- a/src/main/java/com/biutag/supervision/service/SupTaskProblemService.java +++ b/src/main/java/com/biutag/supervision/service/SupTaskProblemService.java @@ -50,6 +50,8 @@ public class SupTaskProblemService extends ServiceImpl - @@ -169,7 +168,7 @@