update:年度会员维护-详情-导出,新增导出字段

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;
 }

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>
 

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>