diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java index 8713cb83..8246ce57 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java @@ -173,8 +173,6 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl() .eq(LawsOverseasStandard::getStandardNumber, map.get(FieldCommon.STANDARD_NUMBER))); if (documentCount > 0 || overseasCount > 0){ - throw new JeroBootException("标准编号已入库或已发起入库流程,不可重复发起!"); + throw new JeroBootException("标准编号不可重复入库!"); } - List list = list( - new LambdaQueryWrapper() - .ne(ProcessFbEntryChange::getId, businessId) - .eq(ProcessFbEntryChange::getStandardNumber, map.get(FieldCommon.STANDARD_NUMBER)) - .eq(ProcessFbEntryChange::getOperateType, "1")); - for (ProcessFbEntryChange processFbEntryChange : list) { - int count = processDraftService.count( - new LambdaQueryWrapper() - .eq(ProcessDraft::getProjectId, processFbEntryChange.getId()) - .and(qw -> qw.ne(ProcessDraft::getSaveSource, "3") - .or().isNull(ProcessDraft::getSaveSource))); - if (count == 0){ - throw new JeroBootException("标准编号已入库或已发起入库流程,不可重复发起!"); - } - } + /** + * List list = list( + * new LambdaQueryWrapper() + * .ne(ProcessFbEntryChange::getId, businessId) + * .eq(ProcessFbEntryChange::getStandardNumber, map.get(FieldCommon.STANDARD_NUMBER)) + * .eq(ProcessFbEntryChange::getOperateType, "1")); + * for (ProcessFbEntryChange processFbEntryChange : list) { + * int count = processDraftService.count( + * new LambdaQueryWrapper() + * .eq(ProcessDraft::getProjectId, processFbEntryChange.getId()) + * .and(qw -> qw.ne(ProcessDraft::getSaveSource, "3") + * .or().isNull(ProcessDraft::getSaveSource))); + * if (count == 0){ + * throw new JeroBootException("标准编号已入库或已发起入库流程,不可重复发起!"); + * } + * } + */ } } @@ -241,12 +241,14 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl objectMap = JSON.parseObject(businessInfoDTO.getBusinessJson(), Map.class); objectMap.put(FieldCommon.MODULE, businessInfoDTO.getSource()); if ("1".equals(businessInfoDTO.getOperateType())) { + // 重复性校验 + duplicateCheck(processInfoVO.getBusinessId()); // 如果是标准法规入库流程 lawsCommonService.commonAdd(objectMap); } else { // 如果是标准法规变更流程 // 发送消息 - sendMsg(objectMap, processInfoVO.getBusinessId()); + sendMsg(objectMap); lawsCommonService.commonEdit(objectMap); } log.info("《标准法规入库/变更流程》结束,流程名称:{}", basicProcessInfoDTO.getProcessName()); @@ -258,7 +260,7 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl objectMap, String businessId) { + private void sendMsg(Map objectMap) { String module = (String) objectMap.get(FieldCommon.MODULE); String id = (String) objectMap.get("id"); String standardNumber = (String) objectMap.get(FieldCommon.STANDARD_NUMBER);