From 3dae883102cfa903fc9a1f728051afdcbb7c815d Mon Sep 17 00:00:00 2001
From: yuqh <123456>
Date: Tue, 23 Jul 2024 11:20:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A0=83=E5=8D=9AOA=E5=AF=B9=E6=8E=A5=E5=AE=81?=
 =?UTF-8?q?=E6=B3=A2=E9=93=B6=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../seeyon/paybill/entity/PayBillEntity.xml   | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/service/src/main/java/com/hzya/frame/seeyon/paybill/entity/PayBillEntity.xml b/service/src/main/java/com/hzya/frame/seeyon/paybill/entity/PayBillEntity.xml
index 02ea2854..e479bc93 100644
--- a/service/src/main/java/com/hzya/frame/seeyon/paybill/entity/PayBillEntity.xml
+++ b/service/src/main/java/com/hzya/frame/seeyon/paybill/entity/PayBillEntity.xml
@@ -26,11 +26,14 @@
         field0070 AS bill_date,
         field0057 AS primal_money,
         field0019 AS pk_oppaccount,
-        field0083 AS pk_supplier,
+        case
+        when field0065 = '-3106276434709167837' then 'GGKH'
+        when field0065 = '-4979667232919961351' then field0083
+        end AS pk_supplier,
         field0089 AS pk_org,
         field0091 AS pk_balatype,
         field0090 AS pk_recproject_code,
-        field0082 AS memo,
+        field0092 AS memo,
         'formson_0222' as table_name,
         'field0084' as field_name,
          field0084  as send_state
@@ -44,11 +47,14 @@
         field0073 AS bill_date,
         field0031 AS primal_money,
         field0042 AS pk_oppaccount,
-        field0077 AS pk_supplier,
+        case
+        when field0070 = '-3106276434709167837' then 'GGKH'
+        when field0070 = '-4979667232919961351' then field0077
+        end AS pk_supplier,
         field0082 AS pk_org,
         field0084 AS pk_balatype,
         field0083 AS pk_recproject,
-        field0076 AS memo,
+        field0086 AS memo,
         'formson_0210' as table_name,
         'field0078' as field_name,
          field0078  as send_state
@@ -62,11 +68,14 @@
         field0053 AS bill_date,
         field0041 AS primal_money,
         field0024 AS pk_oppaccount,
-        field0057 AS pk_supplier,
+        case
+        when field0048 = '-3106276434709167837' then 'GGKH'
+        when field0048 = '-4979667232919961351' then field0057
+        end AS pk_supplier,
         field0061 AS pk_org,
          field0063 AS pk_balatype,
         field0062 AS pk_recproject,
-        field0056 AS memo,
+        field0064 AS memo,
         'formson_0223' as table_name,
         'field0058' as field_name,
         field0058  as send_state
@@ -84,7 +93,7 @@
         field0048 AS pk_org,
         field0060 AS pk_balatype,
         '' AS pk_recproject,
-        field0047 AS memo,
+        field0061 AS memo,
         'formmain_0224' as table_name,
         'field0055' as field_name,
         field0055  as send_state
@@ -92,7 +101,7 @@
         LEFT JOIN formson_0225 body ON main.id = body.formmain_id
         WHERE field0058 IS NOT NULL  and finishedflag = '1'
         group by main.id,field0002,field0058,field0051,field0048
-        ,field0060,field0055,field0047
+        ,field0060,field0055,field0047,field0061
        )m1 left join formmain_0236 on m1.pk_recproject_code = formmain_0236.field0002
         <trim prefix="where" prefixOverrides="and">
             <if test="id != null and id != ''"> and id = #{id} </if>