瀏覽代碼

报表bug 修复

傅行帆 3 年之前
父節點
當前提交
b5edf3f2a9

+ 1320
- 1320
src/main/java/com/yunzhi/marketing/service/impl/TaBuildingServiceImpl.java
文件差異過大導致無法顯示
查看文件


+ 3
- 3
src/main/resources/application-dev.yml 查看文件

@@ -4,9 +4,9 @@ spring:
4 4
   application:
5 5
     name: marketing-cloud
6 6
   datasource:
7
-    username: marketing-cloud
8
-    password: uVV0kEQLFGqx4#mV
9
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/marketing-cloud?useUnicode=true&serverTimezone=Asia/Shanghai&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
7
+    url: jdbc:mysql://rm-bp1l472751a2k9569wo.mysql.rds.aliyuncs.com:3306/market?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
8
+    username: lcyg
9
+    password: lcyg@123
10 10
     driver-class-name: com.mysql.cj.jdbc.Driver
11 11
     initial-size: 10 # 初始化连接数
12 12
     max-active: 20 # 最大连接数

+ 1
- 1
src/main/resources/mapper/statistic/TsPersonFromStatisticMapper.xml 查看文件

@@ -91,7 +91,7 @@
91 91
         sum( tp.from_num ) AS from_num,
92 92
         sum( tp.registered_num ) AS registered_num,
93 93
         DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) AS create_time,
94
-        tp.scene_type
94
+        tp.scene_typ
95 95
         FROM
96 96
         ts_person_from_statistic tp
97 97
         WHERE