From 7002b107f3b2d618776fb757eb97de17fab2b26e Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Wed, 24 Jan 2024 11:24:20 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E4=BC=81=E6=A0=87=E7=A8=BD=E6=9F=A5?= =?UTF-8?q?=E8=AE=A1=E5=88=92):=2080985?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/EsInspectPlanFlowServiceImpl.java | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java index 27b6f983..1fd91451 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java @@ -168,14 +168,26 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService { } ProcessAll processAll = esInspectPlanFlowVO.getProcessAll(); String projectId = processAll.getProjectId(); - processEsInspectPlanList.stream().map(v -> { - if (StringUtils.isBlank(v.getId())){ - v.setId(String.valueOf(SnowflakeUtils.snowflake())); - } - v.setProjectId(projectId); - return v; - }).collect(Collectors.toList()).forEach(v -> log.info(v.toString())); - processEsInspectPlanService.saveOrUpdateBatch(processEsInspectPlanList); + + List updateProcessEsInspectPlanList = processEsInspectPlanList.stream() + .filter(v -> StringUtils.isNotBlank(v.getId())) + .map(v -> { + v.setProjectId(projectId); + return v; + }) + .collect(Collectors.toList()); + processEsInspectPlanService.updateBatchById(updateProcessEsInspectPlanList); + + List saveProcessEsInspectPlanList = processEsInspectPlanList.stream() + .filter(v -> StringUtils.isBlank(v.getId())) + .map(v -> { + v.setId(String.valueOf(SnowflakeUtils.snowflake())); + v.setProjectId(projectId); + return v; + }) + .collect(Collectors.toList()); + processEsInspectPlanService.saveBatch(saveProcessEsInspectPlanList); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 处理意见