From 996986f90ddb9f6a8b16d38ee5e7c539d224c3c4 Mon Sep 17 00:00:00 2001
From: zhengyf <zyf654042662@163.com>
Date: Fri, 22 Nov 2024 16:54:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BD=E7=9F=A5=EF=BC=9Au8c=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E9=92=89=E9=92=89=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dingtalk/callback/service/impl/CallBackServiceImpl.java | 2 +-
 .../plugin/lets/dingtalk/dao/impl/DingU8cBillDaoImpl.java   | 4 ++--
 .../lets/plugin/dingtalk/DingCallBackPluginInitializer.java | 6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/callback/service/impl/CallBackServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/callback/service/impl/CallBackServiceImpl.java
index af1c1061..86dac423 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/callback/service/impl/CallBackServiceImpl.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/callback/service/impl/CallBackServiceImpl.java
@@ -395,7 +395,7 @@ public class CallBackServiceImpl implements CallBackService {
         //推送
         String response = "";
         try {
-            ZTResult ztResult = pushU8CByApiCode.pushByCode(OverallConstant.getOverAllValue("arapFkApproveCode"), jsonStr);
+            ZTResult ztResult = pushU8CByApiCode.pushByCode(OverallConstant.getOverAllValue("arapFkInsetCode"), jsonStr);
             //两层判断,一层中台转发,一层u8c返回
             if ("false".equals(ztResult.getFlag())) {
                 //转发失败
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/dao/impl/DingU8cBillDaoImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/dao/impl/DingU8cBillDaoImpl.java
index 290e7f2e..5652db2d 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/dao/impl/DingU8cBillDaoImpl.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dingtalk/dao/impl/DingU8cBillDaoImpl.java
@@ -74,8 +74,8 @@ public class DingU8cBillDaoImpl extends MybatisGenericDao<DingU8cBillEntity, Str
                 dingU8cBill.setModify_time(new Date());
                 dingU8cBill.setPushStatus("Y");
                 dingU8cBill.setPushInfo(dingU8cBillEntityNew.getPushInfo());
-                dingU8cBill.setPush_count(dingU8cBillEntity.getPush_count() == null ? 1L : dingU8cBillEntityNew.getPush_count() + 1);
-                dingU8cBill.setPush_process_ids(dingU8cBillEntity.getPush_process_ids() == null ? dingU8cBillEntityNew.getDingTalkProcessId() : dingU8cBillEntityNew.getPush_process_ids() + "," + dingU8cBillEntityNew.getDingTalkProcessId());
+                dingU8cBill.setPush_count(dingU8cBillEntity.getPush_count() == null ? 1L : dingU8cBillEntity.getPush_count() + 1);
+                dingU8cBill.setPush_process_ids(dingU8cBillEntity.getPush_process_ids() == null ? dingU8cBillEntityNew.getDingTalkProcessId() : dingU8cBillEntity.getPush_process_ids() + "," + dingU8cBillEntityNew.getDingTalkProcessId());
                 this.update(dingU8cBill);
             }
 //            else if ("Y".equals(pushStatus)&&"Y".equals(pushStatusNew)) {
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/dingtalk/DingCallBackPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/dingtalk/DingCallBackPluginInitializer.java
index 789f3870..09a61d01 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/dingtalk/DingCallBackPluginInitializer.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/dingtalk/DingCallBackPluginInitializer.java
@@ -77,7 +77,7 @@ public class DingCallBackPluginInitializer extends PluginBaseEntity {
 
     @Override
     public String getPluginId() {
-        return "transfer.TransferInPluginInitializer";
+        return "dingtalk.DingCallBackPluginInitializer";
     }
 
     @Override
@@ -335,7 +335,7 @@ public class DingCallBackPluginInitializer extends PluginBaseEntity {
         Map<String, String> fileMap = new HashMap<>();
         fileMap.put("instanceId", dingU8cBillEntity.getDingTalkProcessId());
         fileMap.put("userCode", mobile);//审批人
-        fileMap.put("ckeckResult", "N");
+        fileMap.put("ckeckResult", "R");
         fileMap.put("ckeckNote", "无");
         String jsonFileMap = JSONUtil.toJsonStr(fileMap);
 
@@ -357,6 +357,7 @@ public class DingCallBackPluginInitializer extends PluginBaseEntity {
 
         //记录日志
         dingU8cBillEntity.setApprove("N");
+        dingU8cBillEntity.setPushStatus("N");
         dingU8cBillDao.callBackSaveOrUpdate(dingU8cBillEntity);
     }
 
@@ -373,6 +374,7 @@ public class DingCallBackPluginInitializer extends PluginBaseEntity {
         arapDjzbEntity.setDr("0");
         arapDjzbEntity.setDwbm(u8cPkCorp);
         arapDjzbEntity.setDjbh(u8cBillCode);
+        arapDjzbEntity.setDataSourceCode(ProfilesActiveConstant.LETS_DATE_SOURCE);
         List<ArapDjzbEntity> query = arapDjzbDao.query(arapDjzbEntity);
         if(query.size()==0){
             return null;