Merge remote-tracking branch 'origin/master'

laws-modules/src/main/java/com/jero/modules/activiti/enums/ProcessTypeEnum.java

@@ -13,7 +13,7 @@ public enum ProcessTypeEnum {
     DEMO("测试流程", 0, "com.jero.modules.activiti.process.demo.service.ProcessDemoService", "/workCenter/StandardEntryOrChangeProcess", "/workCenter/StandardEntryOrChangeProcess"),
     NEW_STANDARD_IMPORT("新法规导入流程", 1, "com.jero.modules.activiti.process.ni.service.impl.ProcessNewStandardImportServiceImpl", "/workCenter/NewRegulationIntroductionProcess", "/workCenter/NewRegulationIntroductionProcess"),
     STANDARD_INTERPRET("标准解读流程", 2, "com.jero.modules.activiti.process.standardinterpret.service.impl.StandardInterpretFlow", "/workCenter/StandardInterpretationProcess", "/workCenter/StandardInterpretationProcess"),
-    STANDARD_COMPLIANCE_CHECK("法规符合性排查流程", 3, "com.jero.modules.activiti.process.standardComplianceCheck.service.impl.ProcessStandardComplianceCheckServiceImpl", "/workCenter/RegulatoryComplianceCheckProcess", "/workCenter/RegulatoryComplianceCheckProcess"),
+    STANDARD_COMPLIANCE_CHECK("法规符合性排查流程", 3, "com.jero.modules.activiti.process.standardComplianceCheck.service.StandardComplianceCheckFlow", "/workCenter/RegulatoryComplianceCheckProcess", "/workCenter/RegulatoryComplianceCheckProcess"),
     MARKET_STANDARD_PUBLISH("市场清单发布流程", 4, "com.jero.modules.activiti.process.ms.service.impl.ProcessMarketStandardReleaseServiceImpl", "/workCenter/MarketListReleaseProcess", "/workCenter/MarketListReleaseProcess"),
     ;
 

laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/StandardComplianceCheckFlow.java

@@ -8,19 +8,19 @@ import com.jero.modules.activiti.entity.ProcessAll;
 import com.jero.modules.activiti.entity.ProcessApprovalRecord;
 import com.jero.modules.activiti.process.standardComplianceCheck.entity.ProcessStandardComplianceCheck;
 import com.jero.modules.activiti.process.standardComplianceCheck.entity.ProcessStandardComplianceCheckDetail;
+import com.jero.modules.activiti.process.standardComplianceCheck.service.impl.ProcessStandardComplianceCheckDetailServiceImpl;
+import com.jero.modules.activiti.process.standardComplianceCheck.service.impl.ProcessStandardComplianceCheckServiceImpl;
 import com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandardInterpret;
 import com.jero.modules.activiti.process.standardinterpret.service.ProcessStandardInterpretService;
-import com.jero.modules.activiti.service.ProcessAllService;
 import com.jero.modules.activiti.service.WorkCenterService;
 import com.jero.modules.activiti.util.SpringContextUtil;
 import com.jero.modules.activiti.vo.DelegateTaskParam;
 import lombok.extern.slf4j.Slf4j;
 import org.activiti.engine.RuntimeService;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -38,7 +38,7 @@ import static com.jero.modules.activiti.process.standardComplianceCheck.common.P
  **/
 @Slf4j
 @Transactional(rollbackFor = {Exception.class, JeroBootException.class})
-@Service
+@Component
 public class StandardComplianceCheckFlow implements WorkCenterService {
 
     @Resource
@@ -47,9 +47,6 @@ public class StandardComplianceCheckFlow implements WorkCenterService {
     @Resource
     private IProcessStandardComplianceCheckDetailService sccDetailService;
 
-    @Resource
-    private RuntimeService runtimeService;
-
     /**
      * 强制撤回
      * @param processAll 流程总表
@@ -68,12 +65,13 @@ public class StandardComplianceCheckFlow implements WorkCenterService {
      */
     @Override
     public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord, String toUserId, String userId) {
-        ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class);
+        RuntimeService runtimeService = SpringContextUtil.getBean(RuntimeService.class);
-        processAllService.specialTransfer(processAll, processApprovalRecord, toUserId, userId);
+        ProcessStandardComplianceCheckServiceImpl sccService = SpringContextUtil.getBean(ProcessStandardComplianceCheckServiceImpl.class);
+        ProcessStandardComplianceCheckDetailServiceImpl sccDetailService = SpringContextUtil.getBean(ProcessStandardComplianceCheckDetailServiceImpl.class);
         // 子流程中的主排查人的转办需要修改其余所有子流程及主流程中的数据
         String nodeId = processApprovalRecord.getNodeId();
         if (nodeId.equals(MAIN_CHECK_USER_APPROVAL)) {
-            String processInstanceId = processApprovalRecord.getProcessInstanceId();
+            String processInstanceId = processAll.getProcessInstanceId();
             String mainInstanceId = (String) runtimeService.getVariable(processInstanceId, MAIN_INSTANCE_ID);
             LambdaQueryWrapper<ProcessStandardComplianceCheck> sccWrapper = new LambdaQueryWrapper<>();
             sccWrapper.eq(ProcessStandardComplianceCheck::getProcessInstanceId, mainInstanceId);
@@ -87,6 +85,7 @@ public class StandardComplianceCheckFlow implements WorkCenterService {
             }
             List<String> allChildProcessInstanceId = sccDetailList.stream()
                     .map(ProcessStandardComplianceCheckDetail::getProcessInstanceId).distinct().collect(Collectors.toList());
+            allChildProcessInstanceId.add(mainInstanceId);
             allChildProcessInstanceId.forEach(childProcessInstanceId -> {
                 runtimeService.setVariable(childProcessInstanceId, MAIN_CHECK_USER, toUserId);
             });