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-02-01 13:52:10 +08:00
parent 978a9a15c3
commit 6b5e21fad7
1 changed files with 19 additions and 19 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
+19 -19
View File
@@ -174,6 +174,8 @@ 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)) {
@@ -224,26 +226,24 @@ 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(
* List<ProcessFbEntryChange> list = list( new LambdaQueryWrapper<ProcessFbEntryChange>()
* new LambdaQueryWrapper<ProcessFbEntryChange>() .ne(ProcessFbEntryChange::getId, businessId)
* .ne(ProcessFbEntryChange::getId, businessId) .eq(ProcessFbEntryChange::getStandardNumber, map.get(FieldCommon.STANDARD_NUMBER))
* .eq(ProcessFbEntryChange::getStandardNumber, map.get(FieldCommon.STANDARD_NUMBER)) .eq(ProcessFbEntryChange::getOperateType, "1"));
* .eq(ProcessFbEntryChange::getOperateType, "1")); for (ProcessFbEntryChange processFbEntryChange : list) {
* for (ProcessFbEntryChange processFbEntryChange : list) { int count = processDraftService.count(
* int count = processDraftService.count( new LambdaQueryWrapper<ProcessDraft>()
* new LambdaQueryWrapper<ProcessDraft>() .eq(ProcessDraft::getProjectId, processFbEntryChange.getId())
* .eq(ProcessDraft::getProjectId, processFbEntryChange.getId()) .and(qw -> qw.ne(ProcessDraft::getSaveSource, "3")
* .and(qw -> qw.ne(ProcessDraft::getSaveSource, "3") .or().isNull(ProcessDraft::getSaveSource)));
* .or().isNull(ProcessDraft::getSaveSource))); if (count == 0){
* if (count == 0){ throw new JeroBootException("标准编号已入库或已发起入库流程，不可重复发起！");
* throw new JeroBootException("标准编号已入库或已发起入库流程，不可重复发起！"); }
* } }
* }
*/
} }
} }
@@ -267,7 +267,7 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
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()); // duplicateCheck(processInfoVO.getBusinessId());
// 如果是标准法规入库流程 // 如果是标准法规入库流程
lawsCommonService.commonAdd(objectMap); lawsCommonService.commonAdd(objectMap);
} else { } else {