1.修复资产提成审批待办列表查询条件无效的问题

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

@@ -864,6 +864,28 @@
                 LEFT JOIN business_commission_rate bcr ON bcr.id = t.commission_rate_id
                 LEFT JOIN dict_data dd ON dd.id = bcr.business_cate_id
                 LEFT JOIN user u1 ON u1.id = t.declare_user_id
+                <if test="checkVO != null">
+                    LEFT JOIN (SELECT assets.id AS assetsId, assets_production.id AS proId, assets.order_id, IFNULL(assets_name, name) AS name, production_no
+                               FROM assets, assets_production
+                               WHERE assets.id = assets_production.business_id
+                                 AND assets.deleted = 0
+                                 AND assets_production.deleted = 0
+                               ) AS orderInfo ON orderInfo.assetsId = t.assetsId AND orderInfo.proId = t.prodId
+                    <where>
+                        <if test="checkVO.orderId != null">
+                            orderInfo.order_id = #{checkVO.orderId}
+                        </if>
+                        <if test="checkVO.name != null">
+                            orderInfo.name LIKE CONCAT('%', #{checkVO.name}, '%')
+                        </if>
+                        <if test="checkVO.reportNo != null">
+                            orderInfo.production_no = #{checkVO.reportNo}
+                        </if>
+                        <if test="checkVO.commissionRateId != null">
+                            t.commission_rate_id = #{checkVO.commissionRateId}
+                        </if>
+                    </where>
+                </if>
     </sql>
 
     <!--查询资产绩效提成申报关联项目信息-->
@@ -871,13 +893,13 @@
         <if test="assetsId!=null and prodId!=null">
             SELECT
             assets.id as assetsId,
-            assets.name AS orderName,
+            IFNULL(ap.assets_name, assets.name) AS orderName,
             assets.order_id as orderId,
             ap.production_no as reportNo,
             ap.id as prodId
             FROM
             assets
-            LEFT JOIN ( SELECT id, business_id, production_no FROM assets_production WHERE deleted = 0 ) ap ON
+            LEFT JOIN ( SELECT id, business_id, production_no, assets_name FROM assets_production WHERE deleted = 0 ) ap ON
             assets.id = ap.business_id
             where assets.id = #{assetsId} and ap.id= #{prodId}
         </if>

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

@@ -63,5 +63,7 @@ public class CommissionDeclareTodoCheckVO {
 
     private AssetsDeclareSimpleDTO assetsSimple;
 
+    private Long commissionRateId;
+
 
 }