From a6a85ecca40b4b33d58d41cec302090481aa31fd Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Wed, 2 Apr 2025 16:30:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E7=BB=B4=E5=AE=A2=E6=88=B7=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/SendContractEntity.java            | 20 +++++++++++++++++++
 .../entity/SendContractEntity.xml             |  6 ++++--
 .../plugin/SendContractPluginInitializer.java |  7 ++++++-
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/SendContract/entity/SendContractEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/SendContract/entity/SendContractEntity.java
index 7a45a8c9..b777d67c 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/SendContract/entity/SendContractEntity.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/SendContract/entity/SendContractEntity.java
@@ -11,6 +11,10 @@ public class SendContractEntity  extends BaseEntity {
     private String projectCode;
     //项目名称
     private String projectName;
+    //BIP客户编码
+    private String khcode;
+    //BIP创建人
+    private String cjr;
     //状态  空是未发送 0、失败 1、成功
     private String status;
     //描述
@@ -55,4 +59,20 @@ public class SendContractEntity  extends BaseEntity {
     public void setMsg(String msg) {
         this.msg = msg;
     }
+
+    public String getKhcode() {
+        return khcode;
+    }
+
+    public void setKhcode(String khcode) {
+        this.khcode = khcode;
+    }
+
+    public String getCjr() {
+        return cjr;
+    }
+
+    public void setCjr(String cjr) {
+        this.cjr = cjr;
+    }
 }
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/SendContract/entity/SendContractEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/plugin/SendContract/entity/SendContractEntity.xml
index aa4d1c69..cf6aee50 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/SendContract/entity/SendContractEntity.xml
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/SendContract/entity/SendContractEntity.xml
@@ -9,11 +9,13 @@
         SELECT
         id,
         field0007 as projectCode,
-        field0009 as projectName
+        field0009 as projectName,
+        field0432 as khcode,
+        field0433 as cjr
         FROM
         formmain_0219
         <trim prefix="where" prefixOverrides="and">
-            ((field0429 = '0' AND field0430 = '执行失败，Token获取失败') or field0429 is null )
+            (field0429 = '0' or field0429 is null )
              <if test="id != null and id !='' ">and id = #{id}</if>
             <![CDATA[ and ROWNUM <= 50 ]]>
         </trim>
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/SendContract/plugin/SendContractPluginInitializer.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/SendContract/plugin/SendContractPluginInitializer.java
index b11689e1..33bdf4b8 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/SendContract/plugin/SendContractPluginInitializer.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/SendContract/plugin/SendContractPluginInitializer.java
@@ -174,7 +174,11 @@ public class SendContractPluginInitializer extends PluginBaseEntity {
         ufinterface.put("pk_defdoclist","HHWDH");
 
         billhead.put("filesource","1");
-        billhead.put("creator","OA01");
+        if(sendContractEntity.getCjr() != null && !"".equals(sendContractEntity.getCjr())){
+            billhead.put("creator",sendContractEntity.getCjr());
+        }else {
+            billhead.put("creator","OA01");
+        }
         billhead.put("transi_type","4D10-01");
         billhead.put("bill_type","4D10");
         billhead.put("pk_eps","0202");
@@ -182,6 +186,7 @@ public class SendContractPluginInitializer extends PluginBaseEntity {
         billhead.put("pk_org","666");
         billhead.put("project_code",sendContractEntity.getProjectCode());
         billhead.put("project_name",sendContractEntity.getProjectName());
+        billhead.put("def1",sendContractEntity.getKhcode());//BIP客户编码
         bill.put("billhead",billhead);
         ufinterface.put("bill",bill);
         jsonObject.put("ufinterface",ufinterface);