Commit d6693ff1deff8f1da108251979610003c43759fb
1 parent
4ea8f722
update...
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 { | @@ -658,27 +658,36 @@ public class WSDataConver { | ||
| 658 | yhList = oilMultimap.get(rq2); | 658 | yhList = oilMultimap.get(rq2); |
| 659 | jhList = planMultimap.get(rq); | 659 | jhList = planMultimap.get(rq); |
| 660 | 660 | ||
| 661 | - if(pbList == null || pbList.size() == 0) | 661 | + /*if(jhList == null && pbList.size() == 0) |
| 662 | lcPb.setType(4);//休息 | 662 | lcPb.setType(4);//休息 |
| 663 | - else if(i < currentDay){ | ||
| 664 | - lcPb.setType(1); | ||
| 665 | - lcPb.setLckq(""); | ||
| 666 | - if(yhList != null && yhList.size() > 0){ | ||
| 667 | - lcPb.setLcyh(yhList.get(0).getYh()); | 663 | + else */ |
| 664 | + if(i < currentDay){ | ||
| 665 | + if(pbList == null || pbList.size() == 0) | ||
| 666 | + lcPb.setType(4);//休息 | ||
| 667 | + else{ | ||
| 668 | + lcPb.setType(1); | ||
| 669 | + lcPb.setLckq(""); | ||
| 670 | + if(yhList != null && yhList.size() > 0){ | ||
| 671 | + lcPb.setLcyh(yhList.get(0).getYh()); | ||
| 672 | + } | ||
| 673 | + lcPb.setLcyylc(ScheduleCalculator.calcYYLC(pbList)); | ||
| 674 | + lcPb.setLcfyylc(ScheduleCalculator.calcKSLC(pbList)); | ||
| 668 | } | 675 | } |
| 669 | - lcPb.setLcyylc(ScheduleCalculator.calcYYLC(pbList)); | ||
| 670 | - lcPb.setLcfyylc(ScheduleCalculator.calcKSLC(pbList)); | ||
| 671 | } | 676 | } |
| 672 | else if (i == currentDay) | 677 | else if (i == currentDay) |
| 673 | lcPb.setType(3);//今天 | 678 | lcPb.setType(3);//今天 |
| 674 | else { | 679 | else { |
| 675 | - lcPb.setType(2); | ||
| 676 | - outPlan = getOutSch(jhList); | ||
| 677 | - if(null != outPlan){ | ||
| 678 | - lcPb.setPbxl(outPlan.getXlName()); | ||
| 679 | - lcPb.setPblp(outPlan.getLpName()); | ||
| 680 | - lcPb.setPbbd(minusMinute(outPlan.getFcsj(), 15)); | ||
| 681 | - lcPb.setPbyc(outPlan.getClZbh()); | 680 | + if(jhList == null || jhList.size() == 0) |
| 681 | + lcPb.setType(4);//休息 | ||
| 682 | + else{ | ||
| 683 | + lcPb.setType(2); | ||
| 684 | + outPlan = getOutSch(jhList); | ||
| 685 | + if(null != outPlan){ | ||
| 686 | + lcPb.setPbxl(outPlan.getXlName()); | ||
| 687 | + lcPb.setPblp(outPlan.getLpName()); | ||
| 688 | + lcPb.setPbbd(minusMinute(outPlan.getFcsj(), 15)); | ||
| 689 | + lcPb.setPbyc(outPlan.getClZbh()); | ||
| 690 | + } | ||
| 682 | } | 691 | } |
| 683 | } | 692 | } |
| 684 | 693 |