添加部分日志打印 易快报单据提交人固定李溯 调整判断oa审批节点

mjava-shantai/src/main/java/com/malk/shantai/event/StDingEventImpl.java

@@ -21,8 +21,8 @@ public class StDingEventImpl implements DDEvent {
     @Override
     public void executeEvent_Task_Finish(String processInstanceId, String processCode, boolean isAgree, String remark) {
         // 审批任务回调执行业务逻辑
-        log.info("衫泰审批任务完成回调，processInstanceId：{},processCode{}",processInstanceId,processCode);
-        if(DING_PROC_FKD_CODE.equals(processCode)&&isAgree){
+        if(DING_PROC_FKD_CODE.equals(processCode)){
+            log.info("衫泰审批任务完成回调，processInstanceId：{},processCode：{},isAgree：{},remark：{}",processInstanceId,processCode,isAgree,remark);
             stDingProcService.fkdSync(processInstanceId);
         }
     }

mjava-shantai/src/main/java/com/malk/shantai/service/impl/StDingProcServiceImpl.java

@@ -73,10 +73,12 @@ public class StDingProcServiceImpl implements StDingProcService {
         List<Map> tasks = (List<Map>) map.get("tasks");
         for (Map task : tasks) {
             if ("RUNNING".equals(task.get("status").toString())){
-                //判断是否为审批流程是否到出纳节点
-                if (!"a8bb_dd48".equals(task.get("activityId").toString())){
+                //判断是否为审批流程第一个出纳节点是否完成（第二个出纳节点进行中）
+                if (!"55d3_4702".equals(task.get("activityId").toString())){
+                    log.info("当前节点为：activityId:{},activityName:{}，不进行同步",task.get("activityId"),task.get("activityName"));
                     return;
                 }else {
+                    log.info("当前节点为：activityId:{},activityName:{}，进行同步",task.get("activityId"),task.get("activityName"));
                     break;
                 }
             }
@@ -104,10 +106,10 @@ public class StDingProcServiceImpl implements StDingProcService {
         //获取发起人userId
         String userId = map.get("originatorUserId").toString();
 
-        String staffId = "";
+        String staffId = "pQccdcNGsM3U00:16278700718435315";// 李溯
 
         //查询易快报中发起人是否存在
-        Map<String,Object> param3 = new HashMap<>();
+        /*Map<String,Object> param3 = new HashMap<>();
         param3.put("accessToken",getToken());
 
         Map body3 = new HashMap<>();
@@ -118,8 +120,9 @@ public class StDingProcServiceImpl implements StDingProcService {
             log.error("易快报中发起人不存在");
             staffId = "pQccdcNGsM3U00:16278700718435315";// 李溯
         }else {
+            staffId = "pQccdcNGsM3U00:16278700718435315";// 李溯
             staffId = user.get("id").toString();
-        }
+        }*/
 
         //查询易快报中收款账户是否存在
         Map result = (Map) JSONObject.parseObject(UtilHttp.doGet(stEkbConfig.getPreUrl() + "/api/openapi/v2/payeeInfos",
@@ -189,6 +192,7 @@ public class StDingProcServiceImpl implements StDingProcService {
         body.put("form",form);
 
         Map document = JSONObject.parseObject(UtilHttp.doPost(stEkbConfig.getPreUrl() + ("/api/openapi/v2.2/flow/data"), null, param, body));
+        log.info("新增单据成功:{}",document);
     }
 
     @Override

mjava-shantai/src/test/java/com/malk/shantai/DdTest.java

@@ -37,7 +37,10 @@ public class DdTest {
 //        stDingProcService.fkdSync("JaFP7M4bTF-3qUnkZf5hyg06971714033972");
         //获取付款单信息
 //        stDingProcService.fkdSync("jtqqkVH0S0-n2Znb39UI2g06971713928245");
-        stDingProcService.fkdSync("_ynuK9h3RYW4oE06B-D44A06971715048029");
+//        stDingProcService.fkdSync("_ynuK9h3RYW4oE06B-D44A06971715048029");
+//        stDingProcService.fkdSync("lReoTnLiRbSreZKodGsyRg06971715650847");
+//        stDingProcService.fkdSync("o2zdfQO-TP6ipxqzZh9cjA06971715405894");
+        stDingProcService.fkdSync("Axn5rlprQKGSRwKdYMFKYw06971715584252");
 
 
     }