Merge branch 'master' of http://47.108.172.52:3000/dayou/item-management-1phase

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

@@ -44,7 +44,10 @@
         fc.claim_datetime ,
         frf.payer,
         frf.pay_datetime,
-        u.name as claimUser
+        u.name as claimUser,
+        '市场部' as marketDepartment,
+        '评估评价部' as evaluateDepartment,
+        (select GROUP_CONCAT(name SEPARATOR ',') from user where id in (select user_id from item_user where  item_id = i.id)) as joiner
         FROM
         payment_collection pc
         LEFT JOIN item i ON pc.item_id = i.id
@@ -110,7 +113,34 @@
         fc.claim_datetime ,
         frf.payer,
         frf.pay_datetime,
-        u2.name as claimUser
+        u2.name as claimUser,
+        (
+        SELECT
+        NAME
+        FROM
+        department
+        WHERE
+        id IN (
+        SELECT
+        department_id
+        FROM
+        post
+        WHERE
+        id IN ( SELECT post_id FROM user_post WHERE user_id = m.client_manager_id and deleted = 0 )) limit 1) AS marketDepartment,
+        (
+        SELECT
+        NAME
+        FROM
+        department
+        WHERE
+        id IN (
+        SELECT
+        department_id
+        FROM
+        post
+        WHERE
+        id IN ( SELECT post_id FROM user_post WHERE user_id = m.principal_id and deleted = 0 )) limit 1) AS evaluateDepartment,
+        "" as joiner
         from (select id,client_manager_id, principal_id,name,order_id,business_object_type,clientele_sub_id,clientele_id,created,bailor,deleted from major where financial is null and deleted = 0) m
         left join (select id,business_id,real_amount from order_fund where business_type='MAJOR_BUSINESS' AND deleted = 0) off on off.business_id = m.id
         left join user u on u.id = m.client_manager_id

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

@@ -20,43 +20,37 @@ import java.util.Set;
 @Data
 public class PaymentCollectionVO extends PaymentCollection {
 
-
+    @Excel(name = "项目编号")
+    private String businessNo;
 
     @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 marketDepartment;
+
+    @Excel(name = "评估部")
+    private String evaluateDepartment;
+
     @Excel(name = "客户经理")
     private String clientManager;
+
     @Excel(name = "负责人")
     private String skiller;
-    /**
-     * 回款名称
-     */
-    @Excel(name = "回款名称")
-    private String name;
 
-    /**
-     * 回款金额
-     */
-    @Excel(name = "回款金额")
-    private Double claimAmount;
+    @Excel(name = "参与人")
+    private String joiner;
+
+    @Excel(name = "到账时间", dateFormat = "yyyy-MM-dd")
+    private Date payDatetime;
 
     /**
      * 回款日期
      */
-    @Excel(name = "回款日期")
+    @Excel(name = "认领时间")
     private LocalDate paymentDate;
 
     /**
@@ -65,12 +59,31 @@ public class PaymentCollectionVO extends PaymentCollection {
     @Excel(name = "认领人")
     private String claimUser;
 
+    /**
+     * 回款金额
+     */
+    @Excel(name = "认领金额")
+    private Double claimAmount;
+
+    @Excel(name = "客户名称")
+    private String clientName;
+
+    @Excel(name = "业务来源")
+    private String businessSource;
+
+    @Excel(name = "委托单位")
+    private String clientUnit;
+
+
+
+    /**
+     * 回款名称
+     */
+    private String name;
+
     @Excel(name = "付款方")
     private String payer;
 
-    @Excel(name = "到账时间", dateFormat = "yyyy-MM-dd")
-    private Date payDatetime;
-
     private Set<Long> userIds;
 
     private Integer year;