Commit fdd96a3954d55bfb040e8a044431a098cb7fab00

Authored by 王通
1 parent a96c39cd

1.南汇驾驶员考勤 bug修复

src/main/java/com/bsth/server_ws/util/WSDataConver.java
@@ -741,13 +741,13 @@ public class WSDataConver { @@ -741,13 +741,13 @@ public class WSDataConver {
741 SchedulePlanInfo plan = null; 741 SchedulePlanInfo plan = null;
742 ScheduleRealInfo real = null; 742 ScheduleRealInfo real = null;
743 for (SchedulePlanInfo p : tplans) { 743 for (SchedulePlanInfo p : tplans) {
744 - if (line.equals(p.getXlBm())) { 744 + if (line.equals(p.getXlBm() + "_" + p.getLpName())) {
745 plan = p; 745 plan = p;
746 break; 746 break;
747 } 747 }
748 } 748 }
749 for (ScheduleRealInfo r : treals) { 749 for (ScheduleRealInfo r : treals) {
750 - if (line.equals(r.getXlBm())) { 750 + if (line.equals(r.getXlBm() + "_" + r.getLpName())) {
751 real = r; 751 real = r;
752 break; 752 break;
753 } 753 }