QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改新法规导入流程、市场清单发布流程保存修改

Browse Source
This commit is contained in:
梁琦涛
2024-07-16 11:17:22 +08:00
parent 17849f6bef
commit 988af25c46
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java
+9
View File
@@ -35,6 +35,7 @@ import org.activiti.engine.runtime.ProcessInstance;
import org.activiti.engine.task.DelegationState; import org.activiti.engine.task.DelegationState;
import org.activiti.engine.task.Task; import org.activiti.engine.task.Task;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
@@ -144,12 +145,20 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl<Process
@Override @Override
@Transactional(rollbackFor = JeroBootException.class) @Transactional(rollbackFor = JeroBootException.class)
public void saveToDraft(ProcessInfoVO<ProcessMarketStandardRelease> processInfoVO) { public void saveToDraft(ProcessInfoVO<ProcessMarketStandardRelease> processInfoVO) {
BasicTaskInfoDTO basicTaskInfoDTO = processInfoVO.getBasicTaskInfoDTO();
if(Objects.isNull(basicTaskInfoDTO) || StringUtils.isBlank(basicTaskInfoDTO.getTaskId())){
// 验证是否已发起流程 // 验证是否已发起流程
checkProcessStatus(processInfoVO.getBusinessInfoDTO().getManifestId()); checkProcessStatus(processInfoVO.getBusinessInfoDTO().getManifestId());
}
ProcessMarketStandardRelease processMarketStandardRelease = processInfoVO.getBusinessInfoDTO();
if(!Objects.isNull(processMarketStandardRelease)){
saveOrUpdate(processMarketStandardRelease);
}
// 流程信息 // 流程信息
BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO();
// 流程类型 // 流程类型
basicProcessInfoDTO.setProcessType(ProcessTypeEnum.MARKET_STANDARD_PUBLISH.getValue()); basicProcessInfoDTO.setProcessType(ProcessTypeEnum.MARKET_STANDARD_PUBLISH.getValue());
processHandleService.saveToDraft(processInfoVO, UserUtils.getUserId()); processHandleService.saveToDraft(processInfoVO, UserUtils.getUserId());
} }
laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java
+4
View File
@@ -141,6 +141,10 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl<ProcessNewS
@Override @Override
@Transactional(rollbackFor = JeroBootException.class) @Transactional(rollbackFor = JeroBootException.class)
public void saveToDraft(ProcessInfoVO<ProcessNewStandardImport> processInfoVO) { public void saveToDraft(ProcessInfoVO<ProcessNewStandardImport> processInfoVO) {
ProcessNewStandardImport processNewStandardImport = processInfoVO.getBusinessInfoDTO();
if(!Objects.isNull(processNewStandardImport)){
saveOrUpdate(processNewStandardImport);
}
// 流程信息 // 流程信息
BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO();
// 流程类型 // 流程类型