潘钊 / control_service_data_Interface · Commits

Commit 8ed700ee6f8145e7c2809bc988b8955a603aaa67

Authored by 王通
1 parent 97570205
build: skipped

1.司售通接口填充zdsjActualTime字段数据(以zdsjT填充)

Inline Side-by-side
Showing 2 changed files with 28 additions and 18 deletions
src/main/java/com/bsth/server_rs/schedule/real/ScheduleRealService.java
  View file @8ed700e
... ... @@ -240,6 +240,11 @@ public class ScheduleRealService implements InitializingBean {
240 240 List<ScheduleRealInfo> scheduleRealInfos = scheduleRealInfoRepository.findByDateAndCompany(dateTime.toString("yyyy-MM-dd"), company);
241 241 redisService.calcTime(scheduleRealInfos);
242 242 List<ScheduleRealInfoDTO_JK> result = ScheduleRealInfoDTO_JK.getMultiInstance(scheduleRealInfos);
  243 + for (ScheduleRealInfoDTO_JK jk : result) {
  244 + if (jk.getZdsjActualTime() == null) {
  245 + jk.setZdsjActualTime(jk.getZdsjT());
  246 + }
  247 + }
243 248  
244 249 return result;
245 250 }
... ... @@ -252,6 +257,11 @@ public class ScheduleRealService implements InitializingBean {
252 257 List<ScheduleRealInfo> scheduleRealInfos = scheduleRealInfoRepository.findByDateAndCompany(dateTime.toString("yyyy-MM-dd"), company, new Date(timestamp));
253 258 redisService.calcTime(scheduleRealInfos);
254 259 List<ScheduleRealInfoDTO_JK> result = ScheduleRealInfoDTO_JK.getMultiInstance(scheduleRealInfos);
  260 + for (ScheduleRealInfoDTO_JK jk : result) {
  261 + if (jk.getZdsjActualTime() == null) {
  262 + jk.setZdsjActualTime(jk.getZdsjT());
  263 + }
  264 + }
255 265  
256 266 return result;
257 267 }
... ...
src/main/resources/application.properties
  View file @8ed700e
1   -spring.profiles: dev,prod
2   -spring.profiles.active: prod
3   -
4   -spring.view.suffix=.html
5   -server.session-timeout=-1
6   -security.basic.enabled=false
7   -
8   -# \u4E0A\u4F20\u6587\u4EF6\u5927\u5C0F\u9650\u5236\u914D\u7F6E
9   -# File size limit
10   -multipart.maxFileSize = -1
11   -# Total request size for a multipart/form-data
12   -multipart.maxRequestSize = -1
13   -
14   -server.compression.enabled=true
15   -server.compression.mime-types=application/json,application/xml,text/html,text/xml,text/plain,text/javascript,text/css,application/javascript
16   -
17   -#redis
18   -cache.days=15
  1 +spring.profiles: dev,prod
  2 +spring.profiles.active: cloud
  3 +
  4 +spring.view.suffix=.html
  5 +server.session-timeout=-1
  6 +security.basic.enabled=false
  7 +
  8 +# \u4E0A\u4F20\u6587\u4EF6\u5927\u5C0F\u9650\u5236\u914D\u7F6E
  9 +# File size limit
  10 +multipart.maxFileSize = -1
  11 +# Total request size for a multipart/form-data
  12 +multipart.maxRequestSize = -1
  13 +
  14 +server.compression.enabled=true
  15 +server.compression.mime-types=application/json,application/xml,text/html,text/xml,text/plain,text/javascript,text/css,application/javascript
  16 +
  17 +#redis
  18 +cache.days=15
... ...