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(); // 处理意见