update...

潘钊
1 parent 1c476e0b
Showing 1 changed file with 5 additions and 3 deletions
src/main/java/com/bsth/server_ws/util/WSDataConver.java
@@ -651,6 +651,8 @@ public class WSDataConver {
             int currentDay = cal.get(Calendar.DAY_OF_MONTH);
             for(int i = 1; i <= maxDate; i++){
                 lcPb = new LsLcPb();
+                lcPb.setDay(i);
+
                 rq = fdate + "-" + (i < 10?"0":"") + i;
                 rq2 = rq.replaceAll("-", "");
  
@@ -658,9 +660,6 @@ public class WSDataConver {
                 yhList = oilMultimap.get(rq2);
                 jhList = planMultimap.get(rq2);
  
-                /*if(jhList == null && pbList.size() == 0)
-                    lcPb.setType(4);//休息
-                else */
                 if(i < currentDay){
                     if(pbList == null || pbList.size() == 0)
                         lcPb.setType(4);//休息
@@ -688,6 +687,8 @@ public class WSDataConver {
                             lcPb.setPbbd(minusMinute(outPlan.getFcsj(), 15));
                             lcPb.setPbyc(outPlan.getClZbh());
                         }
+                        else
+                            lcPb.setType(4);//休息
                     }
                 }
  
@@ -717,6 +718,7 @@ public class WSDataConver {
                         sb.append("," + lcPb.getPbyc());
                         break;
                 }
+                sb.append("," + lcPb.getDay());
                 array[i] = sb.toString();
             }
         } catch (NoSuchFieldException e) {