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

王通
1 parent 97570205
Showing 2 changed files with 28 additions and 18 deletions
src/main/java/com/bsth/server_rs/schedule/real/ScheduleRealService.java
src/main/resources/application.properties
@@ -240,6 +240,11 @@ public class ScheduleRealService implements InitializingBean {
         List<ScheduleRealInfo> scheduleRealInfos = scheduleRealInfoRepository.findByDateAndCompany(dateTime.toString("yyyy-MM-dd"), company);
         redisService.calcTime(scheduleRealInfos);
         List<ScheduleRealInfoDTO_JK> result = ScheduleRealInfoDTO_JK.getMultiInstance(scheduleRealInfos);
+        for (ScheduleRealInfoDTO_JK jk : result) {
+            if (jk.getZdsjActualTime() == null) {
+                jk.setZdsjActualTime(jk.getZdsjT());
+            }
+        }
         return result;
     }
@@ -252,6 +257,11 @@ public class ScheduleRealService implements InitializingBean {
         List<ScheduleRealInfo> scheduleRealInfos = scheduleRealInfoRepository.findByDateAndCompany(dateTime.toString("yyyy-MM-dd"), company, new Date(timestamp));
         redisService.calcTime(scheduleRealInfos);
         List<ScheduleRealInfoDTO_JK> result = ScheduleRealInfoDTO_JK.getMultiInstance(scheduleRealInfos);
+        for (ScheduleRealInfoDTO_JK jk : result) {
+            if (jk.getZdsjActualTime() == null) {
+                jk.setZdsjActualTime(jk.getZdsjT());
+            }
+        }
         return result;
     }
-spring.profiles: dev,prod
-spring.profiles.active: prod
-
-spring.view.suffix=.html
-server.session-timeout=-1
-security.basic.enabled=false
-
-# \u4E0A\u4F20\u6587\u4EF6\u5927\u5C0F\u9650\u5236\u914D\u7F6E
-# File size limit
-multipart.maxFileSize = -1
-# Total request size for a multipart/form-data
-multipart.maxRequestSize = -1
-
-server.compression.enabled=true
-server.compression.mime-types=application/json,application/xml,text/html,text/xml,text/plain,text/javascript,text/css,application/javascript
-
-#redis
-cache.days=15
+spring.profiles: dev,prod
+spring.profiles.active: cloud
+
+spring.view.suffix=.html
+server.session-timeout=-1
+security.basic.enabled=false
+
+# \u4E0A\u4F20\u6587\u4EF6\u5927\u5C0F\u9650\u5236\u914D\u7F6E
+# File size limit
+multipart.maxFileSize = -1
+# Total request size for a multipart/form-data
+multipart.maxRequestSize = -1
+
+server.compression.enabled=true
+server.compression.mime-types=application/json,application/xml,text/html,text/xml,text/plain,text/javascript,text/css,application/javascript
+
+#redis
+cache.days=15