1.修复资产提成申报如果先申报市场再申报评估会报错的问题

2.修复资产selectPage和selectMyOrderPage查询结果有已归档订单时不显示产品号
3.修复按照送达状态delivery查询SQL报错

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

@@ -33,7 +33,7 @@ public interface AssetsMapper extends CustomBaseMapper<Assets> {
     Page<AssetsVO> selectPage(@Param("page") Page page, @Param("assetsSelectDTO") AssetsSelectDTO assetsSelectDTO);
 
     /**
-     * 条件查询我的资产任务订单列表
+     * 条件查询我的资产订单列表
      * @param page 分页条件
      * @param assetsSelectDTO 查询条件
      * @return Page<AssetsVO>

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

@@ -92,7 +92,7 @@
         work_task_record AS record,
         user,
         work_node AS node
-        WHERE state = 'PENDING'
+        WHERE (state = 'PENDING' OR( state = 'FINISHED' AND node.`code` = 'BUSINESS_ARCHIVING' ))
         AND nodeInstance.node_id = node.id
         AND record.handler_id = user.id
         AND nodeInstance.deleted = 0
@@ -132,7 +132,7 @@
         ORDER BY assets.created DESC
     </select>
 
-    <!--条件查询我的资产任务订单列表-->
+    <!--条件查询我的资产订单列表-->
     <select id="selectMyOrderPage" resultType="com.dayou.vo.AssetsVO">
         SELECT (@i :=  @i + 1) AS id,
         assets.id AS assetsId,
@@ -193,7 +193,7 @@
         work_task_record AS record,
         user,
         work_node AS node
-        WHERE state = 'PENDING'
+        WHERE (state = 'PENDING' OR( state = 'FINISHED' AND node.`code` = 'BUSINESS_ARCHIVING' ))
         AND nodeInstance.node_id = node.id
         AND record.handler_id = user.id
         AND nodeInstance.deleted = 0
@@ -205,8 +205,8 @@
         WHERE assets.deleted = 0
         AND assets.client_manager_id = #{assetsSelectDTO.clientManagerId}
         #送达状态查询
-        <if test="assetsSelectDTO != null and assetsSelectDTO.delivery != null">
-            AND production.delivery = #{assetsSelectDTO.delivery}
+        <if test="assetsSelectDTO != null and assetsSelectDTO.delivery">
+            AND reportInfo.delivery = #{assetsSelectDTO.delivery}
         </if>
         #项目负责人查询
         <if test="assetsSelectDTO != null and assetsSelectDTO.principalId != null">
@@ -266,8 +266,6 @@
         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 production_fund AS pFund ON pFund.business_id = assets.id
-        LEFT JOIN finance_invoice AS invoice ON pFund.order_fund_id = fund.id
         #查询当前进行的节点信息
         LEFT JOIN (SELECT nodeInstance.id AS currentNodeId,
         user.name AS handlerName,
@@ -289,6 +287,8 @@
         AND record.instance_id = nodeInstance.id
         AND nodeInstance.business_type = 'ASSET_BUSINESS'
         ) AS nodeInfo ON nodeInfo.businessId = assets.id
+        LEFT JOIN production_fund AS pFund ON pFund.business_id = assets.id AND pFund.production_no = nodeInfo.business_min_id
+        LEFT JOIN finance_invoice AS invoice ON pFund.order_fund_id = fund.id
         WHERE assets.deleted = 0
         AND nodeInfo.currentNodeCode = 'BUSINESS_ARCHIVING'
         #评估业务类别(业务类型)查询

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

@@ -30,7 +30,7 @@ public interface IAssetsService extends IService<Assets> {
         Page<AssetsVO> selectPage(Page page, AssetsSelectDTO assetsSelectDTO);
 
         /**
-         * 条件查询我的资产任务订单列表
+         * 条件查询我的任务订单列表
          * @param page 分页条件
          * @param assetsSelectDTO 查询条件
          * @return Page<AssetsVO>

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

@@ -96,7 +96,7 @@ public class AssetsServiceImpl extends ServiceImpl<AssetsMapper, Assets> impleme
     }
 
     /**
-     * 条件查询我的资产任务订单列表
+     * 条件查询我的资产订单列表
      *
      * @param page            分页条件
      * @param assetsSelectDTO 查询条件

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

@@ -111,6 +111,7 @@ public class BusinessPerformanceDistributionServiceImpl extends ServiceImpl<Busi
                 .eq(BusinessPerformanceDistribution::getBusinessId, dto.getBusinessId())
                 .eq(BusinessPerformanceDistribution::getBusinessType, dto.getBusinessType())
                 .eq(BusinessPerformanceDistribution::getReportNo, dto.getReportNo())
+                .eq(BusinessPerformanceDistribution::getUserType, dto.getUserType())
                 .eq(BaseEntity::getDeleted, 0));
     }