Преглед изворни кода

1.资产-我的订单-产品收款联表查询条件修改

GouGengquan пре 5 месеци
родитељ
комит
3e9281e2b4
1 измењених фајлова са 1 додато и 1 уклоњено
  1. 1 1
      dao/src/main/resources/mapper/AssetsMapper.xml

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

@@ -269,9 +269,9 @@
         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.order_fund_id = fund.id AND pFund.production_no = nodeInfo.business_min_id
         # 2025年1月1日之前下的订单都是老OA系统订单,查询方式不一样
         LEFT JOIN(SELECT business_id, production_no,repertory_state,production_type,delivery,assets_name FROM assets_production) AS reportInfo ON IF(assets.created < '2025-01-01', reportInfo.business_id = assets.id AND reportInfo.production_type != 'STATEMENT',reportInfo.production_no = nodeInfo.business_min_id)
+        LEFT JOIN production_fund AS pFund ON pFund.order_fund_id = fund.id AND pFund.production_no = reportInfo.production_no
         WHERE assets.deleted = 0
         AND assets.client_manager_id = #{assetsSelectDTO.clientManagerId}
         #送达状态查询