From cf3febb04902d8dcb72165b865f73e897ef48c8f Mon Sep 17 00:00:00 2001 From: caihaohan Date: Sun, 11 Aug 2024 20:49:13 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20scc=E6=B5=81=E7=A8=8B=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=8E=8B=E7=BC=A9=E5=8C=85=E8=BF=94=E5=9B=9Eid=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fb/service/impl/ProcessHandleServiceImpl.java | 2 ++ .../ProcessStandardComplianceCheckController.java | 6 ++++-- .../entity/vo/WithoutDistributeExcelTemplate.java | 2 ++ .../IProcessStandardComplianceCheckService.java | 2 +- .../ProcessStandardComplianceCheckServiceImpl.java | 13 ++++++++----- 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java index 52769fca..2eadda05 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.jero.common.api.vo.ResultCommon; import com.jero.common.exception.JeroBootException; @@ -434,6 +435,7 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { // 使用 ObjectMapper 将 detailInfoMapList 转换为 JSON 字符串 ObjectMapper objectMapper = new ObjectMapper(); + objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); String jsonString = objectMapper.writeValueAsString(detailInfoMapList); // 将 JSON 字符串反序列化为 List diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java index 0ee9fd59..beb5e6bb 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java @@ -199,8 +199,10 @@ public class ProcessStandardComplianceCheckController extends JeroController importExcelWithData(@RequestParam("file") @ApiParam("文件") MultipartFile file) throws IOException { - Map resultMap = sccService.importExcelWithData(file); + @Translation + public Result importExcelWithData(@RequestParam("file") @ApiParam("文件") MultipartFile file, + @RequestParam("taskId") @ApiParam("任务Id") String taskId) throws IOException { + Map resultMap = sccService.importExcelWithData(file, taskId); Object flag = resultMap.get("flag"); if (flag == YesOrNoEnum.YES.getValue()) { List dataList = (List) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/WithoutDistributeExcelTemplate.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/WithoutDistributeExcelTemplate.java index c5ba0a6b..810a0aa5 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/WithoutDistributeExcelTemplate.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/WithoutDistributeExcelTemplate.java @@ -8,6 +8,8 @@ import org.jeecgframework.poi.excel.annotation.Excel; @Data public class WithoutDistributeExcelTemplate { + private String id; + /** * 条款号 */ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/IProcessStandardComplianceCheckService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/IProcessStandardComplianceCheckService.java index b8591ddc..5441df9b 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/IProcessStandardComplianceCheckService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/IProcessStandardComplianceCheckService.java @@ -35,6 +35,6 @@ public interface IProcessStandardComplianceCheckService extends IService importExcelWithData(MultipartFile file) throws IOException; + Map importExcelWithData(MultipartFile file, String taskId) throws IOException; } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java index 53ab25d2..40349ab2 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java @@ -596,7 +596,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl importExcelWithData(MultipartFile file) throws IOException { + public Map importExcelWithData(MultipartFile file, String taskId) throws IOException { List listDict = commonAPI.getDictItemAll(); Map resultMap = new HashMap<>(); List errorMsgs = new ArrayList<>(); @@ -688,7 +688,8 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl handleData = this.getHandleData(taskId); + this.cleanData(list, handleData.getBusinessInfoDTO().getDetailInfoList()); resultMap.put("dataList", list); } } catch (Exception e) { @@ -730,8 +731,10 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl list) { - list.forEach(item -> { + private void cleanData(List list, List existDataList) { + for (int i = 0; i < list.size(); i++) { + WithoutDistributeExcelTemplate item = list.get(i); + item.setId(existDataList.get(i).getId()); String result = item.getResult(); if (StrUtil.isBlank(result)) { item.setUnsatisfiedRequire(null); @@ -757,7 +760,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl list, List listDict, Map fileMap) {