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

fix: 80923 企标计划立项/变更流程--手机端已处理，PC页面再次审批，提示语统一换一下

Browse Source
This commit is contained in:
mzaxd
2024-01-17 17:11:33 +08:00
parent 766242d403
commit e54bf5b3cd
9 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java
+3 -3
View File
@@ -181,6 +181,9 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl<ProcessEsAbolishMap
String userId = UserUtils.getUserId();
CommonVO commonVO = abolishData.getCommon();
String taskId = commonVO.getTaskId();
if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) {
throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
}
Map<String, Object> flowUser = abolishData.getFlowUser();
// 获取流程实例ID
String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
@@ -189,9 +192,6 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl<ProcessEsAbolishMap
.processInstanceId(processInstanceId).singleResult();
// 获取流程定义ID
String processDefinitionId = processInstance.getProcessDefinitionId();
if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
}
// 如果是最后一个节点的审批则需要判断是否可以通过
String taskName = taskService.createTaskQuery().taskId(taskId).singleResult().getName();
if (pass && taskName.equals("标准化审批")) {
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
+1 -1
View File
@@ -278,7 +278,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
Map<String, Object> flowUser = annualInitData.getFlowUser();
String taskId = commonVO.getTaskId();
// 获取task
if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) {
throw new JeroBootException("taskId为空或任务不存在");
}
String userId = actFlowCommonService.getOriginTaskAssignee(taskId);
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
+1 -1
View File
@@ -153,7 +153,7 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
List<ProcessEsAnnualReport> dataList = annualReportDataVO.getDataList();
String taskId = commonVO.getTaskId();
// 获取task
if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) {
throw new JeroBootException("taskId为空或任务不存在");
}
Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java
+3 -3
View File
@@ -184,6 +184,9 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl<ProcessEsArchiveMap
CommonVO commonVO = archiveDataVO.getCommon();
Map<String, Object> flowUser = archiveDataVO.getFlowUser();
String taskId = commonVO.getTaskId();
if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) {
throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
}
// 获取流程实例ID
String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
// 获取流程实例对象
@@ -191,9 +194,6 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl<ProcessEsArchiveMap
.processInstanceId(processInstanceId).singleResult();
// 获取流程定义ID
String processDefinitionId = processInstance.getProcessDefinitionId();
if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
}
// 如果是最后一个节点的审批则需要判断是否可以通过
String taskName = taskService.createTaskQuery().taskId(taskId).singleResult().getName();
if (pass && taskName.equals("标准化审批")) {
laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java
+4 -4
View File
@@ -193,13 +193,13 @@ public class ProcessEsChangeServiceImpl extends ServiceImpl<ProcessEsChangeMappe
public void approval(ESChangeDataVO changeData, boolean pass) {
String userId = UserUtils.getUserId();
CommonVO commonVO = changeData.getCommon();
Map<String, Object> flowUser = changeData.getFlowUser();
String taskId = commonVO.getTaskId();
// 获取流程实例ID
String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) {
throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
}
Map<String, Object> flowUser = changeData.getFlowUser();
// 获取流程实例ID
String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
// 获取流程实例对象
ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
.processInstanceId(processInstanceId).singleResult();
laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java
+3 -3
View File
@@ -180,6 +180,9 @@ public class ProcessEsEnableServiceImpl extends ServiceImpl<ProcessEsEnableMappe
String userId = UserUtils.getUserId();
CommonVO commonVO = enableData.getCommon();
String taskId = commonVO.getTaskId();
if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) {
throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
}
Map<String, Object> flowUser = enableData.getFlowUser();
// 获取流程实例ID
String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
@@ -188,9 +191,6 @@ public class ProcessEsEnableServiceImpl extends ServiceImpl<ProcessEsEnableMappe
.processInstanceId(processInstanceId).singleResult();
// 获取流程定义ID
String processDefinitionId = processInstance.getProcessDefinitionId();
if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
}
// 如果是最后一个节点的审批则需要判断是否可以通过
String taskName = taskService.createTaskQuery().taskId(taskId).singleResult().getName();
if (pass && taskName.equals("标准化审批")) {
laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
+3 -3
View File
@@ -240,12 +240,12 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
public void approvalInitChange(InitChangeDataVO initChangeDataVO, boolean pass) {
String userId = UserUtils.getUserId();
CommonVO commonVO = initChangeDataVO.getCommonVO();
List<ProcessEsInitChange> initChangeList = initChangeDataVO.getDataList();
Map<String, Object> flowUserInfoVO = initChangeDataVO.getFlowUserInfoVO();
String taskId = commonVO.getTaskId();
if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) {
throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
}
List<ProcessEsInitChange> initChangeList = initChangeDataVO.getDataList();
Map<String, Object> flowUserInfoVO = initChangeDataVO.getFlowUserInfoVO();
String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
String processDefinitionId = actFlowCommonService.getProcessDefId(processInstanceId);
Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java
+3 -3
View File
@@ -204,12 +204,12 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl<ProcessEsRecheckMap
public void approval(ESRecheckDataVO recheckData, boolean pass) {
String userId = UserUtils.getUserId();
CommonVO commonVO = recheckData.getCommon();
ProcessEsRecheck data = recheckData.getData();
Map<String, Object> flowUser = recheckData.getFlowUser();
String taskId = commonVO.getTaskId();
if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) {
throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
}
ProcessEsRecheck data = recheckData.getData();
Map<String, Object> flowUser = recheckData.getFlowUser();
String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
if (pass) {
saveOrUpdate(recheckData.getData());
laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
+1 -1
View File
@@ -310,7 +310,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
CommonVO commonVO = revisionData.getCommon();
String taskId = commonVO.getTaskId();
// 获取task
if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) {
throw new JeroBootException("taskId为空或任务不存在");
}
String userId = actFlowCommonService.getOriginTaskAssignee(taskId);