土规回款记录和下载添加字段

dao/src/main/resources/mapper/MajorStatisticalStatementMapper.xml

@@ -109,7 +109,7 @@
         ) AS nodeInfo ON nodeInfo.business_id = major.id
             AND (IF(report.report_no IS NULL, nodeInfo.business_min_id IS NULL,
                     report.report_no = nodeInfo.business_min_id))
-        WHERE major.deleted = 0
+        WHERE major.deleted = 0 and major.financial is not null
         <if test="dto != null and dto.keyWord != null and dto.keyWord != '' ">
             AND (
             major.order_id LIKE CONCAT('%',#{dto.keyWord},'%') OR

dao/src/main/resources/mapper/PaymentCollectionMapper.xml

@@ -24,8 +24,38 @@
     </sql>
 
     <sql id="paymentCollectionSql">
-        select <include refid="Base_Column_List"/>,i.name as itemName
-        from payment_collection pc left join item i on pc.item_id = i.id
+        SELECT
+        i.NAME AS itemName,
+        i.business_no,
+        dd1.NAME AS cateName,
+        dd2.NAME AS businessSource,
+        i.client_unit,
+        i.client_name,
+        i.client_manager,
+        i.skiller,
+        pc.id,
+        pc.deleted,
+        pc.created,
+        pc.modified,
+        pc.item_id,
+        pc.NAME,
+        pc.payment_date,
+        fc.claim_amount,
+        fc.claim_datetime ,
+        frf.payer,
+        frf.pay_datetime,
+        u.name as claimUser
+        FROM
+        payment_collection pc
+        LEFT JOIN item i ON pc.item_id = i.id
+        LEFT JOIN dict_data dd1 ON (i.cate = dd1.id
+        AND dd1.deleted = 0)
+        LEFT JOIN dict_data dd2 ON (i.business_source = dd2.id
+        AND dd2.deleted = 0 )
+        left join ( select id,business_id from order_fund where business_type = 'ITEM_BUSINESS' AND DELETED = 0) off on off.business_id = i.id
+        left join finance_claim fc on fc.order_fund_id = off.id
+        left join finance_real_fund frf on frf.id = fc.real_fund_id
+        left join user u on u.id = fc.claim_user_id
         where i.deleted = 0 and pc.deleted = 0
         <if test="dto!=null and dto.itemId!=null">
             and pc.item_id = #{dto.itemId}

domain/src/main/java/com/dayou/vo/PaymentCollectionVO.java

@@ -21,9 +21,26 @@ import java.util.Set;
 public class PaymentCollectionVO extends PaymentCollection {
 
 
+
     @Excel(name = "项目名称")
     private String itemName;
 
+    @Excel(name = "事业部流水号")
+    private String businessNo;
+
+    @Excel(name = "项目类型")
+    private String cateName;
+
+    @Excel(name = "业务来源")
+    private String businessSource;
+    @Excel(name = "委托单位")
+    private String clientUnit;
+    @Excel(name = "客户名字")
+    private String clientName;
+    @Excel(name = "客户经理")
+    private String clientManager;
+    @Excel(name = "负责人")
+    private String skiller;
     /**
      * 回款名称
      */
@@ -34,7 +51,7 @@ public class PaymentCollectionVO extends PaymentCollection {
      * 回款金额
      */
     @Excel(name = "回款金额")
-    private Double amount;
+    private Double claimAmount;
 
     /**
      * 回款日期
@@ -42,6 +59,18 @@ public class PaymentCollectionVO extends PaymentCollection {
     @Excel(name = "回款日期")
     private LocalDate paymentDate;
 
+    /**
+     * 认领人
+     */
+    @Excel(name = "认领人")
+    private String claimUser;
+
+    @Excel(name = "付款方")
+    private String payer;
+
+    @Excel(name = "到账时间", dateFormat = "yyyy-MM-dd")
+    private Date payDatetime;
+
     private Set<Long> userIds;
 
     private Integer year;