Browse Source

1.修复资产评估人员在未出具报告申请了绩效申报,市场人员在出具报告后发起绩效申报导致认领实收款显示评估人员未通过的BUG

GouGengquan 11 tháng trước cách đây
mục cha
commit
dcc953cc25
1 tập tin đã thay đổi với 1 bổ sung1 xóa
  1. 1 1
      dao/src/main/resources/mapper/AssetsProductionMapper.xml

+ 1 - 1
dao/src/main/resources/mapper/AssetsProductionMapper.xml

@@ -235,7 +235,7 @@
         FROM commission_declare AS `declare`
         WHERE `declare`.business_type = 'COMMISSION_DECLARE_ASSET_EVALUATE'
         AND deleted = 0
-        ) AS eDeclare ON eDeclare.business_id = assets.id AND eDeclare.production_id = production.id
+        ) AS eDeclare ON IF(eDeclare.production_id IS NULL,eDeclare.business_id = assets.id,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`