1.资产待认领实收款列表查询优化

2.个贷待认领实收款订单查询Sql修改

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

@@ -249,14 +249,8 @@
         WHERE production.production_type != 'STATEMENT'
         AND assets.client_manager_id = #{managerId}
         AND production.create_production_date IS NOT NULL
-        <if test="apFundSelectDTO.oderName != null and apFundSelectDTO.oderName != ''">
-            AND assets.name LIKE CONCAT('%',#{apFundSelectDTO.oderName},'%')
-        </if>
-        <if test="apFundSelectDTO.orderId != null and apFundSelectDTO.orderId != ''">
-            AND assets.order_id LIKE CONCAT('%',#{apFundSelectDTO.orderId},'%')
-        </if>
-        <if test="apFundSelectDTO.reportNo != null and apFundSelectDTO.reportNo != ''">
-            AND production.production_no LIKE CONCAT('%',#{apFundSelectDTO.reportNo},'%')
+        <if test="apFundSelectDTO.keyWord != null and apFundSelectDTO.keyWord != ''">
+            AND production.assets_name LIKE CONCAT('%',#{apFundSelectDTO.keyWord},'%')
         </if>
         <if test="apFundSelectDTO.eDeclareResult != null and apFundSelectDTO.eDeclareResult != ''">
             AND eDeclare.declare_result = #{apFundSelectDTO.eDeclareResult}

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

@@ -356,19 +356,29 @@
         where
             p.deleted = 0  and p.client_manager_id = #{personal.clientManagerId}
         <if test="keyword!=null and keyword!='' ">
-            and (
-            p.location like concat ('%',#{keyword},'%')
-            or p.order_id like concat('%',#{keyword},'%')
-            or p.agent like concat('%',#{keyword},'%')
-            or p.bailorA like concat('%',#{keyword},'%')
-            or p.bailorB like concat('%',#{keyword},'%')
-            or cc1.name like concat('%',#{keyword},'%')
-            or cc2.name like concat('%',#{keyword},'%')
-            or cl.name like concat('%',#{keyword},'%')
-            or p.bailorA_tel like concat('%',#{keyword},'%')
-            or p.bailorB_tel like concat('%',#{keyword},'%')
+            and  p.location like concat ('%',#{keyword},'%')
+        </if>
+        <if test="personal!=null and personal.orderId!=null">
+            AND p.order_id like concat('%',#{personal.orderId},'%')
+        </if>
+        <if test="personal!=null and personal.bailor!=null">
+            AND (
+                p.bailorA like concat('%',#{personal.bailor},'%')
+                or p.bailorB like concat('%',#{personal.bailor},'%')
             )
         </if>
+        <if test="personal!=null and personal.clientName!=null">
+            AND cc1.name like concat('%',#{personal.clientName},'%')
+        </if>
+        <if test="personal!=null and personal.clientSubName!=null">
+            AND cc2.name like concat('%',#{personal.clientSubName},'%')
+        </if>
+        <if test="personal!=null and personal.shouldAmount!=null">
+            AND o.should_amount = #{personal.shouldAmount}
+        </if>
+        <if test="personal!=null and personal.invoiceAmountCondition!=null">
+            AND fi.invoiceAmount = #{personal.invoiceAmountCondition}
+        </if>
         <if test="personal!=null and personal.startDate!=null and personal.startDate!=''">
             and p.created &gt;= #{personal.startDate}
         </if>

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

@@ -8,6 +8,11 @@ import java.math.BigDecimal;
 public class APFundSelectDTO {
 
     /**
+     * 关键字
+     */
+    private String keyWord;
+
+    /**
      * 订单名
      */
     private String oderName;

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

@@ -157,6 +157,16 @@ public class PersonalVO extends Personal {
     private Long orderFundId;
 
     /**
+     * 委托人
+     */
+    private String bailor;
+
+    /**
+     * 开票金额查询条件(跟排序用的开票金额字段冲突了,所以新增这个)
+     */
+    private BigDecimal invoiceAmountCondition;
+
+    /**
      * 开票金额
      */
     @Excel(name = "开票金额")