潘钊 / control_service_data_Interface · Commits

Commit 1c476e0b8b6ad82c9158d4d5c3ae26287282cb6f

Authored by 潘钊
1 parent d6693ff1

update...

Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
src/main/java/com/bsth/server_ws/util/WSDataConver.java
  View file @1c476e0
@@ -630,7 +630,7 @@ public class WSDataConver { @@ -630,7 +630,7 @@ public class WSDataConver {
630 new ConvertUtil().groupMultiList(oilList, "_", OilInfo.class.getDeclaredField("rq")); 630 new ConvertUtil().groupMultiList(oilList, "_", OilInfo.class.getDeclaredField("rq"));
631 631
632 ArrayListMultimap<String, SchedulePlanInfo> planMultimap = 632 ArrayListMultimap<String, SchedulePlanInfo> planMultimap =
633 - new ConvertUtil().groupMultiList(planList, "_", ScheduleRealInfo.class.getDeclaredField("scheduleDateStr")); 633 + new ConvertUtil().groupMultiList(planList, "_", SchedulePlanInfo.class.getDeclaredField("scheduleDate"));
634 634
635 635
636 //月份有多少天 636 //月份有多少天
@@ -656,7 +656,7 @@ public class WSDataConver { @@ -656,7 +656,7 @@ public class WSDataConver {
656 656
657 pbList = schMultimap.get(rq); 657 pbList = schMultimap.get(rq);
658 yhList = oilMultimap.get(rq2); 658 yhList = oilMultimap.get(rq2);
659 - jhList = planMultimap.get(rq); 659 + jhList = planMultimap.get(rq2);
660 660
661 /*if(jhList == null && pbList.size() == 0) 661 /*if(jhList == null && pbList.size() == 0)
662 lcPb.setType(4);//休息 662 lcPb.setType(4);//休息