Merge remote-tracking branch 'origin/master'

# Conflicts:
#	dao/src/main/resources/mapper/PersonalMapper.xml

biz-base/src/main/java/com/dayou/controller/AssetsController.java

@@ -65,6 +65,15 @@ public class AssetsController extends BaseController {
     }
 
     /**
+     * 导出我的资产订单列表
+     * @param assetsSelectDTO 查询条件
+     */
+    @GetMapping("/exportMyOrder")
+    public void exportMyOrder(AssetsSelectDTO assetsSelectDTO, HttpServletResponse response ) throws IOException {
+        exportPlus(response,"资产我的订单",assetsService.exportMyOrder(assetsSelectDTO),AssetsVO.class);
+    }
+
+    /**
      * 条件查询资产已归档列表
      * @param page 分页条件
      * @param assetsSelectDTO 查询条件

biz-base/src/main/java/com/dayou/controller/MajorProductionController.java

@@ -18,9 +18,11 @@ import org.springframework.web.bind.annotation.*;
 import com.dayou.common.PullDownModel;
 import com.dayou.utils.ConvertUtil;
 
+import java.io.IOException;
 import java.util.List;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
 /**
@@ -73,6 +75,14 @@ public class MajorProductionController extends BaseController {
         return RestResponse.data(ret);
     }
 
+    /**
+     * 导出我的订单
+     */
+    @GetMapping("/exportMyOrder")
+    public void exportMyOrder(MajorOrderVO myOrder,String keyword, HttpServletResponse response ) throws IOException {
+        exportPlus(response,"大中型我的订单",majorProductionService.exportMyOrder(myOrder,keyword), MajorOrderVO.class);
+    }
+
 
     /**
      * 我的认领实收款订单列表

biz-base/src/main/java/com/dayou/controller/PaymentCollectionController.java

@@ -59,6 +59,14 @@ public class PaymentCollectionController extends BaseController {
     }
 
     /**
+     * 回款记录导出
+     */
+    @GetMapping("/export")
+    public void exportPaymentCollection(PaymentCollectionVO paymentCollection, HttpServletResponse response ) throws IOException {
+        exportPlus(response,"回款记录",paymentCollectionService.exportPaymentCollection(paymentCollection), PaymentCollectionVO.class);
+    }
+
+    /**
      * 回款记录详情
      */
     @GetMapping("/{id}")

biz-base/src/main/java/com/dayou/controller/PersonalController.java

@@ -17,8 +17,10 @@ import com.dayou.entity.Personal;
 import com.dayou.common.RestResponse;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
 
@@ -54,6 +56,14 @@ public class PersonalController extends BaseController {
     }
 
     /**
+     * 个贷业务我的订单导出
+     */
+    @GetMapping("/exportMyOrder")
+    public void exportMyOrder(PersonalVO personal,String keyword, HttpServletResponse response ) throws IOException {
+        exportPlus(response,"个贷我的订单",personalService.exportMyOrder(personal,keyword), PersonalVO.class);
+    }
+
+    /**
      * 个贷业务订单详情
      */
     @GetMapping("/{id}")

dao/src/main/java/com/dayou/mapper/AssetsMapper.java

@@ -42,6 +42,13 @@ public interface AssetsMapper extends CustomBaseMapper<Assets> {
     Page<AssetsVO> selectMyOrderPage(@Param("page") Page page, @Param("assetsSelectDTO") AssetsSelectDTO assetsSelectDTO);
 
     /**
+     * 导出我的资产订单列表
+     * @param assetsSelectDTO 查询条件
+     * @return Page<AssetsVO>
+     */
+    List<AssetsVO> exportMyOrder(@Param("assetsSelectDTO") AssetsSelectDTO assetsSelectDTO);
+
+    /**
      * 条件查询资产已归档列表
      * @param page 分页条件
      * @param assetsSelectDTO 查询条件

dao/src/main/java/com/dayou/mapper/MajorProductionMapper.java

@@ -29,6 +29,14 @@ public interface MajorProductionMapper extends CustomBaseMapper<MajorProduction>
 
     Page<MajorOrderVO> myOrder(Page page, @Param("vo") MajorOrderVO myOrder,@Param("keyword") String keyword);
 
+    /**
+     * 我的订单导出
+     * @param myOrder 查询参数
+     * @param keyword 关键字
+     * @return List<MajorOrderVO>
+     */
+    List<MajorOrderVO> exportMyOrder(@Param("vo") MajorOrderVO myOrder,@Param("keyword") String keyword);
+
     Page<MajorOrderVO> waitingClaim(Page page, @Param("vo") MajorOrderVO myOrder);
 
     List<MajorProduction> getMajorProductionAboutFundId(@Param("majorId") Long majorId);

dao/src/main/java/com/dayou/mapper/PaymentCollectionMapper.java

@@ -27,6 +27,11 @@ public interface PaymentCollectionMapper extends CustomBaseMapper<PaymentCollect
 
     Page<PaymentCollectionVO> page(Page page, @Param("dto") PaymentCollectionVO paymentCollection);
 
+    /**
+     * 回款记录导出
+     */
+    List<PaymentCollectionVO> exportPaymentCollection(@Param("dto") PaymentCollectionVO paymentCollection);
+
     PaymentCollection getDeleted(@Param("id") Long id);
 
     List<PaymentDetailDTO> getPaymentDetailListByItemId(@Param("itemId") Long itemId ,@Param("userId") Long userId);

dao/src/main/java/com/dayou/mapper/PersonalMapper.java

@@ -32,6 +32,8 @@ public interface PersonalMapper extends CustomBaseMapper<Personal> {
 
     Page<PersonalVO> myOrder(Page page, @Param("personal")PersonalVO personal ,@Param("keyword") String keyword);
 
+    List<PersonalVO> exportMyOrder(@Param("personal")PersonalVO personal ,@Param("keyword") String keyword);
+
     Page<PersonalVO> waitingAllotOrderPage(Page page,@Param("keyword") String keyword);
 
     void batchUpdateOutWardStaffId(@Param("userId") Long userId, @Param("priceStaffId") Long priceStaffId,@Param("list") List<Long> orderIds);

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

@@ -172,17 +172,19 @@
         ORDER BY assets.created DESC
     </select>
 
-    <!--条件查询我的资产订单列表-->
-    <select id="selectMyOrderPage" resultType="com.dayou.vo.AssetsVO">
+    <sql id="selectMyOrderSql">
         SELECT (@i :=  @i + 1) AS id,
         assets.id AS assetsId,
-        assets.name,
+        CASE
+            WHEN reportInfo.assets_name IS NOT NULL THEN reportInfo.assets_name
+            WHEN (SELECT assets_name FROM assets_production WHERE assets_production.production_no = nodeInfo.business_sub_id) IS NOT NULL THEN (SELECT assets_name FROM assets_production WHERE assets_production.production_no = nodeInfo.business_sub_id)
+            ELSE assets.name
+        END AS name,
         assets.order_id,
         assets_business_gener,
         allot_type,
         (SELECT production_no FROM assets_production WHERE assets_production.production_no = nodeInfo.business_sub_id) AS statementNo,
         (SELECT production_type FROM assets_production WHERE assets_production.production_no = nodeInfo.business_sub_id) AS productionType,
-        (SELECT assets_name FROM assets_production WHERE assets_production.production_no = nodeInfo.business_sub_id) AS statementName,
         reportInfo.production_no AS reportNo,
         reportInfo.repertory_state AS reportRepertoryState,
         reportInfo.delivery AS reportDelivery,
@@ -221,7 +223,7 @@
         LEFT JOIN user ON user.id = assets.principal_id
         LEFT JOIN customer_company AS customer ON customer.id = assets.clientele_id
         LEFT JOIN order_fund AS fund ON fund.business_id = assets.id AND business_type = 'ASSET_BUSINESS'
-#         LEFT JOIN finance_invoice AS invoice ON invoice.order_fund_id = fund.id
+        #         LEFT JOIN finance_invoice AS invoice ON invoice.order_fund_id = fund.id
         #查询当前进行的节点信息
         LEFT JOIN (SELECT nodeInstance.id AS currentNodeId,
         user.name AS handlerName,
@@ -265,10 +267,23 @@
             customer.name LIKE CONCAT('%',#{assetsSelectDTO.keyWord},'%')
             )
         </if>
+        <if test="assetsSelectDTO != null and assetsSelectDTO.startTime != null and assetsSelectDTO.endTime != null ">
+            AND assets.created BETWEEN #{assetsSelectDTO.startTime} AND #{assetsSelectDTO.endTime}
+        </if>
         <if test="assetsSelectDTO != null and assetsSelectDTO.departmentId != null ">
             AND assets.department_id = #{assetsSelectDTO.departmentId}
         </if>
         ORDER BY assets.created DESC
+    </sql>
+
+    <!--条件查询我的资产订单列表-->
+    <select id="selectMyOrderPage" resultType="com.dayou.vo.AssetsVO">
+        <include refid="selectMyOrderSql" />
+    </select>
+
+    <!--导出我的资产订单列表-->
+    <select id="exportMyOrder" resultType="com.dayou.vo.AssetsVO">
+        <include refid="selectMyOrderSql" />
     </select>
 
     <!--条件查询资产已归档列表-->

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

@@ -379,7 +379,7 @@
 
     </sql>
 
-    <select id="myOrder" parameterType="com.dayou.vo.MajorOrderVO" resultMap="myOrderMap">
+    <sql id="myOrderSql">
         <include refid="myMajorOrder" />
         where m.deleted = 0
         and m.client_manager_id = #{vo.clientManagerId}
@@ -428,6 +428,14 @@
             AND mp.id is null
         </if>
         order by m.created DESC
+    </sql>
+
+    <select id="myOrder" parameterType="com.dayou.vo.MajorOrderVO" resultMap="myOrderMap">
+        <include refid="myOrderSql" />
+    </select>
+
+    <select id="exportMyOrder" resultType="com.dayou.vo.MajorOrderVO">
+        <include refid="myOrderSql" />
     </select>
 
     <select id="waitingClaim" parameterType="com.dayou.vo.MajorOrderVO" resultType="com.dayou.vo.MajorOrderVO">
@@ -727,4 +735,4 @@
     <select id="getProductionNosByMajorId" parameterType="java.lang.Long" resultType="java.lang.String">
         select report_no from major_production where major_id = #{majorId} and deleted = 0
     </select>
- </mapper>
+</mapper>

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

@@ -23,7 +23,7 @@
         pc.item_id, pc.name, pc.amount, pc.payment_date
     </sql>
 
-    <select id="page" parameterType="com.dayou.vo.PaymentCollectionVO" resultType="com.dayou.vo.PaymentCollectionVO">
+    <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
         where i.deleted = 0 and pc.deleted = 0
@@ -56,8 +56,20 @@
                 #{userId}
             </foreach>
         </if>
+        <if test="dto!=null and dto.startDate!=null and dto.endDate!=null">
+            AND pc.created BETWEEN #{dto.startDate} AND #{dto.endDate}
+        </if>
         order by pc.payment_date DESC
+    </sql>
+
+    <select id="page" parameterType="com.dayou.vo.PaymentCollectionVO" resultType="com.dayou.vo.PaymentCollectionVO">
+        <include refid="paymentCollectionSql"/>
+    </select>
+
+    <select id="exportPaymentCollection" resultType="com.dayou.vo.PaymentCollectionVO">
+        <include refid="paymentCollectionSql"/>
     </select>
+
     <sql id="itemPaymentList">
         SELECT
         i.id,

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

@@ -317,30 +317,31 @@
         </if>
     </select>
 
-    <select id="myOrder" parameterType="com.dayou.vo.PersonalVO" resultType="com.dayou.vo.PersonalVO">
+    <sql id="myOrderSql">
         select
-            p.id,
-            p.order_id,
-            p.location as orderName,
-            pt.acreage,
-            pt.price,
-            pt.amount,
-            cc1.NAME AS clientName,
-            cc2.NAME AS clientSubName,
-            p.agent,
-            cl.name as contactName,
-            p.bailorA,
-            p.bailorB,
-            cl.mobile as contactTel,
-            u1.NAME AS outwardStaffName,
-            u2.NAME AS inwardStaffName,
-            u3.NAME AS pricingStaffName,
-            p.created,
-            o.real_amount,
-            o.should_amount,
-            p.save_file_date,
-            o.id as orderFundId,
-            fi.invoiceAmount
+        p.id,
+        p.order_id,
+        p.location,
+        p.location as orderName,
+        pt.acreage,
+        pt.price,
+        pt.amount,
+        cc1.NAME AS clientName,
+        cc2.NAME AS clientSubName,
+        p.agent,
+        cl.name as contactName,
+        p.bailorA,
+        p.bailorB,
+        cl.mobile as contactTel,
+        u1.NAME AS outwardStaffName,
+        u2.NAME AS inwardStaffName,
+        u3.NAME AS pricingStaffName,
+        p.created,
+        o.real_amount,
+        o.should_amount,
+        p.save_file_date,
+        o.id as orderFundId,
+        fi.invoiceAmount
         from
             personal p
                 LEFT JOIN personal_target pt ON pt.personal_id =  p.id
@@ -388,8 +389,16 @@
             fi.invoiceAmount=${personal.invoiceAmount} desc,
         </if>
         p.created DESC
+    </sql>
+
+    <select id="myOrder" parameterType="com.dayou.vo.PersonalVO" resultType="com.dayou.vo.PersonalVO">
+        <include refid="myOrderSql"/>
     </select>
-    
+
+    <select id="exportMyOrder" resultType="com.dayou.vo.PersonalVO">
+        <include refid="myOrderSql"/>
+    </select>
+
     <select id="waitingAllotOrderPage" resultType="com.dayou.vo.PersonalVO">
         SELECT
             wfni.*,

domain/src/main/java/com/dayou/entity/Assets.java

@@ -1,6 +1,7 @@
 package com.dayou.entity;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.dayou.annotation.Excel;
 import com.dayou.common.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -23,17 +24,11 @@ public class Assets extends BaseEntity {
     private static final long serialVersionUID=1L;
 
     /**
-     * 项目名称
-     */
-    @ImportCell
-    @ExportCell(columnName = "项目名称")
-    private String name;
-
-    /**
      * 项目编号
      */
     @ImportCell
     @ExportCell(columnName = "项目编号")
+    @Excel(name = "项目编号")
     private String orderId;
 
     /**
@@ -41,9 +36,18 @@ public class Assets extends BaseEntity {
      */
     @ImportCell
     @ExportCell(columnName = "分单类型")
+    @Excel(name = "分单类型")
     private String allotType;
 
     /**
+     * 项目名称
+     */
+    @ImportCell
+    @ExportCell(columnName = "项目名称")
+    @Excel(name = "项目名称")
+    private String name;
+
+    /**
      * 客户经理id(user_id)
      */
     private Long clientManagerId;
@@ -63,6 +67,7 @@ public class Assets extends BaseEntity {
      */
     @ImportCell
     @ExportCell(columnName = "资产业务类型")
+    @Excel(name = "业务类型")
     private String assetsBusinessGener;
 
     /**
@@ -136,6 +141,7 @@ public class Assets extends BaseEntity {
      */
     @ImportCell
     @ExportCell(columnName = "委托人")
+    @Excel(name = "委托人")
     private String bailor;
 
     /**
@@ -157,6 +163,7 @@ public class Assets extends BaseEntity {
      */
     @ImportCell
     @ExportCell(columnName = "委托人联系人电话")
+    @Excel(name = "委托人联系电话")
     private String bailorContactTel;
 
     /**

domain/src/main/java/com/dayou/entity/Personal.java

@@ -34,6 +34,7 @@ public class Personal extends BaseEntity {
     @ImportCell
     @ExportCell(columnName = "订单编号")
     @LuceneSearchable("order_id")
+    @Excel(name = "订单编号")
     private String orderId;
 
     /**
@@ -42,6 +43,7 @@ public class Personal extends BaseEntity {
     @ImportCell
     @ExportCell(columnName = "坐落")
     @LuceneSearchable
+    @Excel(name = "坐落")
     private String location;
 
     /**
@@ -85,6 +87,7 @@ public class Personal extends BaseEntity {
      */
     @ImportCell
     @ExportCell(columnName = "中介")
+    @Excel(name = "中介")
     private String agent;
 
     /**
@@ -129,6 +132,7 @@ public class Personal extends BaseEntity {
     @ImportCell
     @ExportCell(columnName = "委托人1")
     @LuceneSearchable("bailorA")
+    @Excel(name = "委托人1")
     private String bailorA;
 
     /**
@@ -138,6 +142,7 @@ public class Personal extends BaseEntity {
     @ImportCell
     @ExportCell(columnName = "委托人2")
     @LuceneSearchable("bailorB")
+    @Excel(name = "委托人2")
     private String bailorB;
 
     /**
@@ -147,6 +152,7 @@ public class Personal extends BaseEntity {
     @ImportCell
     @ExportCell(columnName = "委托人1电话")
     @LuceneSearchable("bailorA_tel")
+    @Excel(name = "委托人1电话")
     private String bailoraTel;
 
     /**
@@ -156,6 +162,7 @@ public class Personal extends BaseEntity {
     @ImportCell
     @ExportCell(columnName = "委托人2电话")
     @LuceneSearchable("bailorB_tel")
+    @Excel(name = "委托人2电话")
     private String bailorbTel;
 
     /**

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

@@ -1,5 +1,6 @@
 package com.dayou.vo;
 
+import com.dayou.annotation.Excel;
 import com.dayou.entity.Assets;
 import com.dayou.entity.User;
 import lombok.Data;
@@ -17,43 +18,65 @@ public class AssetsVO extends Assets {
     /**
      * 意见书号
      */
+    @Excel(name = "意见书号")
     private String statementNo;
 
     /**
      * 报告号
      */
+    @Excel(name = "报告号")
     private String reportNo;
 
     /**
+     * 客户名称
+     */
+    @Excel(name = "客户名称")
+    private String customerName;
+
+    /**
+     * 业务来源(客户子级名称)
+     */
+    @Excel(name = "业务来源")
+    private String customerSubName;
+
+    /**
      *  当前实例节点id
      */
     private Long currentNodeId;
+
     /**
      * 当前实例节点名称
      */
+    @Excel(name = "当前节点")
     private String currentNodeName;
+
     /**
      * 当前实例节点编码
      */
     private String currentNodeCode;
+
     /**
      * 当前节点处理人id
      */
     private Long handlerId;
+
     /**
      * 当前节点处理人
      */
+    @Excel(name = "当前节点处理人")
     private String handlerName;
 
     /**
-     * 客户经理名
+     * 项目负责人
      */
-    private String clientManagerName;
+    @Excel(name = "项目负责人")
+    private String principalName;
 
     /**
-     * 项目负责人名
+     * 客户经理
      */
-    private String principalName;
+    @Excel(name = "客户经理")
+    private String clientManagerName;
 
     /**
      * 客户id
@@ -61,43 +84,39 @@ public class AssetsVO extends Assets {
     private Long customerId;
 
     /**
-     * 客户名称
-     */
-    private String customerName;
-
-    /**
-     * 业务来源(客户子级名称)
-     */
-    private String customerSubName;
-
-    /**
      * 评估结论对应的评估值(万)
      */
+    @Excel(name = "评估结论对应的评估值(万)")
     private Double estimatedValue;
 
     /**
      * 订单应收款(元)
      */
+    @Excel(name = "订单应收款(元)")
     private Double shouldAmount;
 
     /**
      * 订单实收款(元)
      */
+    @Excel(name = "订单实收款(元)")
     private Double realAmount;
 
     /**
      * 标准收费(元)
      */
+    @Excel(name = "标准收费(元)")
     private Double standardAmount;
 
     /**
      * 折扣比例
      */
+    @Excel(name = "折扣比例")
     private Double discount;
 
     /**
      * 实际开票金额
      */
+    @Excel(name = "实际开票金额")
     private Double invoiceRealAmount;
 
     /**
@@ -163,11 +182,13 @@ public class AssetsVO extends Assets {
     /**
      * 产品应收款
      */
+    @Excel(name = "产品应收款")
     private Double productionShouldAmount;
 
     /**
      * 产品实收款
      */
+    @Excel(name = "产品实收款")
     private Double productionRealAmount;
 
     /**
@@ -188,6 +209,7 @@ public class AssetsVO extends Assets {
     /**
      * 报告送达状态
      */
+    @Excel(name = "报告送达状态",readConverterExp=("true=已送达,false=未送达"))
     private Boolean reportDelivery;
 
     /**

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

@@ -1,5 +1,6 @@
 package com.dayou.vo;
 
+import com.dayou.annotation.Excel;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -23,10 +24,8 @@ public class MajorOrderVO {
     /**
      * 订单id
      */
-
     private Long businessId;
 
-
     /**
      * 订单收款id
      */
@@ -40,73 +39,118 @@ public class MajorOrderVO {
     /**
      * 订单号
      */
+    @Excel(name = "订单号")
     private String orderId;
+
     /**
      * 订单名称
      */
+    @Excel(name = "订单名称")
     private String orderName;
 
+    /**
+     * 产品号
+     */
+    @Excel(name = "产品号")
+    private String productionNo;
+
+    /**
+     * 产品类型
+     */
+    @Excel(name = "产品类型")
+    private String production;
 
+    /**
+     * 当前节点
+     */
+    @Excel(name = "当前节点")
+    private String currentNodeName;
 
     /**
      *负责人
      */
+    @Excel(name = "负责人")
     private String principal;
+
     /**
      *客户经理
      */
+    @Excel(name = "客户经理")
     private String clientManager;
 
     /**
-     * 客户经理USER_ID
+     *应收款
      */
-    private Long clientManagerId;
+    @Excel(name = "应收款")
+    private BigDecimal shouldAmount;
+
+    /**
+     *实收款
+     */
+    @Excel(name = "实收款")
+    private BigDecimal realAmount;
+
+    /**
+     *开票金额
+     */
+    @Excel(name = "开票金额")
+    private BigDecimal invoiceAmount;
+
     /**
      *客户名称
      */
+    @Excel(name = "客户名称")
     private String clienteleName;
+
     /**
      *业务来源
      */
+    @Excel(name = "业务来源")
     private String clienteleSubName;
+
     /**
      *客户联系人
      */
+    @Excel(name = "客户联系人")
     private String clienteleContactName;
+
     /**
      *委托人
      */
+    @Excel(name = "委托人")
     private String bailor;
+
     /**
      *产权人
      */
+    @Excel(name = "产权人")
     private String owner;
 
     /**
-     *应收款
+     * 送达状态
      */
-    private BigDecimal shouldAmount;
+    @Excel(name = "送达状态",readConverterExp=("true=已送达,false=未送达"))
+    private Boolean delivery;
+
     /**
-     *实收款
+     * 客户经理USER_ID
      */
-    private BigDecimal realAmount;
+    private Long clientManagerId;
 
     /**
      *订单应收款
      */
     private BigDecimal orderShouldAmount;
+
     /**
      *订单实收款
      */
     private BigDecimal orderRealAmount;
-    /**
-     *开票金额
-     */
-    private BigDecimal invoiceAmount;
 
     /**
      * 下单时间
      */
+    @Excel(name = "下单时间")
     private Date created;
 
     /**
@@ -135,18 +179,10 @@ public class MajorOrderVO {
      */
     private Long principalId;
 
-    private String productionNo;
-
-    private String currentNodeName;
-
     private Boolean ifSaveFile;
 
-    private String production;
-
     private BigDecimal evaluateAmount;
 
     private BigDecimal planAmount;
 
-    private Boolean delivery;
-
 }

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

@@ -1,9 +1,13 @@
 package com.dayou.vo;
 
+import com.dayou.annotation.Excel;
+import com.dayou.annotation.ExportCell;
+import com.dayou.annotation.ImportCell;
 import com.dayou.entity.PaymentCollection;
 import lombok.Data;
 
 import java.time.LocalDate;
+import java.util.Date;
 import java.util.Set;
 
 /**
@@ -16,8 +20,28 @@ import java.util.Set;
 @Data
 public class PaymentCollectionVO extends PaymentCollection {
 
+
+    @Excel(name = "项目名称")
     private String itemName;
 
+    /**
+     * 回款名称
+     */
+    @Excel(name = "回款名称")
+    private String name;
+
+    /**
+     * 回款金额
+     */
+    @Excel(name = "回款金额")
+    private Double amount;
+
+    /**
+     * 回款日期
+     */
+    @Excel(name = "回款日期")
+    private LocalDate paymentDate;
+
     private Set<Long> userIds;
 
     private Integer year;
@@ -30,4 +54,14 @@ public class PaymentCollectionVO extends PaymentCollection {
 
     private LocalDate lastMonth23;
 
+    /**
+     * 筛选开始时间
+     */
+    private Date startDate;
+
+    /**
+     * 筛选结束时间
+     */
+    private Date endDate;
+
 }

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

@@ -1,5 +1,6 @@
 package com.dayou.vo;
 
+import com.dayou.annotation.Excel;
 import com.dayou.entity.Personal;
 import lombok.Data;
 
@@ -19,30 +20,37 @@ public class PersonalVO extends Personal {
     /**
      * 面积
      */
+    @Excel(name = "面积")
     private BigDecimal acreage;
     /**
      * 单价
      */
+    @Excel(name = "单价")
     private BigDecimal price;
     /**
      * 总价
      */
+    @Excel(name = "总价")
     private BigDecimal amount;
     /**
      * 客户名称
      */
+    @Excel(name = "客户名称")
     private String clientName;
     /**
      * 业务来源
      */
+    @Excel(name = "业务来源")
     private String clientSubName;
     /**
      * 客户联系人
      */
+    @Excel(name = "客户联系人")
     private String contactName;
     /**
      * 联系人电话
      */
+    @Excel(name = "联系人电话")
     private String contactTel;
     /**
      * 客户经理
@@ -63,10 +71,12 @@ public class PersonalVO extends Personal {
     /**
      * 应收款
      */
+    @Excel(name = "应收款")
     private BigDecimal shouldAmount;
     /**
      * 实收款
      */
+    @Excel(name = "实收款")
     private BigDecimal realAmount;
 
     /**
@@ -146,5 +156,15 @@ public class PersonalVO extends Personal {
 
     private Long orderFundId;
 
+    /**
+     * 开票金额
+     */
+    @Excel(name = "开票金额")
     private BigDecimal invoiceAmount;
+
+    /**
+     * 下单时间
+     */
+    @Excel(name = "下单时间")
+    private Date created;
 }

service/src/main/java/com/dayou/service/IAssetsService.java

@@ -39,6 +39,13 @@ public interface IAssetsService extends IService<Assets> {
         Page<AssetsVO> selectMyOrderPage(Page page, AssetsSelectDTO assetsSelectDTO);
 
         /**
+         * 导出我的任务订单列表
+         * @param assetsSelectDTO 查询条件
+         * @return Page<AssetsVO>
+         */
+        List<AssetsVO> exportMyOrder(AssetsSelectDTO assetsSelectDTO);
+
+        /**
          * 条件查询资产已归档列表
          * @param page 分页条件
          * @param assetsSelectDTO 查询条件

service/src/main/java/com/dayou/service/IMajorProductionService.java

@@ -56,6 +56,8 @@ public interface IMajorProductionService extends IService<MajorProduction> {
 
     Page<MajorOrderVO> myOrder(Page page, MajorOrderVO myOrder,String keyword);
 
+    List<MajorOrderVO> exportMyOrder(MajorOrderVO myOrder,String keyword);
+
     Page<MajorOrderVO> waitingClaim(Page page, MajorOrderVO myOrder);
 
     OrderProductionsBag productionBag(Long id);

service/src/main/java/com/dayou/service/IPaymentCollectionService.java

@@ -1,4 +1,5 @@
 package com.dayou.service;
+
 import com.dayou.dto.PaymentDetailDTO;
 import com.dayou.dto.PaymentExportDTO;
 import com.dayou.entity.PaymentCollection;
@@ -23,19 +24,24 @@ import java.util.List;
  */
 public interface IPaymentCollectionService extends IService<PaymentCollection> {
 
-        Page<PaymentCollectionVO> selectPage(Page page, PaymentCollectionVO paymentCollection);
+    Page<PaymentCollectionVO> selectPage(Page page, PaymentCollectionVO paymentCollection);
+
+    /**
+     * 回款记录导出
+     */
+    List<PaymentCollectionVO> exportPaymentCollection(PaymentCollectionVO paymentCollection);
 
-        PaymentCollection detail(Long id);
+    PaymentCollection detail(Long id);
 
-        Boolean add(PaymentCollection paymentCollection);
+    Boolean add(PaymentCollection paymentCollection);
 
-        Boolean update(PaymentCollection paymentCollection);
+    Boolean update(PaymentCollection paymentCollection);
 
-        Boolean delete(Long id);
+    Boolean delete(Long id);
 
-    IPage<ItemPaymentVO> getItemPayment(Page page,PaymentCollectionVO paymentCollectionVO);
+    IPage<ItemPaymentVO> getItemPayment(Page page, PaymentCollectionVO paymentCollectionVO);
 
-    List<PaymentDetailDTO> getPaymentDetailListByItemId(Long id,Long userId);
+    List<PaymentDetailDTO> getPaymentDetailListByItemId(Long id, Long userId);
 
     List<PaymentExportDTO> getList(PaymentCollectionVO paymentCollectionVO);
 }

service/src/main/java/com/dayou/service/IPersonalService.java

@@ -51,6 +51,8 @@ public interface IPersonalService extends IService<Personal> {
 
     Page<PersonalVO> myOrder(Page page, PersonalVO personal,String keyword);
 
+    List<PersonalVO> exportMyOrder(PersonalVO personal,String keyword);
+
     Boolean personalAllotRealAmount(List<OrderReportDTO> claimOrders);
 
     Boolean doPersonalAllotRealAmount(List<OrderReportDTO> claimOrders);

service/src/main/java/com/dayou/service/impl/AssetsServiceImpl.java

@@ -128,6 +128,20 @@ public class AssetsServiceImpl extends ServiceImpl<AssetsMapper, Assets> impleme
     }
 
     /**
+     * 导出我的任务订单列表
+     * @param assetsSelectDTO 查询条件
+     * @return Page<AssetsVO>
+     */
+    @Override
+    public List<AssetsVO> exportMyOrder(AssetsSelectDTO assetsSelectDTO) {
+        // 此处判断managerId是否为空只是为了确保前端查询条件有managerId,并不直接信任
+        if (ObjectUtil.isNotNull(assetsSelectDTO) && ObjectUtil.isNotNull(assetsSelectDTO.getClientManagerId())){
+            assetsSelectDTO.setClientManagerId(LoginContext.getCurrentUserId());
+        }
+        return assetsMapper.exportMyOrder(assetsSelectDTO);
+    }
+
+    /**
      * 条件查询资产已归档列表
      *
      * @param page            分页条件

service/src/main/java/com/dayou/service/impl/MajorProductionServiceImpl.java

@@ -310,6 +310,12 @@ public class MajorProductionServiceImpl extends ServiceImpl<MajorProductionMappe
     }
 
     @Override
+    public List<MajorOrderVO> exportMyOrder(MajorOrderVO myOrder, String keyword) {
+        myOrder.setClientManagerId(LoginContext.getCurrentUserId());
+        return majorProductionMapper.exportMyOrder(myOrder, keyword);
+    }
+
+    @Override
     public Page<MajorOrderVO> waitingClaim(Page page, MajorOrderVO myOrder) {
         myOrder.setClientManagerId(LoginContext.getCurrentUserId());
         Page<MajorOrderVO> ret = majorProductionMapper.waitingClaim(page,myOrder);

service/src/main/java/com/dayou/service/impl/PaymentCollectionServiceImpl.java

@@ -72,6 +72,17 @@ public class PaymentCollectionServiceImpl extends ServiceImpl<PaymentCollectionM
         return paymentCollectionMapper.page(page, paymentCollection);
     }
 
+    /**
+     * 回款记录导出
+     */
+    @Override
+    public List<PaymentCollectionVO> exportPaymentCollection(PaymentCollectionVO paymentCollection) {
+        if (paymentCollection.getIsCurMonth()){
+            paymentCollection.setLastMonth23(DateUtils.getLastMonth23(LocalDate.now().getYear(), LocalDate.now().getMonthValue() - 1));
+        }
+        return paymentCollectionMapper.exportPaymentCollection(paymentCollection);
+    }
+
 
     @Override
     public PaymentCollection detail(Long id){

service/src/main/java/com/dayou/service/impl/PersonalServiceImpl.java

@@ -277,6 +277,11 @@ public class PersonalServiceImpl extends ServiceImpl<PersonalMapper, Personal> i
         return pages;
     }
 
+    public List<PersonalVO> exportMyOrder(PersonalVO personal,String keyword) {
+        personal.setClientManagerId(LoginContext.getCurrentUserId());
+        return personalMapper.exportMyOrder(personal, keyword);
+    }
+
     /**
      * 确定内业人员
      * @return