1.南汇驾驶员考勤变更

王通
1 parent 3ef833c6
Showing 1 changed file with 18 additions and 16 deletions
src/main/java/com/bsth/server_ws/util/WSDataConver.java
@@ -727,28 +727,28 @@ public class WSDataConver {
         //List<String> ghArray = new ArrayList<>(types.keySet());
     	List<Jsy_attendance> rs = new ArrayList<Jsy_attendance>();
     	for (String jGh : jsySet) {
-    		List<SchedulePlanInfo> _plans = searchByJsy(plans, jGh);
-    		List<ScheduleRealInfo> _reals = searchRealByJsy(reals, jGh);
-    		Set<String> _lines = new HashSet<String>();
-    		for (SchedulePlanInfo _plan : _plans) {
-    			_lines.add(_plan.getXlBm());
+    		List<SchedulePlanInfo> tplans = searchByJsy(plans, jGh);
+    		List<ScheduleRealInfo> treals = searchRealByJsy(reals, jGh);
+    		Set<String> lines = new HashSet<String>();
+    		for (SchedulePlanInfo p : tplans) {
+    			lines.add(p.getXlBm() + "_" + p.getLpName());
     		}
-    		for (ScheduleRealInfo _real : _reals) {
-    			_lines.add(_real.getXlBm());
+    		for (ScheduleRealInfo r : treals) {
+    			lines.add(r.getXlBm() + "_" + r.getLpName());
     		}
-    		for (String _line : _lines) {
+    		for (String line : lines) {
     			Jsy_attendance attendance = new Jsy_attendance();
     			SchedulePlanInfo plan = null;
     	        ScheduleRealInfo real = null;
-    			for (SchedulePlanInfo _plan : _plans) {
-        			if (_line.equals(_plan.getXlBm())) {
-        				plan = _plan;
+    			for (SchedulePlanInfo p : tplans) {
+        			if (line.equals(p.getXlBm())) {
+        				plan = p;
         				break;
         			}
         		}
-    			for (ScheduleRealInfo _real : _reals) {
-        			if (_line.equals(_real.getXlBm())) {
-        				real = _real;
+    			for (ScheduleRealInfo r : treals) {
+        			if (line.equals(r.getXlBm())) {
+        				real = r;
         				break;
         			}
         		}
@@ -797,8 +797,9 @@ public class WSDataConver {
     public static List<SchedulePlanInfo> searchByJsy(List<SchedulePlanInfo> plans, String jGh){
     	List<SchedulePlanInfo> rs = new ArrayList<SchedulePlanInfo>();
     	String oldLineId = "0";
+    	String oldLp = "0";
         for(SchedulePlanInfo plan : plans){
-            if (plan.getjGh().equals(jGh) && !oldLineId.equals(plan.getXlBm())) {
+            if (plan.getjGh().equals(jGh) && (!oldLineId.equals(plan.getXlBm()) || !oldLp.equals(plan.getLpName()))) {
             	rs.add(plan);
             	oldLineId = plan.getXlBm();
             }
@@ -810,8 +811,9 @@ public class WSDataConver {
     public static List<ScheduleRealInfo> searchRealByJsy(List<ScheduleRealInfo> reals, String jGh){
     	List<ScheduleRealInfo> rs = new ArrayList<ScheduleRealInfo>();
     	String oldLineId = "0";
+    	String oldLp = "0";
         for(ScheduleRealInfo sch : reals){
-            if (sch.getjGh().equals(jGh) && !oldLineId.equals(sch.getXlBm())) {
+            if (sch.getjGh().equals(jGh) && (!oldLineId.equals(sch.getXlBm()) || !oldLp.equals(sch.getLpName()))) {
             	rs.add(sch);
             	oldLineId = sch.getXlBm();
             }