Prechádzať zdrojové kódy

结算单列表修改

yangzian 3 rokov pred
rodič
commit
c7ba14d9ac

+ 6 - 6
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/mapper/xml/SettlementFileInfoMapper.xml

@@ -97,13 +97,13 @@
         f.upload_years as uploadYears,
         f.media_id as mediaId,
         f.advertiser_id as advertiserId,
-        ( SELECT ad.NAME FROM ctop_advertiser ad WHERE ad.id = cwjs.advertiser_id LIMIT 1 ) advertiserName,
+        ( SELECT ad.NAME FROM ctop_advertiser ad WHERE ad.id = f.advertiser_id LIMIT 1 ) advertiserName,
         f.product_id as productId,
-        ( SELECT cp.product_name FROM ctop_product cp WHERE cp.id = cwjs.product_id LIMIT 1 ) productName,
-        cwjs.project_id as projectId,
-        ( SELECT project.project_name FROM ctop_project project WHERE project.id = cwjs.project_id LIMIT 1 ) projectName,
-        cwjs.account_id as accountId,
-        cwjs.account_name as accountName,
+        ( SELECT cp.product_name FROM ctop_product cp WHERE cp.id = f.product_id LIMIT 1 ) productName,
+        IFNULL((SELECT u.project_id from ctop_user_allocation u where u.account_id  = f.account_id),cwjs.project_id) as projectId,
+        IFNULL((SELECT u.project_name from ctop_user_allocation u where u.account_id  = f.account_id),(SELECT project.project_name FROM ctop_project project WHERE project.id = cwjs.project_id LIMIT 1 )) as projectName,
+        IFNULL(cwjs.account_id,f.account_id) as accountId,
+        IFNULL((SELECT u.auth_name from ctop_user_allocation u where u.account_id  = f.account_id),cwjs.account_name) as accountName,
         f.del_flag,
         cwjs.create_user_id as saleUserId,
         ( SELECT su.realname FROM sys_user su WHERE su.id = cwjs.create_user_id LIMIT 1 ) saleUserName,