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:52:52 +08:00
parent 95f4c50b68
commit 9e590d01e0
2 changed files with 10 additions and 13 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 -12
View File
@@ -129,9 +129,8 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl<Process
Map<String, Object> map = new HashMap<>();
// 人员信息
userInfoMap.forEach((key, value) -> {
if(Objects.equals("moreUserList",key)){
map.put(key, Arrays.asList(value.toString().split(",")));
}else if(Objects.equals("checkUserLeader1List",key + "List")
if(Objects.equals("moreUserList",key + "List")
|| Objects.equals("checkUserLeader1List",key + "List")
|| Objects.equals("checkUserLeader2List",key + "List")){
map.put(key, value);
map.put(key + "List", Arrays.asList(value.toString().split(",")));
@@ -208,14 +207,8 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl<Process
}
runtimeService.setVariable(processInstanceId, PASS, pass);
// 判断任务是否为委托状态
if (task != null && task.getDelegationState() == DelegationState.PENDING) {
// 任务处于委托状态，应使用resolveTask方法
taskService.resolveTask(taskId);
} else {
// 审批节点
actFlowCommonService.completeTask(taskId, userId);
}
// 审批节点
actFlowCommonService.completeTask(taskId, userId);
// 保存快照
// 获取流程通用数据
ProcessAll process = processAllService.getByProcessInstanceId(processInstanceId);
@@ -301,12 +294,16 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl<Process
@Override
public void checkProcessStatus(String id) {
LambdaQueryWrapper<ProcessMarketStandardRelease> queryWrapperMarketStandardRelease = new LambdaQueryWrapper<>();
queryWrapperMarketStandardRelease.select(ProcessMarketStandardRelease::getProcessInstanceId);
queryWrapperMarketStandardRelease.eq(ProcessMarketStandardRelease::getManifestId,id);
List<ProcessMarketStandardRelease> listProcessMarketStandardRelease = list(queryWrapperMarketStandardRelease);
if(CollectionUtils.isEmpty(listProcessMarketStandardRelease)){
return;
}
List<ProcessMarketStandardRelease> listStream = listProcessMarketStandardRelease.stream().filter(o->
!StringUtils.isBlank(o.getProcessInstanceId())).collect(Collectors.toList());
if(CollectionUtils.isEmpty(listStream)){
return;
}
List<String> listProcessInstanceId = listProcessMarketStandardRelease.stream()
.map(ProcessMarketStandardRelease::getProcessInstanceId).collect(Collectors.toList());
LambdaQueryWrapper<ProcessAll> queryProcessAll = new LambdaQueryWrapper<>();
laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java
+1 -1
View File
@@ -295,7 +295,7 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
}
@Transactional(rollbackFor = JeroBootException.class)
public void delegateTask(DelegateTaskParam param) {
String taskId = param.getTaskId();
String userId = param.getUserId();