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

laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlow.java

@@ -33,6 +33,7 @@ public class EsDeclareFlow implements WorkCenterService {
 
     @Override
     public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) {
-
+        ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class);
+        processAllService.specialTransfer(processAll, processApprovalRecord, toUserId);
     }
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlow.java

@@ -33,6 +33,7 @@ public class EsInspectFlow implements WorkCenterService {
 
     @Override
     public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) {
-
+        ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class);
+        processAllService.specialTransfer(processAll, processApprovalRecord, toUserId);
     }
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlow.java

@@ -33,6 +33,7 @@ public class EsInspectDelayApplyFlow implements WorkCenterService {
 
     @Override
     public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) {
-
+        ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class);
+        processAllService.specialTransfer(processAll, processApprovalRecord, toUserId);
     }
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlow.java

@@ -33,6 +33,7 @@ public class EsInspectPlanFlow implements WorkCenterService {
 
     @Override
     public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) {
-
+        ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class);
+        processAllService.specialTransfer(processAll, processApprovalRecord, toUserId);
     }
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlow.java

@@ -33,6 +33,7 @@ public class EsInspectRectifyFlow implements WorkCenterService {
 
     @Override
     public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) {
-
+        ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class);
+        processAllService.specialTransfer(processAll, processApprovalRecord, toUserId);
     }
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlow.java

@@ -33,6 +33,7 @@ public class EsPermissionApplyFlow implements WorkCenterService {
 
     @Override
     public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) {
-
+        ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class);
+        processAllService.specialTransfer(processAll, processApprovalRecord, toUserId);
     }
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java

@@ -641,12 +641,7 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
 
     @Override
     public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) {
-
+        ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class);
-    }
+        processAllService.specialTransfer(processAll, processApprovalRecord, toUserId);
-
-    public static void main(String[] args) {
-        for (int i = 0; i < 103; i++) {
-            System.out.println(i);
-        }
     }
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java

@@ -1262,6 +1262,7 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
 
     @Override
     public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) {
-
+        ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class);
+        processAllService.specialTransfer(processAll, processApprovalRecord, toUserId);
     }
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardPurchaseServiceImpl.java

@@ -13,7 +13,6 @@ import com.jero.modules.activiti.entity.ProcessAll;
 import com.jero.modules.activiti.entity.ProcessApprovalRecord;
 import com.jero.modules.activiti.enums.ProcessTypeEnum;
 import com.jero.modules.activiti.process.common.entity.CommonVO;
-import com.jero.modules.activiti.process.common.entity.CounterSignNodeNameConstants;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
 import com.jero.modules.activiti.process.common.service.ProcessDraftService;
 import com.jero.modules.activiti.process.fb.common.ProcessDefinitionKey;
@@ -336,6 +335,7 @@ public class ProcessFbStandardPurchaseServiceImpl extends ServiceImpl<ProcessFbS
 
     @Override
     public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) {
-
+        ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class);
+        processAllService.specialTransfer(processAll, processApprovalRecord, toUserId);
     }
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlow.java

@@ -50,6 +50,7 @@ public class MeetingManageFlow implements WorkCenterService {
 
     @Override
     public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) {
-
+        ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class);
+        processAllService.specialTransfer(processAll, processApprovalRecord, toUserId);
     }
 }

laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java

@@ -16,9 +16,11 @@ import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.activiti.entity.ProcessAll;
 import com.jero.modules.activiti.entity.ProcessApprovalRecord;
+import com.jero.modules.activiti.entity.ProcessNode;
 import com.jero.modules.activiti.enums.FinishFlagEnum;
 import com.jero.modules.activiti.enums.ProcessStatusEnum;
 import com.jero.modules.activiti.enums.ProcessTypeEnum;
+import com.jero.modules.activiti.enums.VariableTypeEnum;
 import com.jero.modules.activiti.mapper.ProcessAllMapper;
 import com.jero.modules.activiti.process.common.common.DraftCommon;
 import com.jero.modules.activiti.process.common.entity.ProcessDraft;
@@ -26,6 +28,10 @@ import com.jero.modules.activiti.process.common.service.ProcessDraftService;
 import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectStatus;
 import com.jero.modules.activiti.process.esRevision.entity.ProcessEsRevision;
 import com.jero.modules.activiti.process.esRevision.service.EsRevisionService;
+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.util.SpringContextUtil;
 import com.jero.modules.activiti.vo.DelegateTaskParam;
 import com.jero.modules.activiti.vo.ResolveTaskParam;
 import com.jero.modules.laws.common.constant.MessageTemplateCodeCommon;
@@ -387,4 +393,30 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
         // 物理删除
         processAllMapper.physicalDeleteByProjectId(tableName, projectId);
     }
+
+    public void specialTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId) {
+        // 特殊转办
+        RuntimeService runtimeService = SpringContextUtil.getBean(RuntimeService.class);
+        ProcessNodeService processNodeService = SpringContextUtil.getBean(ProcessNodeService.class);
+        TaskService taskService = SpringContextUtil.getBean(TaskService.class);
+        Task task = taskService.createTaskQuery().taskId(processApprovalRecord.getTaskId()).singleResult();
+        // 查询节点信息
+        ProcessNode processNode = processNodeService.getOne(
+                new LambdaQueryWrapper<ProcessNode>()
+                        .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(), toUserId);
+        }
+        // 稽查延期申请流程 稽查联络人评估 节点特殊处理
+        if (ProcessTypeEnum.ES_INSPECT_DELAY_APPLY.getValue().equals(processAll.getPrcType())
+                && EsInspectDelayApplyCommon.PROCESS_NODE_3.equals(processApprovalRecord.getNodeId())){
+            IProcessEsInspectDelayApplyService processEsInspectDelayApplyService = SpringContextUtil.getBean(IProcessEsInspectDelayApplyService.class);
+            processEsInspectDelayApplyService.update(
+                    new LambdaUpdateWrapper<ProcessEsInspectDelayApply>()
+                            .eq(ProcessEsInspectDelayApply::getProjectId, processAll.getProjectId())
+                            .eq(ProcessEsInspectDelayApply::getLiaisons, processApprovalRecord.getUserId())
+                            .set(ProcessEsInspectDelayApply::getLiaisons, toUserId));
+        }
+    }
 }