Procházet zdrojové kódy

垫款,优化充值记录导出功能

zhaoxian před 2 roky
rodič
revize
6e26cdb2a1

+ 5 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/finance/payment/controller/FinancePaymentRechargeApplicationController.java

@@ -247,7 +247,11 @@ public class FinancePaymentRechargeApplicationController {
                     String amends = data.getString("amends");
                     temp.add("1".equals(amends) ? "是" : "否");
                     temp.add(data.getString("productName"));
-                    temp.add(data.getString("projectName") + "(" + data.getString("projectId") + ")");
+                    if (Check.isNull(data.getString("projectName"))) {
+                        temp.add("-");
+                    } else {
+                        temp.add(data.getString("projectName") + "(" + data.getString("projectId") + ")");
+                    }
                     temp.add(data.getString("accountId"));
                     temp.add(data.getString("accountName"));
                     temp.add(data.getString("cashAmounts"));

+ 3 - 2
jeecg-boot-module-system/src/main/java/cn/com/ctop/finance/payment/mapper/xml/FinancePaymentRechargeApplicationMapper.xml

@@ -118,8 +118,8 @@
         t1.advertiser_name as 'advertiserName',
         t2.product_id as 'productId',
         t2.product_name as 'productName',
-        t1.project_id as 'projectId',
-        t1.project_name as 'projectName',
+        IFNULL(t2.project_id,'-') AS 'projectId',
+        IFNULL(t5.project_name,'-') AS 'projectName',
         t2.account_id as 'accountId',
         t2.account_name as 'accountName',
         t2.cash_amount as 'cashAmounts',
@@ -143,6 +143,7 @@
         LEFT JOIN finance_payment_recharge_account t2 ON t1.id = t2.recharge_id
         LEFT JOIN ctop_oauth_token t3 ON t2.account_id = t3.account_id
         LEFT JOIN ctop_oauth_config t4 ON t3.app_id = t4.app_id
+        LEFT JOIN ctop_project t5 ON t2.project_id = t5.id
         <where>
             <if test="advertiserName != null and advertiserName != '' ">
                 and t1.advertiser_name like concat('%',#{advertiserName},'%')