Преглед на файлове

Merge branch 'zzy' into test

zhouzeyu@c-top.com.cn преди 3 години
родител
ревизия
3a1e2dd97c
променени са 1 файла, в които са добавени 13 реда и са изтрити 13 реда
  1. 13 13
      jeecg-boot-module-system/src/main/java/org/jeecg/common/constant/AccountReportConstants.java

+ 13 - 13
jeecg-boot-module-system/src/main/java/org/jeecg/common/constant/AccountReportConstants.java

@@ -580,7 +580,7 @@ public class AccountReportConstants {
             "    \"comment\": \"项目名称\"\n" +
             "  },\n" +
             "  \"cost\": {\n" +
-            "    \"filed\": \"IFNULL(sum(t1.charge),0) as cost \",\n" +
+            "    \"filed\": \"IFNULL(ROUND(sum(t1.charge),2),0) as cost \",\n" +
             "    \"comment\": \"消耗\"\n" +
             "  },\n" +
             "  \"photoShow\": {\n" +
@@ -624,7 +624,7 @@ public class AccountReportConstants {
             "    \"comment\": \"安卓开始下载数\"\n" +
             "  },\n" +
             "  \"downloadStartCost\": {\n" +
-            "    \"filed\": \"CASE WHEN sum(t1.charge) / (t1.download_started) IS NULL THEN 0 ELSE sum(t1.charge) / sum(t1.download_started) end AS downloadStartCost \",\n" +
+            "    \"filed\": \"CASE WHEN sum(t1.charge) / (t1.download_started) IS NULL THEN 0 ELSE ROUND(sum(t1.charge) / sum(t1.download_started),2) end AS downloadStartCost \",\n" +
             "    \"comment\": \"安卓开始下载单价\"\n" +
             "  },\n" +
             "  \"downloadStartRate\": {\n" +
@@ -636,7 +636,7 @@ public class AccountReportConstants {
             "    \"comment\": \"安卓下载完成数\"\n" +
             "  },\n" +
             "  \"downloadFinishCost\": {\n" +
-            "    \"filed\": \"CASE WHEN sum(t1.charge) / sum(t1.download_completed) IS NULL THEN 0 ELSE  sum(t1.charge) / sum(t1.download_completed) end AS downloadFinishCost \",\n" +
+            "    \"filed\": \"CASE WHEN sum(t1.charge) / sum(t1.download_completed) IS NULL THEN 0 ELSE  ROUND(sum(t1.charge) / sum(t1.download_completed),2) end AS downloadFinishCost \",\n" +
             "    \"comment\": \"安卓下载完成单价\"\n" +
             "  },\n" +
             "  \"downloadFinishRate\": {\n" +
@@ -648,7 +648,7 @@ public class AccountReportConstants {
             "    \"comment\": \"激活数\"\n" +
             "  },\n" +
             "  \"activeCost\": {\n" +
-            "    \"filed\": \"CASE WHEN sum(t1.charge) / sum(t1.activation) IS NULL THEN 0 ELSE sum(t1.charge) / sum(t1.activation) end AS activeCost \",\n" +
+            "    \"filed\": \"CASE WHEN sum(t1.charge) / sum(t1.activation) IS NULL THEN 0 ELSE ROUND(sum(t1.charge) / sum(t1.activation),2) end AS activeCost \",\n" +
             "    \"comment\": \"激活单价\"\n" +
             "  },\n" +
             "  \"firstDayPay\": {\n" +
@@ -656,15 +656,15 @@ public class AccountReportConstants {
             "    \"comment\": \"首日付费次数\"\n" +
             "  },\n" +
             "  \"firstDayPayAmount\": {\n" +
-            "    \"filed\": \"IFNULL(sum(t1.event_pay_purchase_amount_first_day),0) as firstDayPayAmount  \",\n" +
+            "    \"filed\": \"IFNULL(ROUND(sum(t1.event_pay_purchase_amount_first_day),2),0) as firstDayPayAmount  \",\n" +
             "    \"comment\": \"首日付费金额\"\n" +
             "  },\n" +
             "  \"firstDayPayCost\": {\n" +
-            "    \"filed\": \"CASE WHEN sum(t1.charge) / sum(t1.event_pay_first_day) IS NULL THEN 0 ELSE sum(t1.charge) / sum(t1.event_pay_first_day) end AS firstDayPayCost \",\n" +
+            "    \"filed\": \"CASE WHEN sum(t1.charge) / sum(t1.event_pay_first_day) IS NULL THEN 0 ELSE ROUND(sum(t1.charge) / sum(t1.event_pay_first_day),2) end AS firstDayPayCost \",\n" +
             "    \"comment\": \"首日付费成本\"\n" +
             "  },\n" +
             "  \"firstDayPayROI\": {\n" +
-            "    \"filed\": \"CASE WHEN sum(t1.event_pay_purchase_amount_first_day) / sum(t1.charge) IS NULL THEN 0 ELSE sum(t1.event_pay_purchase_amount_first_day) / sum(t1.charge) end AS firstDayPayROI \",\n" +
+            "    \"filed\": \"CASE WHEN sum(t1.event_pay_purchase_amount_first_day) / sum(t1.charge) IS NULL THEN 0 ELSE ROUND(sum(t1.event_pay_purchase_amount_first_day) / sum(t1.charge),2) end AS firstDayPayROI \",\n" +
             "    \"comment\": \"首日ROI\"\n" +
             "  },\n" +
             "  \"eventPay\": {\n" +
@@ -672,15 +672,15 @@ public class AccountReportConstants {
             "    \"comment\": \"付费次数\"\n" +
             "  },\n" +
             "  \"eventPayPurchaseAmount\": {\n" +
-            "    \"filed\": \"IFNULL(sum(t1.event_pay_purchase_amount),0) as eventPayPurchaseAmount  \",\n" +
+            "    \"filed\": \"IFNULL(ROUND(sum(t1.event_pay_purchase_amount),2),0) as eventPayPurchaseAmount  \",\n" +
             "    \"comment\": \"付费金额\"\n" +
             "  },\n" +
             "  \"eventPayCost\": {\n" +
-            "    \"filed\": \"CASE WHEN sum(t1.charge) / sum(t1.event_pay) IS NULL THEN 0 ELSE sum(t1.charge) / sum(t1.event_pay) end AS eventPayCost \",\n" +
+            "    \"filed\": \"CASE WHEN sum(t1.charge) / sum(t1.event_pay) IS NULL THEN 0 ELSE ROUND(sum(t1.charge) / sum(t1.event_pay),2) end AS eventPayCost \",\n" +
             "    \"comment\": \"付费次数成本\"\n" +
             "  },\n" +
             "  \"ROI\": {\n" +
-            "    \"filed\": \"CASE WHEN sum(t1.event_pay_purchase_amount) / sum(t1.charge) IS NULL THEN 0 ELSE sum(t1.event_pay_purchase_amount) / sum(t1.charge) end AS ROI \",\n" +
+            "    \"filed\": \"CASE WHEN sum(t1.event_pay_purchase_amount) / sum(t1.charge) IS NULL THEN 0 ELSE ROUND(sum(t1.event_pay_purchase_amount) / sum(t1.charge),2) end AS ROI \",\n" +
             "    \"comment\": \"ROI\"\n" +
             "  },\n" +
             "  \"register\": {\n" +
@@ -1174,7 +1174,7 @@ public class AccountReportConstants {
             "    \"comment\": \"安卓开始下载数\"\n" +
             "  },\n" +
             "  \"downloadStartCost\": {\n" +
-            "    \"filed\": \"CASE WHEN sum(t1.cost) / (t1.download_start) IS NULL THEN 0 ELSE sum(t1.cost) / sum(t1.download_start) end AS downloadStartCost \",\n" +
+            "    \"filed\": \"CASE WHEN sum(t1.cost) / (t1.download_start) IS NULL THEN 0 ELSE ROUND(sum(t1.cost) / sum(t1.download_start),2) end AS downloadStartCost \",\n" +
             "    \"comment\": \"安卓开始下载成本\"\n" +
             "  },\n" +
             "  \"downloadStartRate\": {\n" +
@@ -1186,7 +1186,7 @@ public class AccountReportConstants {
             "    \"comment\": \"安卓下载完成数\"\n" +
             "  },\n" +
             "  \"downloadFinishCost\": {\n" +
-            "    \"filed\": \"CASE WHEN sum(t1.cost) / sum(t1.download_finish) IS NULL THEN 0 ELSE  sum(t1.cost) / sum(t1.download_finish) end AS downloadFinishCost \",\n" +
+            "    \"filed\": \"CASE WHEN sum(t1.cost) / sum(t1.download_finish) IS NULL THEN 0 ELSE  ROUND(sum(t1.cost) / sum(t1.download_finish),2) end AS downloadFinishCost \",\n" +
             "    \"comment\": \"安卓下载完成成本\"\n" +
             "  },\n" +
             "  \"downloadFinishRate\": {\n" +
@@ -1198,7 +1198,7 @@ public class AccountReportConstants {
             "    \"comment\": \"激活数\"\n" +
             "  },\n" +
             "  \"activeCost\": {\n" +
-            "    \"filed\": \"CASE WHEN sum(t1.cost) / sum(t1.active) IS NULL THEN 0 ELSE sum(t1.cost) / sum(t1.active) end AS activeCost \",\n" +
+            "    \"filed\": \"CASE WHEN sum(t1.cost) / sum(t1.active) IS NULL THEN 0 ELSE ROUND(sum(t1.cost) / sum(t1.active),2) end AS activeCost \",\n" +
             "    \"comment\": \"激活成本\"\n" +
             "  },\n" +
             "  \"activeRate\": {\n" +