From 35a3b5a920a942681f744f97ac3d7e9fa982abc0 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 25 Nov 2024 14:20:31 +0800
Subject: [PATCH] md

---
 .../erp/emis/domain/EmisSettleInvoiceChRecord.java       | 2 ++
 emis-biz/src/main/resources/mapper/EmisBaseMapper.xml    | 9 ++++++++-
 .../resources/mapper/EmisSettleInvoiceChRecordMapper.xml | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

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 9ab28a211..860335e4f 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
@@ -118,5 +118,7 @@ public class EmisSettleInvoiceChRecord extends BaseEntity
     private String billCode;
     // 销售员
     private String salesmen;
+    // 申请备注
+    private String applyRemark;
 
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml b/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml
index 2b22c690e..b41275376 100644
--- a/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml
@@ -159,7 +159,7 @@
     </select>
 
     <select id="selectSalesmenByApplySeqNo" parameterType="string" resultType="string">
-	     SELECT  group_concat(DISTINCT x2.salesmen) AS billCode
+	     SELECT  group_concat(DISTINCT x2.salesmen) AS salesmen
 	     FROM  emis_settle_invoice_record x1,emis_settle_bill x2
         WHERE x1.del_flag = '0'
              AND x2.del_flag = '0'
@@ -168,6 +168,13 @@
     </select>
 
 
+    <select id="selectApplyRemarkByApplySeqNo" parameterType="string" resultType="string">
+	     SELECT  x1.remark AS applyRemark
+	     FROM  emis_settle_invoice_record x1
+        WHERE x1.del_flag = '0'
+			 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 028792008..2e14d4f85 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
@@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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"/>
+        <association property="applyRemark"  column="apply_seq_no" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectApplyRemarkByApplySeqNo"/>
 
     </resultMap>