1.修改接口getAssetsProductionFundVoList及其相关

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

@@ -221,8 +221,8 @@ public class AssetsProductionController extends BaseController {
      * @return List<AssetsProductionFundVo>
      */
     @GetMapping("/getAssetsProductionFundVoList")
-    public RestResponse<List<AssetsProductionFundVo>> getAssetsProductionFundVoList(APFundSelectDTO apFundSelectDTO) {
-        return RestResponse.data(assetsProductionService.getAssetsProductionFundVoList(apFundSelectDTO));
+    public RestResponse<Page<AssetsProductionFundVo>> getAssetsProductionFundVoList(Page page, APFundSelectDTO apFundSelectDTO) {
+        return RestResponse.data(assetsProductionService.getAssetsProductionFundVoList(page, apFundSelectDTO));
     }
 }
 

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

@@ -1,5 +1,6 @@
 package com.dayou.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dayou.dto.APFundSelectDTO;
 import com.dayou.dto.AProListSelectDTO;
 import com.dayou.entity.AssetsProduction;
@@ -110,5 +111,5 @@ public interface AssetsProductionMapper extends CustomBaseMapper<AssetsProductio
      * @param apFundSelectDTO 查询dto
      * @return List<AssetsProductionFundVo>
      */
-    List<AssetsProductionFundVo> getAssetsProductionFundVoList(@Param("apFundSelectDTO") APFundSelectDTO apFundSelectDTO);
+    Page<AssetsProductionFundVo> getAssetsProductionFundVoList(@Param("page") Page page , @Param("apFundSelectDTO") APFundSelectDTO apFundSelectDTO);
 }

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

@@ -201,39 +201,42 @@
 
     <!--查找实收款认领产品列表-->
     <select id="getAssetsProductionFundVoList" resultType="com.dayou.vo.AssetsProductionFundVo">
-        SELECT assets.id,
+        SELECT (@i :=  @i + 1) AS id,
+        assets.id AS assetsId,
         assets.name AS name,
         assets.order_id AS orderId,
         production.id AS productionId,
-        production.production_no AS reportNo,
+        production.production_no AS productionNo,
+        production.production_type AS productionType,
+        customer.name AS clienteleName,
         oFund.id AS orderFundId,
         oFund.should_amount AS orderShouldAmount,
-        oFund.real_amount AS productionFundId,
+        oFund.real_amount AS orderRealAmount,
         pFund.id AS productionFundId,
         pFund.production_should_amount AS productionShouldAmount,
         pFund.real_amount AS productionRealAmount,
         pFund.standard_amount AS standardAmount,
-        (
-        SELECT declare_result
+        eDeclare.declare_result AS eDeclareResult,
+        mDeclare.declare_result AS mDeclareResult,
+        (SELECT user.name FROM user WHERE user.id = assets.client_manager_id) AS marketUser,
+        (SELECT user.name FROM user WHERE user.id = assets.principal_id) AS evaluateUser
+        FROM (SELECT @i := 0) AS sort,assets
+        LEFT JOIN assets_production AS production ON production.business_id = assets.id
+        LEFT JOIN order_fund AS oFund ON oFund.business_id = assets.id AND oFund.order_id = assets.order_id
+        LEFT JOIN production_fund AS pFund ON pFund.business_id = production.business_id AND pFund.production_no = production.production_no
+        LEFT JOIN customer_company AS customer ON customer.id = assets.clientele_id
+        LEFT JOIN (
+        SELECT business_id,production_id,declare_result
         FROM commission_declare AS `declare`
-        WHERE `declare`.production_id = productionId
-        AND `declare`.business_id = assets.id
-        AND `declare`.business_type = 'COMMISSION_DECLARE_ASSET_EVALUATE'
+        WHERE `declare`.business_type = 'COMMISSION_DECLARE_ASSET_EVALUATE'
         AND deleted = 0
-        ) AS eDeclareResult,
-        (
-        SELECT declare_result
+        ) AS eDeclare ON eDeclare.business_id = assets.id AND eDeclare.production_id = production.id
+        LEFT JOIN (
+        SELECT business_id,production_id,declare_result
         FROM commission_declare AS `declare`
-        WHERE `declare`.production_id = productionId
-        AND `declare`.business_id = assets.id
-        AND `declare`.business_type = 'COMMISSION_DECLARE_ASSET_MARKET'
+        WHERE `declare`.business_type = 'COMMISSION_DECLARE_ASSET_MARKET'
         AND deleted = 0
-        ) AS mDeclareResult
-        FROM assets
-        LEFT JOIN assets_production AS production ON production.business_id = assets.id
-        LEFT JOIN order_fund AS oFund ON oFund.business_id = assets.id AND oFund.order_id = assets.order_id
-        LEFT JOIN production_fund AS pFund ON pFund.business_id = production.business_id AND pFund.production_no =
-        production.production_no
+        ) AS mDeclare ON mDeclare.business_id = assets.id AND mDeclare.production_id = production.id
         WHERE production.production_type != 'STATEMENT'
         AND production.create_production_date IS NOT NULL
         <if test="apFundSelectDTO.oderName != null and apFundSelectDTO.oderName != ''">
@@ -246,10 +249,10 @@
             AND production.production_no LIKE CONCAT('%',#{apFundSelectDTO.reportNo},'%')
         </if>
         <if test="apFundSelectDTO.eDeclareResult != null and apFundSelectDTO.eDeclareResult != ''">
-            AND eDeclareResult = #{apFundSelectDTO.eDeclareResult}
+            AND eDeclare.declare_result = #{apFundSelectDTO.eDeclareResult}
         </if>
         <if test="apFundSelectDTO.mDeclareResult != null and apFundSelectDTO.mDeclareResult != ''">
-            AND mDeclareResult = #{apFundSelectDTO.mDeclareResult}
+            AND mDeclare.declare_result = #{apFundSelectDTO.mDeclareResult}
         </if>
     </select>
 

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

@@ -6,7 +6,14 @@ import lombok.Data;
 import java.math.BigDecimal;
 
 @Data
-public class AssetsProductionFundVo extends BaseEntity {
+public class AssetsProductionFundVo {
+
+    private Long id;
+
+    /**
+     * 资产订单id
+     */
+    private Long assetsId;
 
     /**
      * 项目名称
@@ -29,6 +36,16 @@ public class AssetsProductionFundVo extends BaseEntity {
     private String productionNo;
 
     /**
+     * 产品类型
+     */
+    private String productionType;
+
+    /**
+     * 客户名称
+     */
+    private String clienteleName;
+
+    /**
      * 订单收款id
      */
     private Long orderFundId;
@@ -64,7 +81,22 @@ public class AssetsProductionFundVo extends BaseEntity {
     private BigDecimal standardAmount;
 
     /**
-     * 提成申报审批结果
+     * 评估人员提成申报审批结果
+     */
+    private String eDeclareResult;
+
+    /**
+     * 市场人员提成申报审批结果
+     */
+    private String mDeclareResult;
+
+    /**
+     * 市场人员
+     */
+    private String marketUser;
+
+    /**
+     * 评估人员
      */
-    private String declareResult;
+    private String evaluateUser;
 }

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

@@ -119,6 +119,6 @@ public interface IAssetsProductionService extends IService<AssetsProduction> {
          * @param apFundSelectDTO 查询dto
          * @return List<AssetsProductionFundVo>
          */
-        List<AssetsProductionFundVo> getAssetsProductionFundVoList(APFundSelectDTO apFundSelectDTO);
+        Page<AssetsProductionFundVo> getAssetsProductionFundVoList(Page page, APFundSelectDTO apFundSelectDTO);
 
 }

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

@@ -328,8 +328,8 @@ public class AssetsProductionServiceImpl extends ServiceImpl<AssetsProductionMap
      * @return List<AssetsProductionFundVo>
      */
     @Override
-    public List<AssetsProductionFundVo> getAssetsProductionFundVoList(APFundSelectDTO apFundSelectDTO) {
-        return assetsProductionMapper.getAssetsProductionFundVoList(apFundSelectDTO);
+    public Page<AssetsProductionFundVo> getAssetsProductionFundVoList(Page page, APFundSelectDTO apFundSelectDTO) {
+        return assetsProductionMapper.getAssetsProductionFundVoList(page, apFundSelectDTO);
     }
 
     /**