Commit f08331e47ca6602a5b927df7ffcc2fbfd1de8d57
1 parent
f38f15c9
update...
Showing
1 changed file
with
5 additions
and
4 deletions
src/main/java/com/bsth/server_ws/waybill/LD_ServiceSoap.java
| @@ -60,14 +60,15 @@ public class LD_ServiceSoap implements LD_Service, ApplicationContextAware { | @@ -60,14 +60,15 @@ public class LD_ServiceSoap implements LD_Service, ApplicationContextAware { | ||
| 60 | return false; | 60 | return false; |
| 61 | } | 61 | } |
| 62 | //日期减一天，老接口是这样的 | 62 | //日期减一天，老接口是这样的 |
| 63 | - rq = fmtyyyyMMdd.print(fmtyyyyMMdd.parseDateTime(rq).minusDays(1)); | 63 | + //rq = fmtyyyyMMdd.print(fmtyyyyMMdd.parseDateTime(rq).minusDays(1)); |
| 64 | + String prveRq = fmtyyyyMMdd.print(fmtyyyyMMdd.parseDateTime(rq).minusDays(1)); | ||
| 64 | 65 | ||
| 65 | //实际排班 | 66 | //实际排班 |
| 66 | - ArrayListMultimap<String, ScheduleRealInfo> listMap = scheduleRedisService.findByDateAndGroupByNbbm_bingxing(rq, companyId); | 67 | + ArrayListMultimap<String, ScheduleRealInfo> listMap = scheduleRedisService.findByDateAndGroupByNbbm_bingxing(prveRq, companyId); |
| 67 | //油耗信息 | 68 | //油耗信息 |
| 68 | - Map<String, OilInfo> oilInfoMap = oilRedisService.findByNbbmGroup(listMap.keySet(), rq); | 69 | + Map<String, OilInfo> oilInfoMap = oilRedisService.findByNbbmGroup(listMap.keySet(), prveRq); |
| 69 | //当班调派 | 70 | //当班调派 |
| 70 | - long st = fmtyyyyMMddHHmm.parseMillis(rq + "00:00"), et = fmtyyyyMMddHHmm.parseMillis(rq + "23:59"); | 71 | + long st = fmtyyyyMMddHHmm.parseMillis(prveRq + "00:00"), et = fmtyyyyMMddHHmm.parseMillis(prveRq + "23:59"); |
| 71 | List<DutyEmployee> des = dutyEmployeeRepository.findByTime(st, et); | 72 | List<DutyEmployee> des = dutyEmployeeRepository.findByTime(st, et); |
| 72 | //转换成南汇路单需要的格式 | 73 | //转换成南汇路单需要的格式 |
| 73 | NH_waybill[] array = WSDataConver.to_waybill_NH(listMap, oilInfoMap, des); | 74 | NH_waybill[] array = WSDataConver.to_waybill_NH(listMap, oilInfoMap, des); |