财务统计部门修改，加上到账日期

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

@@ -125,8 +125,8 @@ public class FinanceClaimController extends BaseController {
      * 大中型实收款统计列表
      */
     @GetMapping("/major/stat")
-    public RestResponse<Page<RealFundMajorStatVO>> majorStat(RealFundMajorStatVO majorStat, Page page){
-        Page<RealFundMajorStatVO> pages=financeClaimService.majorStat(page,majorStat);
+    public RestResponse<Page<RealFundMajorStatVO>> majorStat(RealFundMajorStatVO majorStat, Page page,String keyword){
+        Page<RealFundMajorStatVO> pages=financeClaimService.majorStat(page,majorStat,keyword);
         return RestResponse.data(pages);
     }
 
@@ -134,8 +134,8 @@ public class FinanceClaimController extends BaseController {
      * 大中型实收款统计列表 导出
      */
     @GetMapping("/major/stat/export")
-    public void majorStatExport(RealFundMajorStatVO majorStat, HttpServletResponse response) throws IOException {
-        List<RealFundMajorStatVO> list = financeClaimService.majorStatExport(majorStat);
+    public void majorStatExport(RealFundMajorStatVO majorStat, HttpServletResponse response,String keyword) throws IOException {
+        List<RealFundMajorStatVO> list = financeClaimService.majorStatExport(majorStat,keyword);
         exportPlus(response,"大中型实收款列表",list,RealFundMajorStatVO.class);
     }
 
@@ -146,8 +146,8 @@ public class FinanceClaimController extends BaseController {
      * @return Page<RealFundAssetsStatVO>
      */
     @GetMapping("assets/stat")
-    public RestResponse<Page<RealFundAssetsStatVO>> assetsSate(Page page, RealFundAssetsStatDTO dto) {
-        return RestResponse.data(financeClaimService.assetsSate(page, dto));
+    public RestResponse<Page<RealFundAssetsStatVO>> assetsSate(Page page, RealFundAssetsStatDTO dto,String keyword) {
+        return RestResponse.data(financeClaimService.assetsSate(page, dto,keyword));
     }
 
     /**

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

@@ -1,6 +1,7 @@
 package com.dayou.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.dayou.dto.FinanceRealFundExportDTO;
 import com.dayou.utils.ExcelOneToManyExportUtils;
 import com.dayou.vo.*;
 import lombok.extern.slf4j.Slf4j;
@@ -109,8 +110,8 @@ public class FinanceRealFundController extends BaseController {
      * @return
      */
     @GetMapping("/major/evaluator/settle/prod")
-    public RestResponse<Page<SettleMajorProductionVO>> majorEvaluatorSettleProd(SettleMajorProductionVO settleVO, Page page){
-        Page<SettleMajorProductionVO> result = financeRealFundService.majorEvaluatorSettleProd(settleVO,page);
+    public RestResponse<Page<SettleMajorProductionVO>> majorEvaluatorSettleProd(SettleMajorProductionVO settleVO, Page page,String keyword){
+        Page<SettleMajorProductionVO> result = financeRealFundService.majorEvaluatorSettleProd(settleVO,page,keyword);
         return RestResponse.data(result);
     }
 
@@ -120,8 +121,8 @@ public class FinanceRealFundController extends BaseController {
      * @return
      */
     @GetMapping("/major/evaluator/settle/export")
-    public void majorEvaluatorSettleExport(SettleMajorProductionVO production, HttpServletResponse response) throws IOException, NoSuchFieldException, IllegalAccessException {
-        List<SettleMajorProductionVO> result = financeRealFundService.majorEvaluatorSettleExport(production);
+    public void majorEvaluatorSettleExport(SettleMajorProductionVO production,Page page, HttpServletResponse response,String keyword) throws IOException, NoSuchFieldException, IllegalAccessException {
+        List<SettleMajorProductionVO> result = financeRealFundService.majorEvaluatorSettleExport(production,page,keyword);
 //        exportPlus(response,"大中型评估人员结算项目",result, SettleMajorProductionVO.class);
         ExcelOneToManyExportUtils.exportOneToMany(response,result, SettleMajorProductionVO.class, SettleProInvoiceVo.class,"大中型评估人员结算项目", "invoices");
     }
@@ -133,8 +134,8 @@ public class FinanceRealFundController extends BaseController {
      * @return
      */
     @GetMapping("/major/market/settle/prod")
-    public RestResponse<Page<SettleMajorProductionVO>> majorMarketSettleProd(SettleMajorProductionVO settleVO, Page page){
-        Page<SettleMajorProductionVO> result = financeRealFundService.majorMarketSettleProd(settleVO,page);
+    public RestResponse<Page<SettleMajorProductionVO>> majorMarketSettleProd(SettleMajorProductionVO settleVO, Page page,String keyword){
+        Page<SettleMajorProductionVO> result = financeRealFundService.majorMarketSettleProd(settleVO,page,keyword);
         return RestResponse.data(result);
     }
 
@@ -144,8 +145,8 @@ public class FinanceRealFundController extends BaseController {
      * @return
      */
     @GetMapping("/major/market/settle/export")
-    public void majorMarketSettleExport(SettleMajorProductionVO production, HttpServletResponse response) throws IOException, NoSuchFieldException, IllegalAccessException {
-        List<SettleMajorProductionVO> result = financeRealFundService.majorMarketSettleExport(production);
+    public void majorMarketSettleExport(SettleMajorProductionVO production,Page page, HttpServletResponse response,String keyword) throws IOException, NoSuchFieldException, IllegalAccessException {
+        List<SettleMajorProductionVO> result = financeRealFundService.majorMarketSettleExport(production,page,keyword);
 //        exportPlus(response,"大中型市场人员结算项目",result, SettleMajorProductionVO.class);
         ExcelOneToManyExportUtils.exportOneToMany(response,result, SettleMajorProductionVO.class, SettleProInvoiceVo.class,"大中型市场人员结算项目", "invoices");
     }
@@ -453,8 +454,8 @@ public class FinanceRealFundController extends BaseController {
      * @return RestResponse<Page<SettleAssetsProductionVO>>
      */
     @GetMapping("/assets/market/settle/prod")
-    public RestResponse<Page<SettleAssetsProductionVO>> assetsMarketSettleProd(SettleAssetsProductionVO settleVO, Page page){
-        Page<SettleAssetsProductionVO> result = financeRealFundService.assetsMarketSettleProd(settleVO,page);
+    public RestResponse<Page<SettleAssetsProductionVO>> assetsMarketSettleProd(SettleAssetsProductionVO settleVO, Page page,String keyword){
+        Page<SettleAssetsProductionVO> result = financeRealFundService.assetsMarketSettleProd(settleVO,page,keyword);
         return RestResponse.data(result);
     }
 
@@ -463,8 +464,8 @@ public class FinanceRealFundController extends BaseController {
      * @param settleVO vo
      */
     @GetMapping("/assets/market/settle/export")
-    public void assetsMarketSettleExport(SettleAssetsProductionVO settleVO, HttpServletResponse response) throws IOException, NoSuchFieldException, IllegalAccessException {
-        List<SettleAssetsProductionVO> result = financeRealFundService.assetsMarketSettleExport(settleVO);
+    public void assetsMarketSettleExport(SettleAssetsProductionVO settleVO, HttpServletResponse response, Page page,String keyword) throws IOException, NoSuchFieldException, IllegalAccessException {
+        List<SettleAssetsProductionVO> result = financeRealFundService.assetsMarketSettleExport(settleVO,page,keyword);
 //        exportPlus(response,"资产市场人员结算项目",result, SettleAssetsProductionVO.class);
         ExcelOneToManyExportUtils.exportOneToMany(response,result, SettleAssetsProductionVO.class, SettleProInvoiceVo.class,"资产市场人员结算项目", "invoices");
     }
@@ -476,8 +477,8 @@ public class FinanceRealFundController extends BaseController {
      * @return RestResponse<Page<SettleAssetsProductionVO>>
      */
     @GetMapping("/assets/evaluator/settle/prod")
-    public RestResponse<Page<SettleAssetsProductionVO>> assetsEvaluatorSettleProd(SettleAssetsProductionVO settleVO, Page page){
-        Page<SettleAssetsProductionVO> result = financeRealFundService.assetsEvaluatorSettleProd(settleVO,page);
+    public RestResponse<Page<SettleAssetsProductionVO>> assetsEvaluatorSettleProd(SettleAssetsProductionVO settleVO, Page page,String keyword){
+        Page<SettleAssetsProductionVO> result = financeRealFundService.assetsEvaluatorSettleProd(settleVO,page,keyword);
         return RestResponse.data(result);
     }
 
@@ -486,10 +487,24 @@ public class FinanceRealFundController extends BaseController {
      * @param settleVO vo
      */
     @GetMapping("/assets/evaluator/settle/export")
-    public void assetsEvaluatorSettleExport(SettleAssetsProductionVO settleVO, HttpServletResponse response) throws IOException, NoSuchFieldException, IllegalAccessException {
-        List<SettleAssetsProductionVO> result = financeRealFundService.assetsEvaluatorSettleExport(settleVO);
+    public void assetsEvaluatorSettleExport(SettleAssetsProductionVO settleVO, HttpServletResponse response,Page page,String keyword) throws IOException, NoSuchFieldException, IllegalAccessException {
+        List<SettleAssetsProductionVO> result = financeRealFundService.assetsEvaluatorSettleExport(settleVO,page,keyword);
 //        exportPlus(response,"资产评估人员结算项目",result, SettleAssetsProductionVO.class);
         ExcelOneToManyExportUtils.exportOneToMany(response,result, SettleAssetsProductionVO.class, SettleProInvoiceVo.class,"资产评估人员结算项目", "invoices");
     }
+
+    /**
+     * 实收款导出
+     * @param financeRealFund
+     * @param keyword
+     * @param page
+     * @param response
+     * @throws IOException
+     */
+    @GetMapping("/export")
+    public void financeRealFundExport(FinanceRealFund financeRealFund,String keyword,Page page,HttpServletResponse response) throws IOException {
+        List<FinanceRealFundExportDTO> data = financeRealFundService.exportList(financeRealFund,keyword,page);
+        exportPlus(response,"实收款导出",data, FinanceRealFundExportDTO.class);
+    }
 }
 

common/src/main/java/com/dayou/configuration/MybatisPlusConfig.java

@@ -20,7 +20,9 @@ public class MybatisPlusConfig {
     @Bean
     @Order(Integer.MAX_VALUE - 1)
     public PaginationInterceptor paginationInterceptor() {
-        return new DefaultPageIntecptor();
+        DefaultPageIntecptor defaultPageIntecptor = new DefaultPageIntecptor();
+        defaultPageIntecptor.setLimit(1000L);
+        return defaultPageIntecptor;
     }
 
 

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

@@ -32,9 +32,9 @@ public interface FinanceClaimMapper extends CustomBaseMapper<FinanceClaim> {
 
     BigDecimal residueAmount(@Param("financeFundId") Long financeFundId);
 
-    Page<RealFundMajorStatVO> majorStat(Page page,@Param("majorStat")  RealFundMajorStatVO majorStat);
+    Page<RealFundMajorStatVO> majorStat(Page page,@Param("majorStat")  RealFundMajorStatVO majorStat,@Param("keyword") String keyword);
 
-    List<RealFundMajorStatVO> majorStatExport(@Param("majorStat") RealFundMajorStatVO majorStat);
+    List<RealFundMajorStatVO> majorStatExport(@Param("majorStat") RealFundMajorStatVO majorStat,@Param("keyword") String keyword);
 
     /**
      * 分页查询资产实收款统计
@@ -42,7 +42,7 @@ public interface FinanceClaimMapper extends CustomBaseMapper<FinanceClaim> {
      * @param dto 查询dto
      * @return Page<RealFundAssetsStatVO>
      */
-    Page<RealFundAssetsStatVO> assetsSate(Page page, @Param("dto") RealFundAssetsStatDTO dto);
+    Page<RealFundAssetsStatVO> assetsSate(Page page, @Param("dto") RealFundAssetsStatDTO dto,@Param("keyword") String keyword);
 
     /**
      * 资产实收款统计导出

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

@@ -1,6 +1,7 @@
 package com.dayou.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dayou.dto.FinanceRealFundExportDTO;
 import com.dayou.entity.FinanceRealFund;
 import com.dayou.dao.CustomBaseMapper;
 import com.dayou.vo.*;
@@ -27,13 +28,13 @@ public interface FinanceRealFundMapper extends CustomBaseMapper<FinanceRealFund>
 
     List<MajorProdOverdueVO> overdueMajorExport(@Param("overdueVO")MajorProdOverdueVO overdueVO);
 
-    Page<SettleMajorProductionVO> majorEvaluatorSettleProd(Page page, @Param("settleVO") SettleMajorProductionVO settleVO);
+    Page<SettleMajorProductionVO> majorEvaluatorSettleProd(Page page, @Param("settleVO") SettleMajorProductionVO settleVO,@Param("keyword") String keyword);
 
-    Page<SettleMajorProductionVO> majorMarketerSettleProd(Page page, @Param("settleVO") SettleMajorProductionVO settleVO);
+    Page<SettleMajorProductionVO> majorMarketerSettleProd(Page page, @Param("settleVO") SettleMajorProductionVO settleVO,@Param("keyword")String keyword);
 
-    List<SettleMajorProductionVO> majorEvaluatorSettleExport(@Param("settleVO") SettleMajorProductionVO settleVO);
+    List<SettleMajorProductionVO> majorEvaluatorSettleExport(Page page, @Param("settleVO") SettleMajorProductionVO settleVO,@Param("keyword") String keyword);
 
-    List<SettleMajorProductionVO> majorMarketSettleExport(@Param("settleVO") SettleMajorProductionVO settleVO);
+    List<SettleMajorProductionVO> majorMarketSettleExport(Page page,@Param("settleVO") SettleMajorProductionVO settleVO,@Param("keyword") String keyword);
 
     List<UserCommissionTotalAmountVO> majorEvaluatorCommission(@Param("vo") UserCommissionTotalAmountVO vo);
 
@@ -128,14 +129,14 @@ public interface FinanceRealFundMapper extends CustomBaseMapper<FinanceRealFund>
      * @param page 分页参数
      * @return Page<SettleAssetsProductionVO>
      */
-    Page<SettleAssetsProductionVO> assetsMarketSettleProd(@Param("settleVO")SettleAssetsProductionVO settleVO, Page page);
+    Page<SettleAssetsProductionVO> assetsMarketSettleProd(@Param("settleVO")SettleAssetsProductionVO settleVO, Page page, @Param("keyword") String keyword);
 
     /**
      * 资产市场人员结算项目导出
      * @param settleVO vo
      * @return List<SettleAssetsProductionVO>
      */
-    List<SettleAssetsProductionVO> assetsMarketSettleExport(@Param("settleVO")SettleAssetsProductionVO settleVO);
+    List<SettleAssetsProductionVO> assetsMarketSettleExport(Page page,@Param("settleVO")SettleAssetsProductionVO settleVO,@Param("keyword") String keyword);
 
     /**
      * 资产评估人员结算项目查询
@@ -143,16 +144,18 @@ public interface FinanceRealFundMapper extends CustomBaseMapper<FinanceRealFund>
      * @param page 分页参数
      * @return Page<SettleAssetsProductionVO>
      */
-    Page<SettleAssetsProductionVO> assetsEvaluatorSettleProd(@Param("settleVO")SettleAssetsProductionVO settleVO, Page page);
+    Page<SettleAssetsProductionVO> assetsEvaluatorSettleProd(@Param("settleVO")SettleAssetsProductionVO settleVO, Page page,@Param("keyword") String keyword);
 
     /**
      * 资产评估人员结算项目导出
      * @param settleVO vo
      * @return List<SettleAssetsProductionVO>
      */
-    List<SettleAssetsProductionVO> assetsEvaluatorSettleExport(@Param("settleVO")SettleAssetsProductionVO settleVO);
+    List<SettleAssetsProductionVO> assetsEvaluatorSettleExport(Page page,@Param("settleVO")SettleAssetsProductionVO settleVO,@Param("keyword")String keyword);
 
     Page<PersonalOverdueVO> overduePersonal(Page page, @Param("overdueVO")PersonalOverdueVO overdueVO);
 
     List<PersonalOverdueVO> overduePersonalList(@Param("overdueVO") PersonalOverdueVO overdueVO);
+
+    List<FinanceRealFundExportDTO> exportList(Page page,@Param("vo") FinanceRealFund vo,@Param("keyword") String keyword);
 }

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

@@ -66,9 +66,11 @@
     <sql id="majorStatQuery">
         SELECT
         fc.*,
+        f.oId,
+        f.pId,
         f.production_no as reportNo,
         f.order_id,
-        f.should_amount,
+        f.should_amount as orderShouldAmount,
         m.financial,
         m.members,
         m.bailor,
@@ -101,29 +103,22 @@
         FROM
         (
         SELECT
-        orderFund.id AS oId,
-        pf.id AS pId,
-        orderFund.business_id,
-        orderFund.order_id,
-        pf.production_no,
-        orderFund.should_amount
+        p.order_fund_id oId,
+        p.id AS pId,
+        p.business_id,
+        o.order_id,
+        p.production_no,
+        o.should_amount
         FROM
-        order_fund orderFund
-        LEFT JOIN ( SELECT id, real_amount, production_no, production_type, order_fund_id, created FROM production_fund WHERE business_type = "MAJOR_BUSINESS" AND deleted = 0 AND real_amount != 0 ) pf ON pf.order_fund_id = orderFund.id
+        production_fund p left join (select id,order_id,should_amount from order_fund where business_type='MAJOR_BUSINESS' and deleted = 0) o on o.id = p.order_fund_id
         WHERE
-        orderFund.business_type = 'MAJOR_BUSINESS'
-        AND orderFund.deleted = 0
+        p.business_type = 'MAJOR_BUSINESS'
+        AND p.deleted = 0
         ) f
         INNER JOIN finance_claim fc ON
-        IF
-        (
-        f.pId IS NULL,(
-        fc.order_fund_id = f.oId
-        ),(
-        fc.order_fund_id = f.oId
-        AND fc.production_fund_id = f.pId
-        )
-        )
+
+        ( fc.order_fund_id = f.oId and fc.production_fund_id = f.pId)
+
         LEFT JOIN major m ON f.business_id = m.id
         LEFT JOIN user u ON u.id = m.client_manager_id
         LEFT JOIN user u1 ON u1.id = m.principal_id
@@ -135,23 +130,27 @@
         LEFT JOIN ( SELECT major_id, report_no,production, evaluate_amount, if_save_file, NAME FROM major_production WHERE deleted = 0 ) mp ON ( mp.major_id = m.id AND mp.report_no = f.production_no )
         LEFT JOIN user u2 ON u2.id = fc.claim_user_id
         where m.deleted = 0
-        <if test="majorStat!=null and majorStat.orderId!=null and majorStat.orderId!='' ">
-            and f.order_id like concat ('%',#{majorStat.orderId},'%')
-        </if>
-        <if test="majorStat!=null and majorStat.reportNo!=null and majorStat.reportNo!='' ">
-            and f.production_no like concat ('%',#{majorStat.reportNo},'%')
+        <if test="keyword!=null and keyword!='' ">
+            and (
+            f.order_id like concat ('%',#{keyword},'%')
+            or f.production_no like concat ('%',#{keyword},'%')
+            or u1.name like concat ('%',#{keyword},'%')
+            or fc.claim_amount = #{keyword}
+            or u2.NAME like concat ('%',#{keyword},'%')
+            )
         </if>
+
         <if test="majorStat!=null and majorStat.startDate!=null and majorStat.startDate!='' ">
             and fc.claim_datetime &gt;= #{majorStat.startDate}
         </if>
         <if test="majorStat!=null and majorStat.endDate!=null and majorStat.endDate!='' ">
             and fc.claim_datetime &lt;= #{majorStat.endDate}
         </if>
-        <if test="majorStat!=null and majorStat.principal!=null and majorStat.principal!='' ">
-            and u1.name like concat ('%',#{majorStat.principal},'%')
+        <if test="majorStat!=null and majorStat.payStartDate!=null and majorStat.payStartDate!='' ">
+            and frf.pay_datetime &gt;= #{majorStat.payStartDate}
         </if>
-        <if test="majorStat!=null and majorStat.claimAmount!=null and majorStat.claimAmount!='' ">
-            and fc.claim_amount = #{majorStat.claimAmount}
+        <if test="majorStat!=null and majorStat.payEndDate!=null and majorStat.payEndDate!='' ">
+            and frf.pay_datetime &lt;= #{majorStat.payEndDate}
         </if>
         <if test="majorStat!=null and majorStat.ifSaveFile!=null ">
             and mp.if_save_file = #{majorStat.ifSaveFile}
@@ -159,9 +158,6 @@
         <if test="majorStat!=null and majorStat.financial!=null ">
             and m.financial = #{majorStat.financial}
         </if>
-        <if test="majorStat!=null and majorStat.claimUser!=null and majorStat.claimUser!='' ">
-            and u2.NAME like concat ('%',#{majorStat.claimUser},'%')
-        </if>
         ORDER BY
         fc.claim_datetime DESC
     </sql>
@@ -226,11 +222,11 @@
         LEFT JOIN `user` AS claimUser ON claimUser.id = claim.claim_user_id
         LEFT JOIN assets_production AS prod ON assets.id = prod.business_id AND prodFund.production_no = prod.production_no
         WHERE order_fund.business_type = 'ASSET_BUSINESS'
-        <if test="dto != null and dto.orderId != null and dto.orderId != ''">
-            AND assets.order_id = #{dto.orderId}
-        </if>
-        <if test="dto != null and dto.reportNo != null and dto.reportNo != ''">
-            AND prod.production_no = #{dto.reportNo}
+        <if test="keyword!=null and keyword!='' ">
+            and (
+            assets.order_id like concat ('%',#{keyword},'%')
+            or prod.production_no like concat ('%',#{keyword},'%')
+            )
         </if>
         <if test="dto != null and dto.principalId != null and dto.principalId != ''">
             AND assets.principal_id = #{dto.principalId}
@@ -250,6 +246,9 @@
         <if test="dto != null and dto.startTime != null and dto.endTime!= null">
             AND (claim.claim_datetime BETWEEN #{dto.startTime} AND #{dto.endTime})
         </if>
+        <if test="dto != null and dto.payStartTime != null and dto.payEndTime!= null">
+            AND (realFund.pay_datetime BETWEEN #{dto.payStartTime} AND #{dto.payEndTime})
+        </if>
         ORDER BY claim.claim_datetime DESC
     </sql>
 
@@ -329,6 +328,9 @@
         <if test="dto != null and dto.startTime != null and dto.endTime!= null">
             AND (fc.claim_datetime BETWEEN #{dto.startTime} AND #{dto.endTime})
         </if>
+        <if test="dto != null and dto.payStartTime != null and dto.payEndTime!= null">
+            AND (frf.pay_datetime BETWEEN #{dto.payStartTime} AND #{dto.payEndTime})
+        </if>
         ORDER BY
             fc.claim_datetime DESC
     </sql>

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

@@ -26,26 +26,26 @@
         payer, payer_bank, payer_account, amount, pay_datetime, remark, creator_id
     </sql>
 
-    <select id="getPage" parameterType="com.dayou.entity.FinanceRealFund" resultType="com.dayou.vo.FinanceRealFundVO">
+    <sql id="pageListSql">
         SELECT
-            frf.id,
-            frf.created,
-            frf.payer,
-            frf.payer_bank,
-            frf.payer_account,
-            frf.amount,
-            frf.pay_datetime,
-            frf.remark,
-            frf.creator_id,
-            u.name AS creator,
-            ifnull(t.ca,0) AS claimAmount,
-            ( frf.amount - ifnull(t.ca,0) ) AS notClaimAmount
+        frf.id,
+        frf.created,
+        frf.payer,
+        frf.payer_bank,
+        frf.payer_account,
+        frf.amount,
+        frf.pay_datetime,
+        frf.remark,
+        frf.creator_id,
+        u.name AS creator,
+        ifnull(t.ca,0) AS claimAmount,
+        ( frf.amount - ifnull(t.ca,0) ) AS notClaimAmount
         FROM
-            finance_real_fund frf
-                LEFT JOIN user u ON u.id = frf.creator_id
-                LEFT JOIN ( SELECT real_fund_id, sum(ifnull(claim_amount,0)) ca FROM finance_claim WHERE deleted = 0 GROUP BY real_fund_id ) t ON t.real_fund_id = frf.id
+        finance_real_fund frf
+        LEFT JOIN user u ON u.id = frf.creator_id
+        LEFT JOIN ( SELECT real_fund_id, sum(ifnull(claim_amount,0)) ca FROM finance_claim WHERE deleted = 0 GROUP BY real_fund_id ) t ON t.real_fund_id = frf.id
         WHERE
-            frf.deleted = 0
+        frf.deleted = 0
         <if test="vo!=null and vo.notFinished">
             and  ifnull(t.ca,0) &lt; frf.amount
         </if>
@@ -76,6 +76,10 @@
         </if>
         ORDER BY
         ifnull(t.ca,0) ASC ,frf.created DESC
+    </sql>
+
+    <select id="getPage" parameterType="com.dayou.entity.FinanceRealFund" resultType="com.dayou.vo.FinanceRealFundVO">
+        <include refid="pageListSql" />
     </select>
 
     <select id="getNotClaimAmount" parameterType="java.lang.Long" resultType="java.math.BigDecimal">
@@ -172,6 +176,7 @@
         <result property="clientSubName" column="clientSubName" />
         <result property="evaluateDepartmentName" column="evaluateDepartmentName" />
         <result property="marketDepartmentName" column="marketDepartmentName" />
+        <result property="payDateTime" column="pay_datetime" />
         <collection property="invoices" ofType="com.dayou.vo.SettleProInvoiceVo">
             <result property="invoiceDate" column="invoiceDate" />
             <result property="invoiceUser" column="invoiceUser" />
@@ -181,7 +186,7 @@
 
     <sql id="majorEvaluatorSettleSql">
         SELECT
-            mp.id,
+            fc.id,
             fc.claim_amount,
             m.order_id,
             mp.report_no,
@@ -212,14 +217,17 @@
                             id IN ( SELECT post_id FROM user_post WHERE user_id = m.client_manager_id ))) AS marketDepartmentName,
         invoice.name AS invoiceUser,
         invoice.real_make_date AS invoiceDate,
-        invoice.tax_no AS invoiceNo
+        invoice.tax_no AS invoiceNo,
+        frf.pay_datetime
         FROM
             (
                 SELECT
+                    id,
                     claim_amount,
                     order_fund_id,
                     production_fund_id,
-                    claim_datetime
+                    claim_datetime,
+                     real_fund_id
                 FROM
                     finance_claim
                 WHERE
@@ -227,10 +235,21 @@
                   AND production_fund_id IS NOT NULL
                   AND claim_datetime &gt;= #{settleVO.startDate}
                   AND claim_datetime  &lt;= #{settleVO.endDate} UNION ALL
-                SELECT allot_amount AS claim_amount, order_fund_id, production_fund_id, created AS claim_datetime FROM order_fund_allot WHERE deleted = 0
+                SELECT id, allot_amount AS claim_amount, order_fund_id, production_fund_id, created AS claim_datetime,
+        real_fund_id FROM order_fund_allot WHERE deleted = 0
                     AND created  &gt;= #{settleVO.startDate}
                     AND created &lt;= #{settleVO.endDate}
             ) fc
+                 inner join (
+            select id,pay_datetime from finance_real_fund
+            where deleted = 0
+        <if test="settleVO!=null and settleVO.payStartDate!=null and settleVO.payStartDate!='' ">
+            AND pay_datetime &gt;= #{settleVO.payStartDate}
+        </if>
+        <if test="settleVO!=null and settleVO.payEndDate!=null and settleVO.payEndDate!='' ">
+            AND pay_datetime &lt;= #{settleVO.payEndDate}
+        </if>
+        ) frf on frf.id = fc.real_fund_id
                 INNER JOIN ( SELECT id, order_fund_id, business_id, production_no FROM production_fund WHERE business_type = 'MAJOR_BUSINESS' AND deleted = 0 ) pf ON ( pf.id = fc.production_fund_id AND pf.order_fund_id = fc.order_fund_id )
                 INNER JOIN ( SELECT id, major_id, NAME, report_no, production, evaluate_amount, save_file_date FROM major_production WHERE deleted = 0 AND save_file_date IS NOT NULL ) mp ON mp.report_no = pf.production_no
                 LEFT JOIN major m ON m.id = mp.major_id
@@ -247,20 +266,16 @@
                 AND state = '已开票'
                 ) AS invoice ON IF(invoice.production_fund_id IS NOT NULL ,invoice.order_fund_id = pf.order_fund_id AND invoice.production_fund_id = pf.id,invoice.order_fund_id = pf.order_fund_id)
                 <where>
-                    <if test="settleVO!=null and settleVO.orderId!=null and settleVO.orderId!='' ">
-                            and m.order_id = #{settleVO.orderId}
-                    </if>
-                    <if test="settleVO!=null and settleVO.reportNo!=null and settleVO.reportNo!='' ">
-                        and mp.report_no like concat ('%',#{settleVO.reportNo},'%')
-                    </if>
-                    <if test="settleVO!=null and settleVO.principal!=null and settleVO.principal!='' ">
-                        and u.name like concat ('%',#{settleVO.principal},'%')
-                    </if>
-                    <if test="settleVO!=null and settleVO.clientManager!=null and settleVO.clientManager!='' ">
-                        and u1.name like concat ('%',#{settleVO.clientManager},'%')
+                    <if test="keyword!=null and keyword!='' ">
+                        and (
+                        m.order_id = #{keyword}
+                        or mp.report_no like concat ('%',#{keyword},'%')
+                        or u.name like concat ('%',#{keyword},'%')
+                        or u1.name like concat ('%',#{keyword},'%')
+                        )
                     </if>
                 </where>
-        order by settleDate DESC
+        order by fc.claim_datetime ASC
     </sql>
     <select id="majorEvaluatorSettleProd" parameterType="com.dayou.vo.SettleMajorProductionVO" resultMap="settleeMajorProductionVOMap">
        <include refid="majorEvaluatorSettleSql" />
@@ -272,12 +287,12 @@
 
     <sql id="majorMarketerSettleSql">
         SELECT
-            mp.id,
+            fc.id,
             fc.claim_amount,
             m.order_id,
             mp.report_no,
-            fc.claim_datetime,
-            mp.delivery_date,
+            fc.claim_datetime as claimDate,
+            mp.delivery_date as deliveryDate,
             IF
                 ( fc.claim_datetime > mp.delivery_date, fc.claim_datetime, mp.delivery_date ) AS settleDate,
             mp.NAME,
@@ -303,14 +318,17 @@
                             id IN ( SELECT post_id FROM user_post WHERE user_id = m.client_manager_id ))) AS marketDepartmentName,
         invoice.name AS invoiceUser,
         invoice.real_make_date AS invoiceDate,
-        invoice.tax_no AS invoiceNo
+        invoice.tax_no AS invoiceNo,
+        frf.pay_datetime
         FROM
             (
                 SELECT
+                    id,
                     claim_amount,
                     order_fund_id,
                     production_fund_id,
-                    claim_datetime
+                    claim_datetime,
+                    real_fund_id
                 FROM
                     finance_claim
                 WHERE
@@ -318,10 +336,19 @@
                   AND production_fund_id IS NOT NULL
                   AND claim_datetime  &gt;= #{settleVO.startDate}
                   AND claim_datetime &lt;= #{settleVO.endDate} UNION ALL
-            SELECT allot_amount AS claim_amount, order_fund_id, production_fund_id, created AS claim_datetime FROM order_fund_allot WHERE deleted = 0
+            SELECT id, allot_amount AS claim_amount, order_fund_id, production_fund_id, created AS claim_datetime ,real_fund_id FROM order_fund_allot WHERE deleted = 0
                 AND created  &gt;= #{settleVO.startDate}
                 AND created &lt;= #{settleVO.endDate}
-            ) fc
+            ) fc  inner join (
+        select id,pay_datetime from finance_real_fund
+        where deleted = 0
+        <if test="settleVO!=null and settleVO.payStartDate!=null and settleVO.payStartDate!='' ">
+            AND pay_datetime &gt;= #{settleVO.payStartDate}
+        </if>
+        <if test="settleVO!=null and settleVO.payEndDate!=null and settleVO.payEndDate!='' ">
+            AND pay_datetime &lt;= #{settleVO.payEndDate}
+        </if>
+        ) frf on frf.id = fc.real_fund_id
                 INNER JOIN ( SELECT id, order_fund_id, business_id, production_no FROM production_fund WHERE business_type = 'MAJOR_BUSINESS' AND deleted = 0 ) pf ON ( pf.id = fc.production_fund_id AND pf.order_fund_id = fc.order_fund_id )
                 INNER JOIN ( SELECT id, major_id, NAME, report_no, production, evaluate_amount, delivery_date FROM major_production WHERE deleted = 0 AND delivery_date IS NOT NULL ) mp ON mp.report_no = pf.production_no
                 LEFT JOIN major m ON m.id = mp.major_id
@@ -351,7 +378,7 @@
                 and u1.name like concat ('%',#{settleVO.clientManager},'%')
             </if>
         </where>
-            order by settleDate DESC
+            order by fc.claim_datetime ASC
     </sql>
     <select id="majorMarketerSettleProd" parameterType="com.dayou.vo.SettleMajorProductionVO" resultMap="settleeMajorProductionVOMap">
         <include refid="majorMarketerSettleSql" />
@@ -1453,6 +1480,7 @@
         <result property="clientSubName" column="clientSubName" />
         <result property="evaluateDepartmentName" column="evaluateDepartmentName" />
         <result property="marketDepartmentName" column="marketDepartmentName" />
+        <result property="payDateTime" column="pay_datetime" />
         <collection property="invoices" ofType="com.dayou.vo.SettleProInvoiceVo">
             <result property="invoiceDate" column="invoiceDate" />
             <result property="invoiceUser" column="invoiceUser" />
@@ -1463,7 +1491,7 @@
     <!--资产市场人员结算项目Sql-->
     <sql id="assetsMarketerSettleSql">
         SELECT
-        ap.id,
+        fc.id,
         fc.claim_amount,
         a.order_id,
         ap.production_no,
@@ -1495,14 +1523,17 @@
         id IN ( SELECT post_id FROM user_post WHERE user_id = a.client_manager_id ))) AS marketDepartmentName,
         invoice.name AS invoiceUser,
         invoice.real_make_date AS invoiceDate,
-        invoice.tax_no AS invoiceNo
+        invoice.tax_no AS invoiceNo,
+        frf.pay_datetime
         FROM
         (
         SELECT
+            id,
         claim_amount,
         order_fund_id,
         production_fund_id,
-        claim_datetime
+        claim_datetime,
+        real_fund_id
         FROM
         finance_claim
         WHERE
@@ -1510,11 +1541,21 @@
         AND production_fund_id IS NOT NULL
         AND claim_datetime &gt;= #{settleVO.startDate}
         AND claim_datetime &lt;= #{settleVO.endDate} UNION ALL
-        SELECT allot_amount AS claim_amount, order_fund_id, production_fund_id, created AS claim_datetime FROM
+        SELECT id,allot_amount AS claim_amount, order_fund_id, production_fund_id, created AS claim_datetime,real_fund_id FROM
         order_fund_allot WHERE deleted = 0
         AND created &gt;= #{settleVO.startDate}
         AND created &lt;= #{settleVO.endDate}
         ) fc
+        inner join (
+        select id,pay_datetime from finance_real_fund
+        where deleted = 0
+        <if test="settleVO!=null and settleVO.payStartDate!=null and settleVO.payStartDate!='' ">
+            AND pay_datetime &gt;= #{settleVO.payStartDate}
+        </if>
+        <if test="settleVO!=null and settleVO.payEndDate!=null and settleVO.payEndDate!='' ">
+            AND pay_datetime &lt;= #{settleVO.payEndDate}
+        </if>
+        ) frf on frf.id = fc.real_fund_id
         INNER JOIN ( SELECT id, order_fund_id, business_id, production_no FROM production_fund WHERE business_type =
         'ASSET_BUSINESS' AND deleted = 0 ) pf ON ( pf.id = fc.production_fund_id AND pf.order_fund_id = fc.order_fund_id
         )
@@ -1535,20 +1576,16 @@
             AND state = '已开票'
         ) AS invoice ON IF(invoice.production_fund_id IS NOT NULL ,invoice.order_fund_id = pf.order_fund_id AND invoice.production_fund_id = pf.id,invoice.order_fund_id = pf.order_fund_id)
         <where>
-            <if test="settleVO!=null and settleVO.orderId!=null and settleVO.orderId!='' ">
-                and a.order_id = #{settleVO.orderId}
-            </if>
-            <if test="settleVO!=null and settleVO.productionNo!=null and settleVO.productionNo!='' ">
-                and ap.report_no like concat ('%',#{settleVO.productionNo},'%')
-            </if>
-            <if test="settleVO!=null and settleVO.principal!=null and settleVO.principal!='' ">
-                and u.name like concat ('%',#{settleVO.principal},'%')
-            </if>
-            <if test="settleVO!=null and settleVO.clientManager!=null and settleVO.clientManager!='' ">
-                and u1.name like concat ('%',#{settleVO.clientManager},'%')
+            <if test="keyword!=null and keyword!='' ">
+                and (
+                a.order_id = #{keyword}
+                or ap.production_no like concat ('%',#{keyword},'%')
+                or u.name like concat ('%',#{keyword},'%')
+                or u1.name like concat ('%',#{keyword},'%')
+                )
             </if>
         </where>
-        order by settleDate DESC
+        order by fc.claim_datetime  ASC
     </sql>
 
     <!--资产结算项目查询-->
@@ -1564,7 +1601,7 @@
     <!--资产评估人员结算项目Sql-->
     <sql id="assetsEvaluatorSettleSql">
         SELECT
-        ap.id,
+        fc.id,
         fc.claim_amount,
         a.order_id,
         ap.production_no,
@@ -1594,14 +1631,17 @@
         id IN ( SELECT post_id FROM user_post WHERE user_id = a.client_manager_id ))) AS marketDepartmentName,
         invoice.name AS invoiceUser,
         invoice.real_make_date AS invoiceDate,
-        invoice.tax_no AS invoiceNo
+        invoice.tax_no AS invoiceNo,
+        frf.pay_datetime
         FROM
         (
         SELECT
+        id,
         claim_amount,
         order_fund_id,
         production_fund_id,
-        claim_datetime
+        claim_datetime,
+        real_fund_id
         FROM
         finance_claim
         WHERE
@@ -1609,10 +1649,21 @@
         AND production_fund_id IS NOT NULL
         AND claim_datetime &gt;= #{settleVO.startDate}
         AND claim_datetime  &lt;= #{settleVO.endDate} UNION ALL
-        SELECT allot_amount AS claim_amount, order_fund_id, production_fund_id, created AS claim_datetime FROM order_fund_allot WHERE deleted = 0
+        SELECT id, allot_amount AS claim_amount, order_fund_id, production_fund_id, created AS claim_datetime ,real_fund_id FROM order_fund_allot WHERE deleted = 0
         AND created  &gt;= #{settleVO.startDate}
         AND created &lt;= #{settleVO.endDate}
         ) fc
+
+        inner join (
+        select id,pay_datetime from finance_real_fund
+        where deleted = 0
+        <if test="settleVO!=null and settleVO.payStartDate!=null and settleVO.payStartDate!='' ">
+            AND pay_datetime &gt;= #{settleVO.payStartDate}
+        </if>
+        <if test="settleVO!=null and settleVO.payEndDate!=null and settleVO.payEndDate!='' ">
+            AND pay_datetime &lt;= #{settleVO.payEndDate}
+        </if>
+        ) frf on frf.id = fc.real_fund_id
         INNER JOIN ( SELECT id, order_fund_id, business_id, production_no FROM production_fund WHERE business_type = 'ASSET_BUSINESS' AND deleted = 0 ) pf ON ( pf.id = fc.production_fund_id AND pf.order_fund_id = fc.order_fund_id )
         INNER JOIN ( SELECT id, business_id, assets_name, production_no, production_type, evaluate_amount, save_file_date FROM assets_production WHERE deleted = 0 AND save_file_date IS NOT NULL ) ap ON ap.production_no = pf.production_no
         LEFT JOIN assets a ON a.id = ap.business_id
@@ -1629,20 +1680,16 @@
             AND state = '已开票'
         ) AS invoice ON IF(invoice.production_fund_id IS NOT NULL ,invoice.order_fund_id = pf.order_fund_id AND invoice.production_fund_id = pf.id,invoice.order_fund_id = pf.order_fund_id)
         <where>
-            <if test="settleVO!=null and settleVO.orderId!=null and settleVO.orderId!='' ">
-                and a.order_id = #{settleVO.orderId}
-            </if>
-            <if test="settleVO!=null and settleVO.productionNo!=null and settleVO.productionNo!='' ">
-                and ap.production_no like concat ('%',#{settleVO.productionNo},'%')
-            </if>
-            <if test="settleVO!=null and settleVO.principal!=null and settleVO.principal!='' ">
-                and u.name like concat ('%',#{settleVO.principal},'%')
-            </if>
-            <if test="settleVO!=null and settleVO.clientManager!=null and settleVO.clientManager!='' ">
-                and u1.name like concat ('%',#{settleVO.clientManager},'%')
+            <if test="keyword!=null and keyword!='' ">
+                and (
+                a.order_id = #{keyword}
+                or ap.production_no like concat ('%',#{keyword},'%')
+                or u.name like concat ('%',#{keyword},'%')
+                or u1.name like concat ('%',#{keyword},'%')
+                )
             </if>
         </where>
-        order by settleDate DESC
+        order by  fc.claim_datetime ASC
     </sql>
 
     <!--资产评估人员结算项目查询-->
@@ -1655,4 +1702,7 @@
         <include refid="assetsEvaluatorSettleSql" />
     </select>
 
+    <select id="exportList" parameterType="com.dayou.entity.FinanceRealFund" resultType="com.dayou.dto.FinanceRealFundExportDTO">
+        <include refid="pageListSql" />
+    </select>
 </mapper>

domain/src/main/java/com/dayou/dto/FinanceRealFundExportDTO.java

@@ -0,0 +1,57 @@
+package com.dayou.dto;
+
+import com.dayou.annotation.Excel;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Date;
+
+@Data
+public class FinanceRealFundExportDTO {
+
+    private Long id;
+
+    /**
+     * 付款方
+     */
+    @Excel(name = "付款方")
+    private String payer;
+
+    /**
+     * 付款银行
+     */
+    @Excel(name = "付款银行")
+    private String payerBank;
+
+    /**
+     * 付款金额
+     */
+    @Excel(name = "付款金额")
+    private BigDecimal amount;
+
+    /**
+     * 到账时日
+     */
+    @Excel(name = "到账时日")
+    private LocalDate payDatetime;
+
+    @Excel(name= "已认领（元）")
+    private BigDecimal claimAmount;
+
+    @Excel(name= "未认领（元）")
+    private BigDecimal notClaimAmount;
+
+    @Excel(name= "录入人")
+    private String creator;
+
+    @Excel(name= "录入时间" ,dateFormat="yyyy-MM-dd")
+    private Date created;
+
+    @Excel(name = "备注")
+    private String remark;
+
+
+
+
+}

domain/src/main/java/com/dayou/dto/RealFundAssetsStatDTO.java

@@ -55,4 +55,16 @@ public class RealFundAssetsStatDTO {
      * 是否归档(true=已归档,false=未归档)
      */
     private Boolean ifSaveFile;
+
+    /**
+     * 筛选开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date payStartTime;
+
+    /**
+     * 筛选结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date payEndTime;
 }

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

@@ -38,5 +38,10 @@ public class OrderFundAllot extends BaseEntity {
     @ExportCell(columnName = "分配金额")
     private BigDecimal allotAmount;
 
+    /**
+     * 实收款id
+     */
+    private Long realFundId;
+
 
 }

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

@@ -155,6 +155,12 @@ public class RealFundMajorStatVO {
 
     private String endDate;
 
+    private String payStartDate;
+
+    private String payEndDate;
+
+
+
 
 
 }

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

@@ -65,4 +65,16 @@ public class RealFundPersonalVO {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date endTime;
 
+    /**
+     * 筛选开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date payStartTime;
+
+    /**
+     * 筛选结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date payEndTime;
+
 }

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

@@ -30,6 +30,9 @@ public class SettleAssetsProductionVO {
     @Excel(name = "送达日期")
     private LocalDate deliveryDate;
 
+    @Excel(name = "到账日期")
+    private LocalDate payDateTime;
+
     @Excel(name = "项目名称", width = 30)
     private String projectName;
 
@@ -69,4 +72,8 @@ public class SettleAssetsProductionVO {
 
     private String endDate;
 
+    private String payStartDate;
+
+    private String payEndDate;
+
 }

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

@@ -38,6 +38,9 @@ public class SettleMajorProductionVO {
     @Excel(name = "送达日期")
     private LocalDate deliveryDate;
 
+    @Excel(name = "到账日期")
+    private LocalDate payDateTime;
+
     @Excel(name = "项目名称", width = 30)
     private String name;
 
@@ -86,6 +89,10 @@ public class SettleMajorProductionVO {
 
     private String endDate;
 
+    private String payStartDate;
+
+    private String payEndDate;
+
 
 
 }

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

@@ -63,9 +63,9 @@ public interface IFinanceClaimService extends IService<FinanceClaim> {
     BigDecimal residueAmount(Long financeFundId);
 
 
-    Page<RealFundMajorStatVO> majorStat(Page page, RealFundMajorStatVO majorStat);
+    Page<RealFundMajorStatVO> majorStat(Page page, RealFundMajorStatVO majorStat,String keyword);
 
-    List<RealFundMajorStatVO> majorStatExport(RealFundMajorStatVO majorStat);
+    List<RealFundMajorStatVO> majorStatExport(RealFundMajorStatVO majorStat,String keyword);
 
     /**
      * 分页查询资产实收款统计
@@ -73,7 +73,7 @@ public interface IFinanceClaimService extends IService<FinanceClaim> {
      * @param dto 查询dto
      * @return Page<RealFundAssetsStatVO>
      */
-    Page<RealFundAssetsStatVO> assetsSate(Page page, RealFundAssetsStatDTO dto);
+    Page<RealFundAssetsStatVO> assetsSate(Page page, RealFundAssetsStatDTO dto,String keyword);
 
     /**
      * 资产实收款统计导出

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

@@ -1,4 +1,5 @@
 package com.dayou.service;
+import com.dayou.dto.FinanceRealFundExportDTO;
 import com.dayou.entity.FinanceRealFund;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -36,13 +37,13 @@ public interface IFinanceRealFundService extends IService<FinanceRealFund> {
 
     List<MajorProdOverdueVO> overdueMajorExport(MajorProdOverdueVO overdueVO);
 
-    Page<SettleMajorProductionVO> majorEvaluatorSettleProd(SettleMajorProductionVO settleVO, Page page);
+    Page<SettleMajorProductionVO> majorEvaluatorSettleProd(SettleMajorProductionVO settleVO, Page page,String keyword);
 
-    Page<SettleMajorProductionVO> majorMarketSettleProd(SettleMajorProductionVO settleVO, Page page);
+    Page<SettleMajorProductionVO> majorMarketSettleProd(SettleMajorProductionVO settleVO, Page page,String keyword);
 
-    List<SettleMajorProductionVO> majorMarketSettleExport(SettleMajorProductionVO production);
+    List<SettleMajorProductionVO> majorMarketSettleExport(SettleMajorProductionVO production,Page page,String keyword);
 
-    List<SettleMajorProductionVO> majorEvaluatorSettleExport(SettleMajorProductionVO production);
+    List<SettleMajorProductionVO> majorEvaluatorSettleExport(SettleMajorProductionVO production,Page page,String keyword);
 
     List<UserCommissionTotalAmountVO> majorEvaluatorCommission(UserCommissionTotalAmountVO vo);
 
@@ -157,14 +158,14 @@ public interface IFinanceRealFundService extends IService<FinanceRealFund> {
      * @param page 分页参数
      * @return Page<SettleAssetsProductionVO>
      */
-    Page<SettleAssetsProductionVO> assetsMarketSettleProd(SettleAssetsProductionVO settleVO, Page page);
+    Page<SettleAssetsProductionVO> assetsMarketSettleProd(SettleAssetsProductionVO settleVO, Page page,String keyword);
 
     /**
      * 资产市场人员结算项目导出
      * @param settleVO vo
      * @return List<SettleAssetsProductionVO>
      */
-    List<SettleAssetsProductionVO> assetsMarketSettleExport(SettleAssetsProductionVO settleVO);
+    List<SettleAssetsProductionVO> assetsMarketSettleExport(SettleAssetsProductionVO settleVO,Page page,String keyword);
 
     /**
      * 资产评估人员结算项目查询
@@ -172,14 +173,16 @@ public interface IFinanceRealFundService extends IService<FinanceRealFund> {
      * @param page 分页参数
      * @return Page<SettleAssetsProductionVO>
      */
-    Page<SettleAssetsProductionVO> assetsEvaluatorSettleProd(SettleAssetsProductionVO settleVO, Page page);
+    Page<SettleAssetsProductionVO> assetsEvaluatorSettleProd(SettleAssetsProductionVO settleVO, Page page,String keyword);
 
     /**
      * 资产评估人员结算项目导出
      * @param settleVO vo
      * @return List<SettleAssetsProductionVO>
      */
-    List<SettleAssetsProductionVO> assetsEvaluatorSettleExport(SettleAssetsProductionVO settleVO);
+    List<SettleAssetsProductionVO> assetsEvaluatorSettleExport(SettleAssetsProductionVO settleVO,Page page,String keyword);
 
     List<PersonalOverdueVO> overduePersonalList(PersonalOverdueVO overdueVO);
+
+    List<FinanceRealFundExportDTO> exportList(FinanceRealFund financeRealFund, String keyword,Page page);
 }

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

@@ -201,13 +201,13 @@ public class FinanceClaimServiceImpl extends ServiceImpl<FinanceClaimMapper, Fin
     }
 
     @Override
-    public Page<RealFundMajorStatVO> majorStat(Page page, RealFundMajorStatVO majorStat) {
-        return financeClaimMapper.majorStat(page,majorStat);
+    public Page<RealFundMajorStatVO> majorStat(Page page, RealFundMajorStatVO majorStat,String keyword) {
+        return financeClaimMapper.majorStat(page,majorStat,keyword);
     }
 
     @Override
-    public List<RealFundMajorStatVO> majorStatExport(RealFundMajorStatVO majorStat) {
-        return financeClaimMapper.majorStatExport(majorStat);
+    public List<RealFundMajorStatVO> majorStatExport(RealFundMajorStatVO majorStat,String keyword) {
+        return financeClaimMapper.majorStatExport(majorStat,keyword);
     }
 
     /**
@@ -217,8 +217,8 @@ public class FinanceClaimServiceImpl extends ServiceImpl<FinanceClaimMapper, Fin
      * @return Page<RealFundAssetsStatVO>
      */
     @Override
-    public Page<RealFundAssetsStatVO> assetsSate(Page page, RealFundAssetsStatDTO dto) {
-        return financeClaimMapper.assetsSate(page, dto);
+    public Page<RealFundAssetsStatVO> assetsSate(Page page, RealFundAssetsStatDTO dto,String keyword) {
+        return financeClaimMapper.assetsSate(page, dto,keyword);
     }
 
     /**

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

@@ -3,6 +3,7 @@ package com.dayou.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.dayou.common.BaseEntity;
+import com.dayou.dto.FinanceRealFundExportDTO;
 import com.dayou.entity.FinanceClaim;
 import com.dayou.entity.FinanceRealFund;
 import com.dayou.exception.ErrorCode;
@@ -112,25 +113,25 @@ public class FinanceRealFundServiceImpl extends ServiceImpl<FinanceRealFundMappe
     }
 
     @Override
-    public Page<SettleMajorProductionVO> majorEvaluatorSettleProd(SettleMajorProductionVO settleVO, Page page) {
-        Page<SettleMajorProductionVO> result = financeRealFundMapper.majorEvaluatorSettleProd(page,settleVO);
+    public Page<SettleMajorProductionVO> majorEvaluatorSettleProd(SettleMajorProductionVO settleVO, Page page,String keyword) {
+        Page<SettleMajorProductionVO> result = financeRealFundMapper.majorEvaluatorSettleProd(page,settleVO,keyword);
         return result;
     }
 
     @Override
-    public Page<SettleMajorProductionVO> majorMarketSettleProd(SettleMajorProductionVO settleVO, Page page) {
-        Page<SettleMajorProductionVO> result = financeRealFundMapper.majorMarketerSettleProd(page,settleVO);
+    public Page<SettleMajorProductionVO> majorMarketSettleProd(SettleMajorProductionVO settleVO, Page page,String keyword) {
+        Page<SettleMajorProductionVO> result = financeRealFundMapper.majorMarketerSettleProd(page,settleVO,keyword);
         return result;
     }
 
     @Override
-    public List<SettleMajorProductionVO> majorMarketSettleExport(SettleMajorProductionVO production) {
-        return financeRealFundMapper.majorMarketSettleExport(production);
+    public List<SettleMajorProductionVO> majorMarketSettleExport(SettleMajorProductionVO production,Page page,String keyword) {
+        return financeRealFundMapper.majorMarketSettleExport(page,production,keyword);
     }
 
     @Override
-    public List<SettleMajorProductionVO> majorEvaluatorSettleExport(SettleMajorProductionVO production) {
-        return financeRealFundMapper.majorEvaluatorSettleExport(production);
+    public List<SettleMajorProductionVO> majorEvaluatorSettleExport(SettleMajorProductionVO production,Page page,String keyword) {
+        return financeRealFundMapper.majorEvaluatorSettleExport(page,production,keyword);
     }
 
     @Override
@@ -321,8 +322,8 @@ public class FinanceRealFundServiceImpl extends ServiceImpl<FinanceRealFundMappe
      * @return Page<SettleAssetsProductionVO>
      */
     @Override
-    public Page<SettleAssetsProductionVO> assetsMarketSettleProd(SettleAssetsProductionVO settleVO, Page page) {
-        return financeRealFundMapper.assetsMarketSettleProd(settleVO, page);
+    public Page<SettleAssetsProductionVO> assetsMarketSettleProd(SettleAssetsProductionVO settleVO, Page page,String keyword) {
+        return financeRealFundMapper.assetsMarketSettleProd(settleVO, page,keyword);
     }
 
     /**
@@ -331,8 +332,8 @@ public class FinanceRealFundServiceImpl extends ServiceImpl<FinanceRealFundMappe
      * @return List<SettleAssetsProductionVO>
      */
     @Override
-    public List<SettleAssetsProductionVO> assetsMarketSettleExport(SettleAssetsProductionVO settleVO) {
-        return financeRealFundMapper.assetsMarketSettleExport(settleVO);
+    public List<SettleAssetsProductionVO> assetsMarketSettleExport(SettleAssetsProductionVO settleVO,Page page,String keyword) {
+        return financeRealFundMapper.assetsMarketSettleExport(page,settleVO,keyword);
     }
 
     /**
@@ -342,8 +343,8 @@ public class FinanceRealFundServiceImpl extends ServiceImpl<FinanceRealFundMappe
      * @return Page<SettleAssetsProductionVO>
      */
     @Override
-    public Page<SettleAssetsProductionVO> assetsEvaluatorSettleProd(SettleAssetsProductionVO settleVO, Page page) {
-        return financeRealFundMapper.assetsEvaluatorSettleProd(settleVO, page);
+    public Page<SettleAssetsProductionVO> assetsEvaluatorSettleProd(SettleAssetsProductionVO settleVO, Page page,String keyword) {
+        return financeRealFundMapper.assetsEvaluatorSettleProd(settleVO, page,keyword);
     }
 
     /**
@@ -352,8 +353,8 @@ public class FinanceRealFundServiceImpl extends ServiceImpl<FinanceRealFundMappe
      * @return List<SettleAssetsProductionVO>
      */
     @Override
-    public List<SettleAssetsProductionVO> assetsEvaluatorSettleExport(SettleAssetsProductionVO settleVO) {
-        return financeRealFundMapper.assetsEvaluatorSettleExport(settleVO);
+    public List<SettleAssetsProductionVO> assetsEvaluatorSettleExport(SettleAssetsProductionVO settleVO,Page page,String keyword) {
+        return financeRealFundMapper.assetsEvaluatorSettleExport(page,settleVO,keyword);
     }
 
     @Override
@@ -361,4 +362,9 @@ public class FinanceRealFundServiceImpl extends ServiceImpl<FinanceRealFundMappe
         List<PersonalOverdueVO> list = financeRealFundMapper.overduePersonalList(overdueVO);
         return list;
     }
+
+    @Override
+    public List<FinanceRealFundExportDTO> exportList(FinanceRealFund financeRealFund, String keyword,Page page) {
+        return financeRealFundMapper.exportList(page,financeRealFund,keyword);
+    }
 }

sql/update_sql.sql

@@ -659,4 +659,10 @@ ALTER TABLE `assets` ADD market_department_id bigint(20) NULL COMMENT '市场部
   操作人：苟耕铨
  */
 
+/**
+   日期：2024-08-28
+   修改人:吴长林
+   未更新到test-env
+*/
+ALTER TABLE `order_fund_allot` ADD real_fund_id bigint(20) NOT NULL COMMENT '实收款id';