update...

潘钊
1 parent b0228682
Showing 1 changed file with 16 additions and 10 deletions
src/main/java/com/bsth/server_ws/util/WSDataConver.java
@@ -619,7 +619,7 @@ public class WSDataConver {
      * @param oilList
      * @return
      */
-    public static String[] to_getLSLC_PB(String fdate, List<ScheduleRealInfo> schList, List<OilInfo> oilList) {
+    public static String[] to_getLSLC_PB(String fdate, List<ScheduleRealInfo> schList, List<OilInfo> oilList, List<SchedulePlanInfo> planList) {
         String[] array = new String[0];
         try {
             //按日期分组数据
@@ -629,6 +629,10 @@ public class WSDataConver {
             ArrayListMultimap<String, OilInfo> oilMultimap =
                     new ConvertUtil().groupMultiList(oilList, "_", OilInfo.class.getDeclaredField("rq"));
  
+            ArrayListMultimap<String, SchedulePlanInfo> planMultimap =
+                    new ConvertUtil().groupMultiList(planList, "_", ScheduleRealInfo.class.getDeclaredField("scheduleDateStr"));
+
+
             //月份有多少天
             int year = Integer.parseInt(fdate.substring(0, 4));
             int month = Integer.parseInt(fdate.substring(5, 7));
@@ -640,9 +644,10 @@ public class WSDataConver {
             List<LsLcPb> rs = new ArrayList<>();
             LsLcPb lcPb;
             List<ScheduleRealInfo> pbList;
+            List<SchedulePlanInfo> jhList;
             List<OilInfo> yhList;
             String rq,rq2;
-            ScheduleRealInfo outSch;
+            SchedulePlanInfo outPlan;
             int currentDay = cal.get(Calendar.DAY_OF_MONTH);
             for(int i = 1; i <= maxDate; i++){
                 lcPb = new LsLcPb();
@@ -651,6 +656,7 @@ public class WSDataConver {
  
                 pbList = schMultimap.get(rq);
                 yhList = oilMultimap.get(rq2);
+                jhList = planMultimap.get(rq);
  
                 if(pbList == null || pbList.size() == 0)
                     lcPb.setType(4);//休息
@@ -667,12 +673,12 @@ public class WSDataConver {
                     lcPb.setType(3);//今天
                 else {
                     lcPb.setType(2);
-                    outSch = getOutSch(pbList);
-                    if(null != outSch){
-                        lcPb.setPbxl(outSch.getXlName());
-                        lcPb.setPblp(outSch.getLpName());
-                        lcPb.setPbbd(minusMinute(outSch.getDfsj(), 15));
-                        lcPb.setPbyc(outSch.getClZbh());
+                    outPlan = getOutSch(jhList);
+                    if(null != outPlan){
+                        lcPb.setPbxl(outPlan.getXlName());
+                        lcPb.setPblp(outPlan.getLpName());
+                        lcPb.setPbbd(minusMinute(outPlan.getFcsj(), 15));
+                        lcPb.setPbyc(outPlan.getClZbh());
                     }
                 }
  
@@ -728,9 +734,9 @@ public class WSDataConver {
         return null;
     }
  
-    private static ScheduleRealInfo getOutSch(List<ScheduleRealInfo> pbList) {
+    private static SchedulePlanInfo getOutSch(List<SchedulePlanInfo> pbList) {
  
-        for(ScheduleRealInfo sch : pbList){
+        for(SchedulePlanInfo sch : pbList){
             if(sch.getBcType().equals("out"))
                 return sch;
         }