ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(标准法规入库流程): 80930

Browse Source
This commit is contained in:
yjz
2024-01-25 14:03:56 +08:00
parent 15c8da599d
commit 79c136216d
1 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
+22 -20
View File
@@ -173,8 +173,6 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
basicProcessInfoDTO.setProcessDefinitionId(processHandleService.getDefinitionIdByKey(ProcessDefinitionKey.FB_ENTRY_CHANGE)); // 流程定义id basicProcessInfoDTO.setProcessDefinitionId(processHandleService.getDefinitionIdByKey(ProcessDefinitionKey.FB_ENTRY_CHANGE)); // 流程定义id
// basicProcessInfoDTO.setProcessName(getProcessNameByBusinessId(processInfoVO.getBusinessId())); // 流程名称 // basicProcessInfoDTO.setProcessName(getProcessNameByBusinessId(processInfoVO.getBusinessId())); // 流程名称
basicProcessInfoDTO.setProcessType(ProcessTypeEnum.FB_ENTRY_CHANGE.getValue()); // 流程类型 basicProcessInfoDTO.setProcessType(ProcessTypeEnum.FB_ENTRY_CHANGE.getValue()); // 流程类型
// 重复性校验
duplicateCheck(processInfoVO.getBusinessId());
// 删除自己的草稿 // 删除自己的草稿
String draftId = processInfoVO.getDraftId(); String draftId = processInfoVO.getDraftId();
if (StringUtils.isNotBlank(draftId)) { if (StringUtils.isNotBlank(draftId)) {
@@ -201,24 +199,26 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
new LambdaQueryWrapper<LawsOverseasStandard>() new LambdaQueryWrapper<LawsOverseasStandard>()
.eq(LawsOverseasStandard::getStandardNumber, map.get(FieldCommon.STANDARD_NUMBER))); .eq(LawsOverseasStandard::getStandardNumber, map.get(FieldCommon.STANDARD_NUMBER)));
if (documentCount > 0 || overseasCount > 0){ if (documentCount > 0 || overseasCount > 0){
throw new JeroBootException("标准编号已入库或已发起入库流程，不可重复发起！"); throw new JeroBootException("标准编号不可重复入库！");
} }
List<ProcessFbEntryChange> list = list( /**
new LambdaQueryWrapper<ProcessFbEntryChange>() * List<ProcessFbEntryChange> list = list(
.ne(ProcessFbEntryChange::getId, businessId) * new LambdaQueryWrapper<ProcessFbEntryChange>()
.eq(ProcessFbEntryChange::getStandardNumber, map.get(FieldCommon.STANDARD_NUMBER)) * .ne(ProcessFbEntryChange::getId, businessId)
.eq(ProcessFbEntryChange::getOperateType, "1")); * .eq(ProcessFbEntryChange::getStandardNumber, map.get(FieldCommon.STANDARD_NUMBER))
for (ProcessFbEntryChange processFbEntryChange : list) { * .eq(ProcessFbEntryChange::getOperateType, "1"));
int count = processDraftService.count( * for (ProcessFbEntryChange processFbEntryChange : list) {
new LambdaQueryWrapper<ProcessDraft>() * int count = processDraftService.count(
.eq(ProcessDraft::getProjectId, processFbEntryChange.getId()) * new LambdaQueryWrapper<ProcessDraft>()
.and(qw -> qw.ne(ProcessDraft::getSaveSource, "3") * .eq(ProcessDraft::getProjectId, processFbEntryChange.getId())
.or().isNull(ProcessDraft::getSaveSource))); * .and(qw -> qw.ne(ProcessDraft::getSaveSource, "3")
if (count == 0){ * .or().isNull(ProcessDraft::getSaveSource)));
throw new JeroBootException("标准编号已入库或已发起入库流程，不可重复发起！"); * if (count == 0){
} * throw new JeroBootException("标准编号已入库或已发起入库流程，不可重复发起！");
} * }
* }
*/
} }
} }
@@ -241,12 +241,14 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
Map<String, Object> objectMap = JSON.parseObject(businessInfoDTO.getBusinessJson(), Map.class); Map<String, Object> objectMap = JSON.parseObject(businessInfoDTO.getBusinessJson(), Map.class);
objectMap.put(FieldCommon.MODULE, businessInfoDTO.getSource()); objectMap.put(FieldCommon.MODULE, businessInfoDTO.getSource());
if ("1".equals(businessInfoDTO.getOperateType())) { if ("1".equals(businessInfoDTO.getOperateType())) {
// 重复性校验
duplicateCheck(processInfoVO.getBusinessId());
// 如果是标准法规入库流程 // 如果是标准法规入库流程
lawsCommonService.commonAdd(objectMap); lawsCommonService.commonAdd(objectMap);
} else { } else {
// 如果是标准法规变更流程 // 如果是标准法规变更流程
// 发送消息 // 发送消息
sendMsg(objectMap, processInfoVO.getBusinessId()); sendMsg(objectMap);
lawsCommonService.commonEdit(objectMap); lawsCommonService.commonEdit(objectMap);
} }
log.info("《标准法规入库/变更流程》结束，流程名称：{}", basicProcessInfoDTO.getProcessName()); log.info("《标准法规入库/变更流程》结束，流程名称：{}", basicProcessInfoDTO.getProcessName());
@@ -258,7 +260,7 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
* @Date: 2023/11/29 16:55 * @Date: 2023/11/29 16:55
* @Description: 发消息 * @Description: 发消息
**/ **/
private void sendMsg(Map<String, Object> objectMap, String businessId) { private void sendMsg(Map<String, Object> objectMap) {
String module = (String) objectMap.get(FieldCommon.MODULE); String module = (String) objectMap.get(FieldCommon.MODULE);
String id = (String) objectMap.get("id"); String id = (String) objectMap.get("id");
String standardNumber = (String) objectMap.get(FieldCommon.STANDARD_NUMBER); String standardNumber = (String) objectMap.get(FieldCommon.STANDARD_NUMBER);