From 67774c96ffbcaa66fbb0c1eff5e4cf5f8d30d0b2 Mon Sep 17 00:00:00 2001
From: sunzheng <sunzheng.cn>
Date: Mon, 8 Jul 2024 09:36:34 +0800
Subject: [PATCH] =?UTF-8?q?update:=E5=B9=B4=E5=BA=A6=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4-=E8=AF=A6=E6=83=85-=E5=AF=BC=E5=87=BA,?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/member/entity/TbMemberProjectSubitem.java   | 12 ++++++++++--
 .../member/mapper/xml/AnnualMemberProjectMapper.xml  |  1 +
 .../mapper/xml/TbMemberProjectSubitemMapper.xml      |  3 ++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java
index b485c0c4..ee0c046f 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java
@@ -112,7 +112,7 @@ public class TbMemberProjectSubitem implements Serializable {
     private String postContactId;
 
     /**邮箱*/
-    //@Excel(name = "邮箱", width = 20,exportConvert = true)
+    @Excel(name = "邮箱", width = 20,exportConvert = true)
     @ApiModelProperty(value = "邮箱")
     private String email;
 
@@ -204,13 +204,16 @@ public class TbMemberProjectSubitem implements Serializable {
 
     /**到账*/
     @ApiModelProperty(value = "到账")
+    @Excel(name = "是否到账", width = 15, dicCode = "account_type")
     private Integer inAccount;
 
     /**开票*/
     @ApiModelProperty(value = "开票")
+    @Excel(name = "收否开票", width = 15, dicCode = "make_invoice_type")
     private Integer makeInvoice;
 
     @ApiModelProperty(value = "确认收入（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））")
+    @Excel(name = "是否确收", width = 15, dicCode = "affirmi_ncome")
     private Integer affirmIncome;
 
     /**邮寄*/
@@ -219,7 +222,7 @@ public class TbMemberProjectSubitem implements Serializable {
 
     /**提票"*/
     @ApiModelProperty(value = "提票")
-    //@Excel(name = "提票", width = 15,dicCode = "yn")
+    @Excel(name = "是否提票", width = 15,dicCode = "yn")
     @Dict(dicCode = "yn")
     private Integer ticketCollection;
 
@@ -410,4 +413,9 @@ public class TbMemberProjectSubitem implements Serializable {
     @ApiModelProperty(value = "权益状态")
     @TableField(exist = false)
     private String equityStatus;
+
+    @ApiModelProperty(value = "信用代码")
+    @TableField(exist = false)
+    @Excel(name = "信用代码", width = 15)
+    private String dutyCode;
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/AnnualMemberProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/AnnualMemberProjectMapper.xml
index ace813f7..b32681de 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/AnnualMemberProjectMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/AnnualMemberProjectMapper.xml
@@ -18,6 +18,7 @@
         select
             vmps.*
         from v_member_project_subitem vmps
+                 LEFT JOIN tb_member_project tmp on tmp.id = vmps.project_id
         ${ew.customSqlSegment}
     </select>
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml
index 86f74404..ac529314 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml
@@ -88,9 +88,10 @@
     </select>
 
     <select id="pageList" resultMap="TbMemberProjectSubitemResultMap">
-        select distinct tmps.*
+        select distinct tmps.*,pcm.duty_code
         from tb_member_project_subitem tmps
             LEFT JOIN tb_member_project tmp on tmp.id = tmps.project_id
+            LEFT JOIN pay_company_management pcm on tmps.company_id = pcm.id
         ${ew.customSqlSegment}
     </select>