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

fix(稽查延期申请流程): 81839

Browse Source
This commit is contained in:
yjz
2024-02-07 16:32:09 +08:00
parent 3d30ca5ea4
commit 6e90e20279
14 changed files with 43 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/aspect/ProcessAspect.java
+17 -2
View File
@@ -13,9 +13,13 @@ import com.jero.modules.activiti.entity.ProcessApprovalRecord;
import com.jero.modules.activiti.entity.ProcessNode;
import com.jero.modules.activiti.enums.CommitFlagEnum;
import com.jero.modules.activiti.enums.FinishFlagEnum;
import com.jero.modules.activiti.enums.ProcessTypeEnum;
import com.jero.modules.activiti.enums.VariableTypeEnum;
import com.jero.modules.activiti.process.common.entity.ProcessDraft;
import com.jero.modules.activiti.process.common.service.ProcessDraftService;
import com.jero.modules.activiti.process.esinspectdelayapply.common.EsInspectDelayApplyCommon;
import com.jero.modules.activiti.process.esinspectdelayapply.entity.ProcessEsInspectDelayApply;
import com.jero.modules.activiti.process.esinspectdelayapply.service.IProcessEsInspectDelayApplyService;
import com.jero.modules.activiti.process.esinspectplan.common.EsInspectPlanCommon;
import com.jero.modules.activiti.service.ProcessAllService;
import com.jero.modules.activiti.service.ProcessApprovalRecordService;
@@ -276,7 +280,7 @@ public class ProcessAspect {
log.info("==========流程转办后置方法开始==========");
if (!Objects.isNull(jp.getArgs())) {
String taskId = JSON.parseObject(JSON.toJSONString(jp.getArgs()[0]), String.class);
String userId = JSON.parseObject(JSON.toJSONString(jp.getArgs()[1]), String.class);
String toUserId = JSON.parseObject(JSON.toJSONString(jp.getArgs()[1]), String.class);
ProcessApprovalRecord processApprovalRecord = processApprovalRecordService.getToDoByTaskId(taskId);
String processInstanceId = processApprovalRecord.getProcessInstanceId();
ProcessAll processAll = processAllService.getByProcessInstanceId(processInstanceId);
@@ -288,7 +292,18 @@ public class ProcessAspect {
.eq(ProcessNode::getProcessDefinitionId, processAll.getProcessDefinitionId())
.eq(ProcessNode::getXmlNodeId, processApprovalRecord.getNodeId()));
if (!Objects.isNull(processNode) && VariableTypeEnum.STRING.getName().equals(processNode.getVariableType())){
runtimeService.setVariable(task.getExecutionId(), processNode.getVariableName(), userId);
runtimeService.setVariable(task.getExecutionId(), processNode.getVariableName(), toUserId);
}
// 稽查延期申请流程 稽查联络人评估 节点特殊处理
if (ProcessTypeEnum.ES_INSPECT_DELAY_APPLY.getValue().equals(processAll.getPrcType())
&& EsInspectDelayApplyCommon.PROCESS_NODE_3.equals(processApprovalRecord.getNodeId())){
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
IProcessEsInspectDelayApplyService processEsInspectDelayApplyService = SpringContextUtil.getBean(IProcessEsInspectDelayApplyService.class);
processEsInspectDelayApplyService.update(
new LambdaUpdateWrapper<ProcessEsInspectDelayApply>()
.eq(ProcessEsInspectDelayApply::getProjectId, processAll.getProjectId())
.eq(ProcessEsInspectDelayApply::getLiaisons, loginUser.getId())
.set(ProcessEsInspectDelayApply::getLiaisons, toUserId));
}
}
log.info("==========流程转办后置方法结束==========");
laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlow.java
+2 -2
View File
@@ -32,8 +32,8 @@ public class EsDeclareFlow implements WorkCenterService {
}
@Override
public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) {
public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId, String userId) {
ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class);
processAllService.specialTransfer(processAll, processApprovalRecord, toUserId);
processAllService.specialTransfer(processAll, processApprovalRecord, toUserId, userId);
}
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlow.java
+2 -2
View File
@@ -32,8 +32,8 @@ public class EsInspectFlow implements WorkCenterService {
}
@Override
public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) {
public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId, String userId) {
ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class);
processAllService.specialTransfer(processAll, processApprovalRecord, toUserId);
processAllService.specialTransfer(processAll, processApprovalRecord, toUserId, userId);
}
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlow.java
+2 -2
View File
@@ -32,8 +32,8 @@ public class EsInspectDelayApplyFlow implements WorkCenterService {
}
@Override
public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) {
public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId, String userId) {
ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class);
processAllService.specialTransfer(processAll, processApprovalRecord, toUserId);
processAllService.specialTransfer(processAll, processApprovalRecord, toUserId, userId);
}
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlow.java
+2 -2
View File
@@ -32,8 +32,8 @@ public class EsInspectPlanFlow implements WorkCenterService {
}
@Override
public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) {
public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId, String userId) {
ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class);
processAllService.specialTransfer(processAll, processApprovalRecord, toUserId);
processAllService.specialTransfer(processAll, processApprovalRecord, toUserId, userId);
}
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlow.java
+2 -2
View File
@@ -32,8 +32,8 @@ public class EsInspectRectifyFlow implements WorkCenterService {
}
@Override
public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) {
public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId, String userId) {
ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class);
processAllService.specialTransfer(processAll, processApprovalRecord, toUserId);
processAllService.specialTransfer(processAll, processApprovalRecord, toUserId, userId);
}
}
laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlow.java
+2 -2
View File
@@ -32,8 +32,8 @@ public class EsPermissionApplyFlow implements WorkCenterService {
}
@Override
public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) {
public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId, String userId) {
ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class);
processAllService.specialTransfer(processAll, processApprovalRecord, toUserId);
processAllService.specialTransfer(processAll, processApprovalRecord, toUserId, userId);
}
}
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
+2 -2
View File
@@ -640,8 +640,8 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
}
@Override
public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) {
public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId, String userId) {
ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class);
processAllService.specialTransfer(processAll, processApprovalRecord, toUserId);
processAllService.specialTransfer(processAll, processApprovalRecord, toUserId, userId);
}
}
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java
+1 -1
View File
@@ -1218,7 +1218,7 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
}
@Override
public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) {
public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId, String userId) {
String taskId = processApprovalRecord.getTaskId();
String projectId = processAll.getProjectId();
TaskService taskService = SpringContextUtil.getBean(TaskService.class);
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardPurchaseServiceImpl.java
+2 -2
View File
@@ -334,8 +334,8 @@ public class ProcessFbStandardPurchaseServiceImpl extends ServiceImpl<ProcessFbS
}
@Override
public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) {
public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId, String userId) {
ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class);
processAllService.specialTransfer(processAll, processApprovalRecord, toUserId);
processAllService.specialTransfer(processAll, processApprovalRecord, toUserId, userId);
}
}
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java
+2 -1
View File
@@ -272,6 +272,7 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
// 删除自己的草稿
deleteMyDraft(taskId, processApprovalRecord.getProjectId(), null);
String userId = processApprovalRecord.getUserId();
processApprovalRecord.setTransferBy(CurrentUserUtil.getId()); // 转办人
processApprovalRecord.setUserId(toUserId); // 任务处理人
processApprovalRecordService.updateById(processApprovalRecord);
@@ -281,7 +282,7 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
Object o = Class.forName(ProcessTypeEnum.getClassByValue(prcType)).newInstance();
if (o instanceof WorkCenterService){
classByValue = (WorkCenterService) o;
classByValue.handleTransfer(processAll,processApprovalRecord, toUserId);
classByValue.handleTransfer(processAll,processApprovalRecord, toUserId, userId);
}
}catch (Exception e) {
log.error(e.getMessage(),e);
laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlow.java
+2 -2
View File
@@ -49,8 +49,8 @@ public class MeetingManageFlow implements WorkCenterService {
}
@Override
public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) {
public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId, String userId) {
ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class);
processAllService.specialTransfer(processAll, processApprovalRecord, toUserId);
processAllService.specialTransfer(processAll, processApprovalRecord, toUserId, userId);
}
}
laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java
+2 -2
View File
@@ -394,7 +394,7 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
processAllMapper.physicalDeleteByProjectId(tableName, projectId);
}
public void specialTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) {
public void specialTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId, String userId) {
// 特殊转办
RuntimeService runtimeService = SpringContextUtil.getBean(RuntimeService.class);
ProcessNodeService processNodeService = SpringContextUtil.getBean(ProcessNodeService.class);
@@ -415,7 +415,7 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
processEsInspectDelayApplyService.update(
new LambdaUpdateWrapper<ProcessEsInspectDelayApply>()
.eq(ProcessEsInspectDelayApply::getProjectId, processAll.getProjectId())
.eq(ProcessEsInspectDelayApply::getLiaisons, processApprovalRecord.getUserId())
.eq(ProcessEsInspectDelayApply::getLiaisons, userId)
.set(ProcessEsInspectDelayApply::getLiaisons, toUserId));
}
}
laws-modules/src/main/java/com/jero/modules/activiti/service/WorkCenterService.java
+3 -1
View File
@@ -16,9 +16,11 @@ public interface WorkCenterService {
/**
* 处理转办
*
* @param processAll
* @param processApprovalRecord
* @param toUserId
* @param userId
*/
void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId);
void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId, String userId);
}