1.新增获取当天排班中变更过的排班数据接口

王通
1 parent 09252746
Showing 2 changed files with 4 additions and 2 deletions
src/main/java/com/bsth/redis/ScheduleRedisService.java
src/main/java/com/bsth/server_rs/schedule/real/ScheduleRealService.java
@@ -287,7 +287,7 @@ public class ScheduleRedisService implements CommandLineRunner {
     private static DateTimeFormatter fmtyyyyMMddHHmm = DateTimeFormat.forPattern("yyyy-MM-ddHH:mm"),
             fmtHHmm = DateTimeFormat.forPattern("HH:mm");
  
-    private void calcTime(List<ScheduleRealInfo> list) {
+    public void calcTime(List<ScheduleRealInfo> list) {
         if (list.size() == 0)
             return;
  
@@ -212,7 +212,9 @@ public class ScheduleRealService {
     public List<ScheduleRealInfoDTO_JK> sch_jk4modify(@PathParam("company") String company, @PathParam("rq") String rq, @PathParam("timestamp") long timestamp) {
         DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyyMMdd");
         DateTime dateTime = fmt.parseDateTime(rq);
-        List<ScheduleRealInfoDTO_JK> result = ScheduleRealInfoDTO_JK.getMultiInstance(scheduleRealInfoRepository.findByDateAndCompany(dateTime.toString("yyyy-MM-dd"), company, new Date(timestamp)));
+        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);
  
         return result;
     }