Răsfoiți Sursa

信息变更分办fix,print log

baichengfei 5 ani în urmă
părinte
comite
93b1809add
14 a modificat fișierele cu 66 adăugiri și 1 ștergeri
  1. 1 0
      src/main/java/com/common/workflow/service/activiti/supplierAnnualListener/AnnualPreFenTrailService.java
  2. 1 0
      src/main/java/com/common/workflow/service/activiti/supplierAnnualListener/AnnualPreFirstTrailService.java
  3. 1 0
      src/main/java/com/common/workflow/service/activiti/supplierAnnualListener/AnnualPrePayerService.java
  4. 1 0
      src/main/java/com/common/workflow/service/activiti/supplierAppendListener/AppendPreFenTrailService.java
  5. 1 0
      src/main/java/com/common/workflow/service/activiti/supplierAppendListener/AppendPreFirstTrailService.java
  6. 1 0
      src/main/java/com/common/workflow/service/activiti/supplierAppendListener/AppendPrePayerService.java
  7. 45 0
      src/main/java/com/common/workflow/service/activiti/supplierInfoChangeListener/ChangePreFenTrailService.java
  8. 1 0
      src/main/java/com/common/workflow/service/activiti/supplierInfoChangeListener/ChangePreFirstTrailService.java
  9. 1 0
      src/main/java/com/common/workflow/service/activiti/supplierInfoChangeListener/ChangePrePayerService.java
  10. 1 0
      src/main/java/com/common/workflow/service/activiti/supplierListener/PreFenTrailService.java
  11. 1 0
      src/main/java/com/common/workflow/service/activiti/supplierListener/PreFirstTrailService.java
  12. 1 0
      src/main/java/com/common/workflow/service/activiti/supplierListener/PrePayerService.java
  13. 5 0
      src/main/java/com/common/workflow/service/client/FeignClient.java
  14. 5 1
      src/main/resources/processes/oil_info_change.bpmn20.xml

+ 1 - 0
src/main/java/com/common/workflow/service/activiti/supplierAnnualListener/AnnualPreFenTrailService.java

@@ -36,6 +36,7 @@ public class AnnualPreFenTrailService implements TaskListener {
         if (approveInfo.getUsers().length() <= 0) {
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
+        System.out.println("工作流获取分办人: " + approveInfo.getUsers());
         delegateTask.setVariable("users", approveInfo.getUsers());
         delegateTask.setVariableLocal("users", approveInfo.getUsers());
         delegateTask.addCandidateUsers(Arrays.asList(approveInfo.getUsers().split(",")));

+ 1 - 0
src/main/java/com/common/workflow/service/activiti/supplierAnnualListener/AnnualPreFirstTrailService.java

@@ -28,6 +28,7 @@ public class AnnualPreFirstTrailService implements TaskListener {
         if (approveIds.length() <= 0) {
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
+        System.out.println("工作流获取初审人: " + approveIds);
         delegateTask.setVariable("users", approveIds);
         delegateTask.setVariableLocal("users", approveIds);
         delegateTask.addCandidateUsers(Arrays.asList(approveIds.split(",")));

+ 1 - 0
src/main/java/com/common/workflow/service/activiti/supplierAnnualListener/AnnualPrePayerService.java

@@ -28,6 +28,7 @@ public class AnnualPrePayerService implements TaskListener {
         if (approveIds.length() <= 0) {
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
+        System.out.println("工作流获取交费人: " + approveIds);
         delegateTask.setVariable("users", approveIds);
         delegateTask.setVariableLocal("users", approveIds);
         delegateTask.addCandidateUsers(Arrays.asList(approveIds.split(",")));

+ 1 - 0
src/main/java/com/common/workflow/service/activiti/supplierAppendListener/AppendPreFenTrailService.java

@@ -36,6 +36,7 @@ public class AppendPreFenTrailService implements TaskListener {
         if (approveInfo.getUsers().length() <= 0) {
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
+        System.out.println("工作流获取分办人: " + approveInfo.getUsers());
         delegateTask.setVariable("users", approveInfo.getUsers());
         delegateTask.setVariableLocal("users", approveInfo.getUsers());
         delegateTask.addCandidateUsers(Arrays.asList(approveInfo.getUsers().split(",")));

+ 1 - 0
src/main/java/com/common/workflow/service/activiti/supplierAppendListener/AppendPreFirstTrailService.java

@@ -28,6 +28,7 @@ public class AppendPreFirstTrailService implements TaskListener {
         if (approveIds.length() <= 0) {
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
+        System.out.println("工作流获取初审人: " + approveIds);
         delegateTask.setVariable("users", approveIds);
         delegateTask.setVariableLocal("users", approveIds);
         delegateTask.addCandidateUsers(Arrays.asList(approveIds.split(",")));

+ 1 - 0
src/main/java/com/common/workflow/service/activiti/supplierAppendListener/AppendPrePayerService.java

@@ -28,6 +28,7 @@ public class AppendPrePayerService implements TaskListener {
         if (approveIds.length() <= 0) {
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
+        System.out.println("工作流获取交费人: " + approveIds);
         delegateTask.setVariable("users", approveIds);
         delegateTask.setVariableLocal("users", approveIds);
         delegateTask.addCandidateUsers(Arrays.asList(approveIds.split(",")));

+ 45 - 0
src/main/java/com/common/workflow/service/activiti/supplierInfoChangeListener/ChangePreFenTrailService.java

@@ -0,0 +1,45 @@
+package com.common.workflow.service.activiti.supplierInfoChangeListener;
+
+import com.common.workflow.service.client.FeignClient;
+import com.common.workflow.service.dto.ApproveInfoDTO;
+import com.common.workflow.service.dto.ApproveParamsDTO;
+import feign.Feign;
+import feign.jackson.JacksonDecoder;
+import feign.jackson.JacksonEncoder;
+import org.activiti.engine.ActivitiException;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+
+@Component("changePreFenTrailService")
+public class ChangePreFenTrailService implements TaskListener {
+    // 二级单位分办
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        String callbackUrl = delegateTask.getVariable("callbackUrl").toString();
+        String businessKey = delegateTask.getVariable("businessKey").toString();
+        ApproveParamsDTO approveParams = new ApproveParamsDTO();
+        approveParams.setBusinessKey(businessKey);
+        ApproveInfoDTO approveInfo = null;
+
+        if (callbackUrl.length() > 0) {
+            FeignClient client = Feign.builder()
+                .decoder(new JacksonDecoder())
+                .encoder(new JacksonEncoder())
+                .target(FeignClient.class, callbackUrl);
+            approveInfo = client.getChangePreFirstAuditors(approveParams);
+        } else {
+            throw new ActivitiException("无回调地址,请联系管理员!");
+        }
+        if (approveInfo.getUsers().length() <= 0) {
+            throw new ActivitiException("未找到审核用户,请联系管理员!");
+        }
+        System.out.println("信息变更工作流获取分办人: " + approveInfo.getUsers());
+        delegateTask.setVariable("users", approveInfo.getUsers());
+        delegateTask.setVariableLocal("users", approveInfo.getUsers());
+        delegateTask.addCandidateUsers(Arrays.asList(approveInfo.getUsers().split(",")));
+    }
+}
+

+ 1 - 0
src/main/java/com/common/workflow/service/activiti/supplierInfoChangeListener/ChangePreFirstTrailService.java

@@ -28,6 +28,7 @@ public class ChangePreFirstTrailService implements TaskListener {
         if (approveIds.length() <= 0) {
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
+        System.out.println("信息变更工作流获取初审人: " + approveIds);
         delegateTask.setVariable("users", approveIds);
         delegateTask.setVariableLocal("users", approveIds);
         delegateTask.addCandidateUsers(Arrays.asList(approveIds.split(",")));

+ 1 - 0
src/main/java/com/common/workflow/service/activiti/supplierInfoChangeListener/ChangePrePayerService.java

@@ -28,6 +28,7 @@ public class ChangePrePayerService implements TaskListener {
         if (approveIds.length() <= 0) {
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
+        System.out.println("信息变更工作流获取交费人: " + approveIds);
         delegateTask.setVariable("users", approveIds);
         delegateTask.setVariableLocal("users", approveIds);
         delegateTask.addCandidateUsers(Arrays.asList(approveIds.split(",")));

+ 1 - 0
src/main/java/com/common/workflow/service/activiti/supplierListener/PreFenTrailService.java

@@ -37,6 +37,7 @@ public class PreFenTrailService  implements TaskListener {
         if (approveInfo.getUsers().length() <= 0) {
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
+        System.out.println("工作流获取分办人: " + approveInfo.getUsers());
         delegateTask.setVariable("users", approveInfo.getUsers());
         delegateTask.setVariableLocal("users", approveInfo.getUsers());
         delegateTask.addCandidateUsers(Arrays.asList(approveInfo.getUsers().split(",")));

+ 1 - 0
src/main/java/com/common/workflow/service/activiti/supplierListener/PreFirstTrailService.java

@@ -28,6 +28,7 @@ public class PreFirstTrailService implements TaskListener {
         if (approveIds.length() <= 0) {
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
+        System.out.println("工作流获取初审人: " + approveIds);
         delegateTask.setVariable("users", approveIds);
         delegateTask.setVariableLocal("users", approveIds);
         delegateTask.addCandidateUsers(Arrays.asList(approveIds.split(",")));

+ 1 - 0
src/main/java/com/common/workflow/service/activiti/supplierListener/PrePayerService.java

@@ -28,6 +28,7 @@ public class PrePayerService implements TaskListener {
         if (approveIds.length() <= 0) {
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
+        System.out.println("工作流获取交费人: " + approveIds);
         delegateTask.setVariable("users", approveIds);
         delegateTask.setVariableLocal("users", approveIds);
         delegateTask.addCandidateUsers(Arrays.asList(approveIds.split(",")));

+ 5 - 0
src/main/java/com/common/workflow/service/client/FeignClient.java

@@ -65,6 +65,11 @@ public interface FeignClient {
     @RequestLine("POST /annual-listener/pre-fen-trail")
     ApproveInfoDTO getAnnualPreFirstAuditors(@RequestBody ApproveParamsDTO approveParamsDTO);
     // 信息变更申请 ⬇
+    // 企业用户提交申请 获取分办人员列表
+    @Headers({"Content-Type: application/json","Accept: application/json"})
+    @RequestLine("POST /info-change-listener/pre-fen-trail")
+    ApproveInfoDTO getChangePreFirstAuditors(@RequestBody ApproveParamsDTO approveParamsDTO);
+
     @Headers({"Content-Type: application/json","Accept: application/json"})
     @RequestLine("POST /info-change-listener/law-office-auditors")
     ApproveInfoDTO getInfoChangeLawOfficeAuditors(@RequestBody ApproveParamsDTO approveParamsDTO);

+ 5 - 1
src/main/resources/processes/oil_info_change.bpmn20.xml

@@ -28,7 +28,11 @@
                 <modeler:initiator-can-complete xmlns:modeler="http://activiti.com/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
             </extensionElements>
         </userTask>
-        <userTask id="sid-C3A26CEB-8B27-4D61-A791-763DF5641174" name="二级单位分办" activiti:candidateUsers="${users}"></userTask>
+        <userTask id="sid-C3A26CEB-8B27-4D61-A791-763DF5641174" name="二级单位分办" activiti:candidateUsers="${users}">
+            <extensionElements>
+                <activiti:taskListener event="create" delegateExpression="${changePreFenTrailService}"></activiti:taskListener>
+            </extensionElements>
+        </userTask>
         <exclusiveGateway id="sid-B3DA6CFC-6CD4-4C5B-A050-87745068C321"></exclusiveGateway>
         <userTask id="sid-0BD541A8-2AF5-407A-88F7-4BAC183231F0" name="交费" activiti:candidateUsers="${users}">
             <extensionElements>