张延森 5 years ago
parent
commit
8da5dd582c

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TsConsultantKpiController.java View File

143
             }
143
             }
144
 
144
 
145
             startTime = DateUtils.day2LocalDateime(startDate.substring(0,4) + "-" + startDate.substring(4, 6) + "-" + startDate.substring(6, 8));
145
             startTime = DateUtils.day2LocalDateime(startDate.substring(0,4) + "-" + startDate.substring(4, 6) + "-" + startDate.substring(6, 8));
146
-            endTime = DateUtils.day2LocalDateime(endDate.substring(0,4) + "-" + endDate.substring(4, 6) + "-" + endDate.substring(6, 8));
146
+            endTime = DateUtils.dayToLocalDateime(endDate.substring(0,4) + "-" + endDate.substring(4, 6) + "-" + endDate.substring(6, 8) + " 23:59:59");
147
         }
147
         }
148
 
148
 
149
         return new LocalDateTime[]{startTime, endTime};
149
         return new LocalDateTime[]{startTime, endTime};

+ 1
- 1
src/main/resources/application-blue.yml View File

6
   datasource:
6
   datasource:
7
     username: root
7
     username: root
8
     password: LUfZGvh7j1^qA*2c
8
     password: LUfZGvh7j1^qA*2c
9
-    url: jdbc:mysql://123.57.65.31:3306/estateagents_20200417?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
9
+    url: jdbc:mysql://123.57.65.31:3306/estateagents_test?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
10
     driver-class-name: com.mysql.cj.jdbc.Driver
10
     driver-class-name: com.mysql.cj.jdbc.Driver
11
     initial-size: 10 # 初始化连接数
11
     initial-size: 10 # 初始化连接数
12
     max-active: 20 # 最大连接数
12
     max-active: 20 # 最大连接数