1.修复资产认领实收款列表报告号查询无效

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

@@ -258,6 +258,9 @@
         <if test="apFundSelectDTO.orderId != null and apFundSelectDTO.orderId != ''">
             AND assets.order_id = #{apFundSelectDTO.orderId}
         </if>
+        <if test="apFundSelectDTO.reportNo != null and apFundSelectDTO.reportNo != ''">
+            AND production.production_no = #{apFundSelectDTO.reportNo}
+        </if>
         <if test="apFundSelectDTO.eDeclareResult != null and apFundSelectDTO.eDeclareResult != ''">
             AND eDeclare.declare_result = #{apFundSelectDTO.eDeclareResult}
         </if>

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

@@ -472,7 +472,7 @@ public class AssetsServiceImpl extends ServiceImpl<AssetsMapper, Assets> impleme
         //判断取号的产品类型(获取已取过的号)
         if (takeAssetsProductionNoDTO.getProductionType().equals(STATEMENT.getCode())) { //意见书
             productionNoList = assetsEvaluationTargetMapper.getStatementNoList(takeAssetsProductionNoDTO.getBusinessId());
-        } else { //报告
+        } else { //报告(取报告号之前可能已经去过预评子号流程分叉,所以如果预评号不为空要判断一下)
             productionNoList = assetsEvaluationTargetMapper.getReportNoList(takeAssetsProductionNoDTO.getBusinessId(), takeAssetsProductionNoDTO.getAllTargetIdList());
         }
         //判断该资产业务订单是否有取过号