行车路单同发车时间修改排序

廖磊
1 parent abb9a320
Showing 1 changed file with 17 additions and 1 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
@@ -2164,6 +2164,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
  
         for (int i = 0; i < list.size(); i++) {
             ScheduleRealInfo s=list.get(i);
+            if(s.getBcType().equals("out")){
+            	s.setRemark("1");
+            }else if(s.getBcType().equals("in")){
+            	s.setRemark("3");
+            }else{
+            	s.setRemark("2");
+            }
             String[] fcsj= s.getFcsj().split(":");
             Long fcsjL=Long.parseLong(fcsj[0])*60+Long.parseLong(fcsj[1]);
  
@@ -2190,7 +2197,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             }
             s.setFcsjT(fscjT);
         }
-        Collections.sort(list, new ComparableReal());
+        Collections.sort(list, new compareFcsjType());
         for (int i = 0; i < list.size(); i++) {
             ScheduleRealInfo s = list.get(i);
             s.setAdjustExps(i + 1 + "");
@@ -5245,3 +5252,12 @@ class AccountXlbm implements Comparator&lt;Map&lt;String, Object&gt;&gt;{
 					o2.get("xlNamePy").toString());
 		}
 }
+
+class compareFcsjType implements Comparator<ScheduleRealInfo>{
+	@Override
+	public int compare(ScheduleRealInfo o1, ScheduleRealInfo o2) {
+		// TODO Auto-generated method stub
+		return (o1.getFcsjT()+o1.getRemark()).compareTo(o2.getFcsjT()+o2.getRemark());
+	}
+
+}