update...

潘钊
1 parent 4ea8f722
Showing 1 changed file with 24 additions and 15 deletions
src/main/java/com/bsth/server_ws/util/WSDataConver.java
@@ -658,27 +658,36 @@ public class WSDataConver {
                 yhList = oilMultimap.get(rq2);
                 jhList = planMultimap.get(rq);
  
-                if(pbList == null || pbList.size() == 0)
+                /*if(jhList == null && pbList.size() == 0)
                     lcPb.setType(4);//休息
-                else if(i < currentDay){
-                    lcPb.setType(1);
-                    lcPb.setLckq("");
-                    if(yhList != null && yhList.size() > 0){
-                        lcPb.setLcyh(yhList.get(0).getYh());
+                else */
+                if(i < currentDay){
+                    if(pbList == null || pbList.size() == 0)
+                        lcPb.setType(4);//休息
+                    else{
+                        lcPb.setType(1);
+                        lcPb.setLckq("");
+                        if(yhList != null && yhList.size() > 0){
+                            lcPb.setLcyh(yhList.get(0).getYh());
+                        }
+                        lcPb.setLcyylc(ScheduleCalculator.calcYYLC(pbList));
+                        lcPb.setLcfyylc(ScheduleCalculator.calcKSLC(pbList));
                     }
-                    lcPb.setLcyylc(ScheduleCalculator.calcYYLC(pbList));
-                    lcPb.setLcfyylc(ScheduleCalculator.calcKSLC(pbList));
                 }
                 else if (i == currentDay)
                     lcPb.setType(3);//今天
                 else {
-                    lcPb.setType(2);
-                    outPlan = getOutSch(jhList);
-                    if(null != outPlan){
-                        lcPb.setPbxl(outPlan.getXlName());
-                        lcPb.setPblp(outPlan.getLpName());
-                        lcPb.setPbbd(minusMinute(outPlan.getFcsj(), 15));
-                        lcPb.setPbyc(outPlan.getClZbh());
+                    if(jhList == null || jhList.size() == 0)
+                        lcPb.setType(4);//休息
+                    else{
+                        lcPb.setType(2);
+                        outPlan = getOutSch(jhList);
+                        if(null != outPlan){
+                            lcPb.setPbxl(outPlan.getXlName());
+                            lcPb.setPblp(outPlan.getLpName());
+                            lcPb.setPbbd(minusMinute(outPlan.getFcsj(), 15));
+                            lcPb.setPbyc(outPlan.getClZbh());
+                        }
                     }
                 }