From 125d9148b85ab84d447f6ba430d1c95da1b2c9cb Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 25 Nov 2024 14:16:17 +0800
Subject: [PATCH] md

---
 .../domain/EmisSettleInvoiceChRecord.java     |  8 +++++
 .../main/resources/mapper/EmisBaseMapper.xml  | 30 +++++++++++++++++++
 .../EmisSettleInvoiceChRecordMapper.xml       |  5 ++++
 3 files changed, 43 insertions(+)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceChRecord.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceChRecord.java
index 82e6f6ad3..9ab28a211 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceChRecord.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceChRecord.java
@@ -111,4 +111,12 @@ public class EmisSettleInvoiceChRecord extends BaseEntity
     /* 扩展信息，货物名称 */
     private String extData;
 
+//    扩展字段
+    // 账期
+    private String billMonth;
+    // 面单号
+    private String billCode;
+    // 销售员
+    private String salesmen;
+
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml b/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml
index 61c061508..2b22c690e 100644
--- a/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml
@@ -140,4 +140,34 @@
     </select>
 
 
+    <select id="selectBillMonthByApplySeqNo" parameterType="string" resultType="string">
+	     SELECT  group_concat( CONCAT(x2.settle_bill_name,'(账单月:',x2.bill_month,')') ) AS billMonth
+	     FROM  emis_settle_invoice_record x1,emis_settle_bill x2
+        WHERE x1.del_flag = '0'
+             AND x2.del_flag = '0'
+             AND FIND_IN_SET( x2.settle_bill_no, x1.settle_bill_no )
+			 and x1.apply_seq_no=#{applySeqNo}
+    </select>
+
+    <select id="selectBillCodeByApplySeqNo" parameterType="string" resultType="string">
+	     SELECT  group_concat( x2.bill_no) AS billCode
+	     FROM  emis_settle_invoice_record x1,emis_settle_sub_bill x2
+        WHERE x1.del_flag = '0'
+             AND x2.del_flag = '0'
+             AND FIND_IN_SET( x2.settle_bill_no, x1.settle_bill_no )
+			 and x1.apply_seq_no=#{applySeqNo}
+    </select>
+
+    <select id="selectSalesmenByApplySeqNo" parameterType="string" resultType="string">
+	     SELECT  group_concat(DISTINCT x2.salesmen) AS billCode
+	     FROM  emis_settle_invoice_record x1,emis_settle_bill x2
+        WHERE x1.del_flag = '0'
+             AND x2.del_flag = '0'
+             AND FIND_IN_SET( x2.settle_bill_no, x1.settle_bill_no )
+			 and x1.apply_seq_no=#{applySeqNo}
+    </select>
+
+
+
+
 </mapper>
\ No newline at end of file
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
index 881e655fe..028792008 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
@@ -43,6 +43,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="openChStatusDesc"    column="open_ch_status_desc"    />
         <result property="openComCode"    column="open_com_code"    />
         <result property="extData"    column="ext_data"    />
+
+        <association property="billMonth"  column="apply_seq_no" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectBillMonthByApplySeqNo"/>
+        <association property="billCode"  column="apply_seq_no" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectBillCodeByApplySeqNo"/>
+        <association property="salesmen"  column="apply_seq_no" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSalesmenByApplySeqNo"/>
+
     </resultMap>
 
     <sql id="selectEmisSettleInvoiceChRecordVo">