潘钊 / control_service_data_Interface · Commits

Commit a96c39cd800f962dd50e8efb252feb70748b9572

Authored by 王通
1 parent 3ef833c6

1.南汇驾驶员考勤 变更

Inline Side-by-side
Showing 1 changed file with 18 additions and 16 deletions
src/main/java/com/bsth/server_ws/util/WSDataConver.java
  View file @a96c39c
... ... @@ -727,28 +727,28 @@ public class WSDataConver {
727 727 //List<String> ghArray = new ArrayList<>(types.keySet());
728 728 List<Jsy_attendance> rs = new ArrayList<Jsy_attendance>();
729 729 for (String jGh : jsySet) {
730   - List<SchedulePlanInfo> _plans = searchByJsy(plans, jGh);
731   - List<ScheduleRealInfo> _reals = searchRealByJsy(reals, jGh);
732   - Set<String> _lines = new HashSet<String>();
733   - for (SchedulePlanInfo _plan : _plans) {
734   - _lines.add(_plan.getXlBm());
  730 + List<SchedulePlanInfo> tplans = searchByJsy(plans, jGh);
  731 + List<ScheduleRealInfo> treals = searchRealByJsy(reals, jGh);
  732 + Set<String> lines = new HashSet<String>();
  733 + for (SchedulePlanInfo p : tplans) {
  734 + lines.add(p.getXlBm() + "_" + p.getLpName());
735 735 }
736   - for (ScheduleRealInfo _real : _reals) {
737   - _lines.add(_real.getXlBm());
  736 + for (ScheduleRealInfo r : treals) {
  737 + lines.add(r.getXlBm() + "_" + r.getLpName());
738 738 }
739   - for (String _line : _lines) {
  739 + for (String line : lines) {
740 740 Jsy_attendance attendance = new Jsy_attendance();
741 741 SchedulePlanInfo plan = null;
742 742 ScheduleRealInfo real = null;
743   - for (SchedulePlanInfo _plan : _plans) {
744   - if (_line.equals(_plan.getXlBm())) {
745   - plan = _plan;
  743 + for (SchedulePlanInfo p : tplans) {
  744 + if (line.equals(p.getXlBm())) {
  745 + plan = p;
746 746 break;
747 747 }
748 748 }
749   - for (ScheduleRealInfo _real : _reals) {
750   - if (_line.equals(_real.getXlBm())) {
751   - real = _real;
  749 + for (ScheduleRealInfo r : treals) {
  750 + if (line.equals(r.getXlBm())) {
  751 + real = r;
752 752 break;
753 753 }
754 754 }
... ... @@ -797,8 +797,9 @@ public class WSDataConver {
797 797 public static List<SchedulePlanInfo> searchByJsy(List<SchedulePlanInfo> plans, String jGh){
798 798 List<SchedulePlanInfo> rs = new ArrayList<SchedulePlanInfo>();
799 799 String oldLineId = "0";
  800 + String oldLp = "0";
800 801 for(SchedulePlanInfo plan : plans){
801   - if (plan.getjGh().equals(jGh) && !oldLineId.equals(plan.getXlBm())) {
  802 + if (plan.getjGh().equals(jGh) && (!oldLineId.equals(plan.getXlBm()) || !oldLp.equals(plan.getLpName()))) {
802 803 rs.add(plan);
803 804 oldLineId = plan.getXlBm();
804 805 }
... ... @@ -810,8 +811,9 @@ public class WSDataConver {
810 811 public static List<ScheduleRealInfo> searchRealByJsy(List<ScheduleRealInfo> reals, String jGh){
811 812 List<ScheduleRealInfo> rs = new ArrayList<ScheduleRealInfo>();
812 813 String oldLineId = "0";
  814 + String oldLp = "0";
813 815 for(ScheduleRealInfo sch : reals){
814   - if (sch.getjGh().equals(jGh) && !oldLineId.equals(sch.getXlBm())) {
  816 + if (sch.getjGh().equals(jGh) && (!oldLineId.equals(sch.getXlBm()) || !oldLp.equals(sch.getLpName()))) {
815 817 rs.add(sch);
816 818 oldLineId = sch.getXlBm();
817 819 }
... ...