Преглед изворни кода

市场管理:合同评价相关日志

baichengfei пре 4 година
родитељ
комит
a647b9cc20
13 измењених фајлова са 73 додато и 13 уклоњено
  1. 6 2
      src/main/java/com/common/workflow/service/activiti/contractDailyByBusinessListener/EvaApprovalByBusinessRefuseService.java
  2. 4 1
      src/main/java/com/common/workflow/service/activiti/contractDailyByBusinessListener/EvaApprovalByBusinessRefuseTaskService.java
  3. 6 1
      src/main/java/com/common/workflow/service/activiti/contractDailyByBusinessListener/EvaByBusinessLawOfficeAuditService.java
  4. 5 0
      src/main/java/com/common/workflow/service/activiti/contractDailyByBusinessListener/EvaByBusinessPreProfAuditService.java
  5. 5 0
      src/main/java/com/common/workflow/service/activiti/contractDailyByBusinessListener/EvaByBusinessWorkflowEndService.java
  6. 6 2
      src/main/java/com/common/workflow/service/activiti/contractDailyEvaluationListener/EvaluateApprovalRefuseService.java
  7. 5 1
      src/main/java/com/common/workflow/service/activiti/contractDailyEvaluationListener/EvaluateApprovalRefuseTaskService.java
  8. 6 1
      src/main/java/com/common/workflow/service/activiti/contractDailyEvaluationListener/EvaluateLawOfficeAuditService.java
  9. 6 1
      src/main/java/com/common/workflow/service/activiti/contractDailyEvaluationListener/EvaluatePreFirstTrailService.java
  10. 6 1
      src/main/java/com/common/workflow/service/activiti/contractDailyEvaluationListener/EvaluatePreProfAuditService.java
  11. 6 1
      src/main/java/com/common/workflow/service/activiti/contractDailyEvaluationListener/EvaluatePreSecondTrailService.java
  12. 6 1
      src/main/java/com/common/workflow/service/activiti/contractDailyEvaluationListener/EvaluatePreThirdTrialService.java
  13. 6 1
      src/main/java/com/common/workflow/service/activiti/contractDailyEvaluationListener/EvaluateWorkflowEndService.java

+ 6 - 2
src/main/java/com/common/workflow/service/activiti/contractDailyByBusinessListener/EvaApprovalByBusinessRefuseService.java

@@ -5,11 +5,13 @@ import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.ExecutionListener;
 import org.activiti.engine.delegate.Expression;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 @Component("evaApprovalByBusinessRefuseService")
 public class EvaApprovalByBusinessRefuseService implements ExecutionListener {
-
+    private static final Logger logger = LoggerFactory.getLogger(EvaApprovalByBusinessRefuseService.class);
     private Expression stepCode;
     // 审批驳回
     @Override
@@ -26,9 +28,11 @@ public class EvaApprovalByBusinessRefuseService implements ExecutionListener {
             String taskName = delegateExecution.getEventName();
             createUserId = HttpRequest.sendGet(approveUrl, "businessKey=" + businessKey + "&stepCode=" + nowStepCode);
         } else {
+            logger.error("合同日常评审 线 驳回。无回调地址" + businessKey);
             throw new ActivitiException("无回调地址,请联系管理员!");
         }
         if (createUserId.length() <= 0) {
+            logger.error("合同日常评审 线 驳回。驳回审批失败" + businessKey);
             throw new ActivitiException("驳回审批失败!请联系管理员!");
         }
 
@@ -45,7 +49,7 @@ public class EvaApprovalByBusinessRefuseService implements ExecutionListener {
         } else if (nowStepCode.equals("-10")) {
             delegateExecution.setVariableLocal("refuseName", "二级单位分办未通过");
         }
-        System.out.println("合同日常评审 线 驳回: " + nowStepCode);
+        logger.info("合同日常评审 线 驳回: " + nowStepCode + "  businessKey:" + businessKey);
         delegateExecution.setVariable("backUsers", createUserId);
         delegateExecution.setVariableLocal("backUsers", createUserId);
     }

+ 4 - 1
src/main/java/com/common/workflow/service/activiti/contractDailyByBusinessListener/EvaApprovalByBusinessRefuseTaskService.java

@@ -2,12 +2,15 @@ package com.common.workflow.service.activiti.contractDailyByBusinessListener;
 
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("evaApprovalByBusinessRefuseTaskService")
 public class EvaApprovalByBusinessRefuseTaskService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(EvaApprovalByBusinessRefuseTaskService.class);
     // 二级单位初审
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -16,7 +19,7 @@ public class EvaApprovalByBusinessRefuseTaskService implements TaskListener {
             delegateTask.setVariable("users", backUsers);
             delegateTask.setVariableLocal("users", backUsers);
             delegateTask.addCandidateUsers(Arrays.asList(backUsers.split(",")));
-            System.out.println("合同日常评审 节点 驳回: " + delegateTask.getVariable("backUsers").toString());
+            logger.info("合同日常评审 节点 驳回: " + delegateTask.getVariable("backUsers").toString());
         }
     }
 }

+ 6 - 1
src/main/java/com/common/workflow/service/activiti/contractDailyByBusinessListener/EvaByBusinessLawOfficeAuditService.java

@@ -9,12 +9,15 @@ import feign.jackson.JacksonEncoder;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("evaByBusinessLawOfficeAuditService")
 public class EvaByBusinessLawOfficeAuditService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(EvaByBusinessLawOfficeAuditService.class);
     // 企业法规处审核, 非入库
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -31,12 +34,14 @@ public class EvaByBusinessLawOfficeAuditService implements TaskListener {
                 .target(FeignClient.class, callbackUrl);
             approveInfo = client.getEvaluateLawOfficeAuditors(approveParams);
         } else {
+            logger.error("合同日常评审 获取企业法规处审核审核人, 无回调地址 " + businessKey);
             throw new ActivitiException("无回调地址,请联系管理员!");
         }
         if (approveInfo.getUsers().length() <= 0) {
+            logger.error("合同日常评审 获取企业法规处审核审核人, 未找到审核用户 " + businessKey);
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
-        System.out.println("合同日常评审 获取企业法规处审核审核人: " + approveInfo.getUsers());
+        logger.info("合同日常评审 获取企业法规处审核审核人: " + approveInfo.getUsers() + " businessKey: " + businessKey);
         delegateTask.setVariable("users", approveInfo.getUsers());
         delegateTask.setVariableLocal("users", approveInfo.getUsers());
         delegateTask.addCandidateUsers(Arrays.asList(approveInfo.getUsers().split(",")));

+ 5 - 0
src/main/java/com/common/workflow/service/activiti/contractDailyByBusinessListener/EvaByBusinessPreProfAuditService.java

@@ -4,10 +4,13 @@ import com.common.workflow.service.util.HttpRequest;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 @Component("evaByBusinessPreProfAuditService")
 public class EvaByBusinessPreProfAuditService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(EvaByBusinessPreProfAuditService.class);
     // 业务处室专业审批 仅用于回调更新状态
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -21,9 +24,11 @@ public class EvaByBusinessPreProfAuditService implements TaskListener {
         if (callbackUrl.length() > 0) {
             res = HttpRequest.sendGet(approveUrl, "businessKey=" + businessKey);
         } else {
+            logger.error("合同日常评审 业务处室专业审批, 无回调地址 " + businessKey);
             throw new ActivitiException("无回调地址,请联系管理员!");
         }
         if (!res.equals("1")) {
+            logger.error("合同日常评审 业务处室专业审批, 工作流异常 " + businessKey);
             throw new ActivitiException("工作流异常,请联系管理员!");
         }
         System.out.println("合同日常评审 业务处室专业审批");

+ 5 - 0
src/main/java/com/common/workflow/service/activiti/contractDailyByBusinessListener/EvaByBusinessWorkflowEndService.java

@@ -4,10 +4,13 @@ import com.common.workflow.service.util.HttpRequest;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.ExecutionListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 @Component("evaByBusinessWorkflowEndService")
 public class EvaByBusinessWorkflowEndService implements ExecutionListener {
+    private static final Logger logger = LoggerFactory.getLogger(EvaByBusinessWorkflowEndService.class);
     // 企业法规处审批入库完成
     @Override
     public void notify(DelegateExecution delegateExecution) {
@@ -21,9 +24,11 @@ public class EvaByBusinessWorkflowEndService implements ExecutionListener {
         if (callbackUrl.length() > 0) {
             res = HttpRequest.sendGet(approveUrl, "businessKey=" + businessKey);
         } else {
+            logger.error("合同日常评审工作流 结束 无回调地址 " + businessKey);
             throw new ActivitiException("无回调地址,请联系管理员!");
         }
         if (res.equals("0")) {
+            logger.error("合同日常评审工作流 结束 审核入库失败 " + businessKey);
             throw new ActivitiException("审核入库失败!请联系管理员!");
         }
         System.out.println("合同日常评审工作流 结束 ");

+ 6 - 2
src/main/java/com/common/workflow/service/activiti/contractDailyEvaluationListener/EvaluateApprovalRefuseService.java

@@ -5,11 +5,13 @@ import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.ExecutionListener;
 import org.activiti.engine.delegate.Expression;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 @Component("evaluateApprovalRefuseService")
 public class EvaluateApprovalRefuseService implements ExecutionListener {
-
+    private static final Logger logger = LoggerFactory.getLogger(EvaluateApprovalRefuseService.class);
     private Expression stepCode;
     // 审批驳回
     @Override
@@ -26,9 +28,11 @@ public class EvaluateApprovalRefuseService implements ExecutionListener {
             String taskName = delegateExecution.getEventName();
             createUserId = HttpRequest.sendGet(approveUrl, "businessKey=" + businessKey + "&stepCode=" + nowStepCode);
         } else {
+            logger.error("合同日常评审 无回调地址!" + businessKey);
             throw new ActivitiException("无回调地址,请联系管理员!");
         }
         if (createUserId.length() <= 0) {
+            logger.error("合同日常评审 驳回审批失败!" + businessKey);
             throw new ActivitiException("驳回审批失败!请联系管理员!");
         }
 
@@ -45,7 +49,7 @@ public class EvaluateApprovalRefuseService implements ExecutionListener {
         } else if (nowStepCode.equals("-10")) {
             delegateExecution.setVariableLocal("refuseName", "二级单位分办未通过");
         }
-        System.out.println("合同日常评审 线 驳回: " + nowStepCode);
+        logger.info("合同日常评审 线 驳回: " + nowStepCode);
         delegateExecution.setVariable("backUsers", createUserId);
         delegateExecution.setVariableLocal("backUsers", createUserId);
     }

+ 5 - 1
src/main/java/com/common/workflow/service/activiti/contractDailyEvaluationListener/EvaluateApprovalRefuseTaskService.java

@@ -1,13 +1,17 @@
 package com.common.workflow.service.activiti.contractDailyEvaluationListener;
 
+import com.common.workflow.service.activiti.contractDailyByBusinessListener.EvaByBusinessWorkflowEndService;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("evaluateApprovalRefuseTaskService")
 public class EvaluateApprovalRefuseTaskService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(EvaluateApprovalRefuseTaskService.class);
     // 二级单位初审
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -16,7 +20,7 @@ public class EvaluateApprovalRefuseTaskService implements TaskListener {
             delegateTask.setVariable("users", backUsers);
             delegateTask.setVariableLocal("users", backUsers);
             delegateTask.addCandidateUsers(Arrays.asList(backUsers.split(",")));
-            System.out.println("合同日常评审 节点 驳回: " + delegateTask.getVariable("backUsers").toString());
+            logger.info("合同日常评审 节点 驳回: " + delegateTask.getVariable("backUsers").toString());
         }
     }
 }

+ 6 - 1
src/main/java/com/common/workflow/service/activiti/contractDailyEvaluationListener/EvaluateLawOfficeAuditService.java

@@ -9,12 +9,15 @@ import feign.jackson.JacksonEncoder;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("evaluateLawOfficeAuditService")
 public class EvaluateLawOfficeAuditService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(EvaluateLawOfficeAuditService.class);
     // 企业法规处审核, 非入库
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -31,12 +34,14 @@ public class EvaluateLawOfficeAuditService implements TaskListener {
                 .target(FeignClient.class, callbackUrl);
             approveInfo = client.getEvaluateLawOfficeAuditors(approveParams);
         } else {
+            logger.error("合同日常评审 获取企业法规处审核审核人, 无回调地址!" + businessKey);
             throw new ActivitiException("无回调地址,请联系管理员!");
         }
         if (approveInfo.getUsers().length() <= 0) {
+            logger.error("合同日常评审 获取企业法规处审核审核人, 未找到审核用户!" + businessKey);
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
-        System.out.println("合同日常评审 获取企业法规处审核审核人: " + approveInfo.getUsers());
+        logger.info("合同日常评审 获取企业法规处审核审核人: " + approveInfo.getUsers());
         delegateTask.setVariable("users", approveInfo.getUsers());
         delegateTask.setVariableLocal("users", approveInfo.getUsers());
         delegateTask.addCandidateUsers(Arrays.asList(approveInfo.getUsers().split(",")));

+ 6 - 1
src/main/java/com/common/workflow/service/activiti/contractDailyEvaluationListener/EvaluatePreFirstTrailService.java

@@ -4,12 +4,15 @@ import com.common.workflow.service.util.HttpRequest;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("evaluatePreFirstTrailService")
 public class EvaluatePreFirstTrailService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(EvaluatePreFirstTrailService.class);
     // 二级单位初审
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -23,12 +26,14 @@ public class EvaluatePreFirstTrailService implements TaskListener {
         if (callbackUrl.length() > 0) {
             approveIds = HttpRequest.sendGet(approveUrl, "businessKey=" + businessKey);
         } else {
+            logger.error("合同日常评审工作流 获取初审人, 无回调地址!" + businessKey);
             throw new ActivitiException("无回调地址,请联系管理员!");
         }
         if (approveIds.length() <= 0) {
+            logger.error("合同日常评审工作流 获取初审人, 未找到审核用户!" + businessKey);
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
-        System.out.println("合同日常评审工作流 获取初审人: " + approveIds);
+        logger.info("合同日常评审工作流 获取初审人: " + approveIds);
         delegateTask.setVariable("users", approveIds);
         delegateTask.setVariableLocal("users", approveIds);
         delegateTask.addCandidateUsers(Arrays.asList(approveIds.split(",")));

+ 6 - 1
src/main/java/com/common/workflow/service/activiti/contractDailyEvaluationListener/EvaluatePreProfAuditService.java

@@ -4,12 +4,15 @@ import com.common.workflow.service.util.HttpRequest;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("evaluatePreProfAuditService")
 public class EvaluatePreProfAuditService  implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(EvaluatePreProfAuditService.class);
     // 业务处室专业审批 仅用于回调更新状态
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -23,11 +26,13 @@ public class EvaluatePreProfAuditService  implements TaskListener {
         if (callbackUrl.length() > 0) {
             res = HttpRequest.sendGet(approveUrl, "businessKey=" + businessKey);
         } else {
+            logger.error("合同日常评审 业务处室专业审批 无回调地址!" + businessKey);
             throw new ActivitiException("无回调地址,请联系管理员!");
         }
         if (!res.equals("1")) {
+            logger.error("合同日常评审 业务处室专业审批 工作流异常!" + businessKey);
             throw new ActivitiException("工作流异常,请联系管理员!");
         }
-        System.out.println("合同日常评审 业务处室专业审批");
+        logger.info("合同日常评审 业务处室专业审批");
     }
 }

+ 6 - 1
src/main/java/com/common/workflow/service/activiti/contractDailyEvaluationListener/EvaluatePreSecondTrailService.java

@@ -4,12 +4,15 @@ import com.common.workflow.service.util.HttpRequest;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("evaluatePreSecondTrailService")
 public class EvaluatePreSecondTrailService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(EvaluatePreSecondTrailService.class);
     // 二级单位复审
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -23,12 +26,14 @@ public class EvaluatePreSecondTrailService implements TaskListener {
         if (callbackUrl.length() > 0) {
             approveIds = HttpRequest.sendGet(approveUrl, "businessKey=" + businessKey);
         } else {
+            logger.error("合同日常评审工作流 获取二级单位复审审核人, 无回调地址!" + businessKey);
             throw new ActivitiException("无回调地址,请联系管理员!");
         }
         if (approveIds.length() <= 0) {
+            logger.error("合同日常评审工作流 获取二级单位复审审核人, 未找到审核用户!" + businessKey);
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
-        System.out.println("合同日常评审工作流 获取二级单位复审审核人: " + approveIds);
+        logger.info("合同日常评审工作流 获取二级单位复审审核人: " + approveIds);
         delegateTask.setVariable("users", approveIds);
         delegateTask.setVariableLocal("users", approveIds);
         delegateTask.addCandidateUsers(Arrays.asList(approveIds.split(",")));

+ 6 - 1
src/main/java/com/common/workflow/service/activiti/contractDailyEvaluationListener/EvaluatePreThirdTrialService.java

@@ -12,12 +12,15 @@ import feign.jackson.JacksonEncoder;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("evaluatePreThirdTrialService")
 public class EvaluatePreThirdTrialService  implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(EvaluatePreThirdTrialService.class);
     // 业务处室接收分办
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -36,12 +39,14 @@ public class EvaluatePreThirdTrialService  implements TaskListener {
             // approveInfoJson = HttpRequest.sendGet(approveUrl, "businessKey=" + businessKey);
             // approveInfo = (ApproveInfoDTO) JSONObject.parse(approveInfoJson);
         } else {
+            logger.error("合同日常评审 获取业务处室接收分办审批人, 无回调地址!" + businessKey);
             throw new ActivitiException("无回调地址,请联系管理员!");
         }
         if (approveInfo.getUsers().length() <= 0) {
+            logger.error("合同日常评审 获取业务处室接收分办审批人, 未找到审核用户!" + businessKey);
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
-        System.out.println("合同日常评审 获取业务处室接收分办审批人: " + approveInfo.getUsers());
+        logger.info("合同日常评审 获取业务处室接收分办审批人: " + approveInfo.getUsers());
         delegateTask.setVariable("users", approveInfo.getUsers());
         delegateTask.setVariableLocal("users", approveInfo.getUsers());
         delegateTask.addCandidateUsers(Arrays.asList(approveInfo.getUsers().split(",")));

+ 6 - 1
src/main/java/com/common/workflow/service/activiti/contractDailyEvaluationListener/EvaluateWorkflowEndService.java

@@ -6,10 +6,13 @@ import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.ExecutionListener;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 @Component("evaluateWorkflowEndService")
 public class EvaluateWorkflowEndService implements ExecutionListener {
+    private static final Logger logger = LoggerFactory.getLogger(EvaluateWorkflowEndService.class);
     // 企业法规处审批入库完成
     @Override
     public void notify(DelegateExecution delegateExecution) {
@@ -23,11 +26,13 @@ public class EvaluateWorkflowEndService implements ExecutionListener {
         if (callbackUrl.length() > 0) {
             res = HttpRequest.sendGet(approveUrl, "businessKey=" + businessKey);
         } else {
+            logger.error("合同日常评审工作流 结束. 无回调地址" + businessKey);
             throw new ActivitiException("无回调地址,请联系管理员!");
         }
         if (res.equals("0")) {
+            logger.error("合同日常评审工作流 结束. 审核入库失败. " + businessKey);
             throw new ActivitiException("审核入库失败!请联系管理员!");
         }
-        System.out.println("合同日常评审工作流 结束 ");
+        logger.info("合同日常评审工作流 结束 ");
     }
 }