行车路单排序

廖磊
1 parent 3e76e1e5
Showing 3 changed files with 53 additions and 1 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/util/ComparableReal.java
src/main/resources/application-dev.properties
@@ -1784,6 +1784,41 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         List<ScheduleRealInfo> listSchedule = new ArrayList<ScheduleRealInfo>();
         List<ScheduleRealInfo> list = null;
         list = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName, date, line);
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        String sqlMinYysj="select start_opt from bsth_c_line_config where line = '"+BasicData.lineId2CodeMap.inverse().get(line) +"'";
+		String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+		String[] minSjs = minfcsj.split(":");
+		Long minSj=Long.parseLong(minSjs[0])*60+Long.parseLong(minSjs[1]);
+		
+        for (int i = 0; i < list.size(); i++) {
+			ScheduleRealInfo s=list.get(i);
+			String[] fcsj= s.getFcsj().split(":");
+			Long fcsjL=Long.parseLong(fcsj[0])*60+Long.parseLong(fcsj[1]);
+			
+			Long fscjT=0L;
+			if(fcsjL<minSj){
+				Calendar   calendar   =   new   GregorianCalendar(); 
+				calendar.setTime(s.getScheduleDate());
+				calendar.add(calendar.DATE,1);
+				s.setScheduleDate(calendar.getTime());
+				try {
+					fscjT = sdf.parse(sdf.format(s.getScheduleDate())+" "+s.getFcsj()).getTime();
+				} catch (ParseException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+				
+			}else{
+				try {
+					fscjT =sdf.parse(s.getScheduleDateStr()+" "+s.getFcsj()).getTime();
+				} catch (ParseException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				};
+			}
+			s.setFcsjT(fscjT);
+		}
+        Collections.sort(list, new ComparableReal());
         for (int i = 0; i < list.size(); i++) {
             ScheduleRealInfo s = list.get(i);
             s.setAdjustExps(i + 1 + "");
+package com.bsth.util;
+
+import java.util.Comparator;
+import java.util.List;
+
+import com.bsth.entity.realcontrol.ChildTaskPlan;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+
+public class ComparableReal implements Comparator<ScheduleRealInfo>{
+
+	@Override
+	public int compare(ScheduleRealInfo o1, ScheduleRealInfo o2) {
+		// TODO Auto-generated method stub
+		return o1.getFcsjT().compareTo(o2.getFcsjT());
+	}
+
+}
@@ -10,7 +10,7 @@ spring.jpa.show-sql= true
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
 spring.datasource.url= jdbc:mysql://127.0.0.1/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
-spring.datasource.password= root
+spring.datasource.password=
 #spring.datasource.url= jdbc:mysql://192.168.168.117/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 #spring.datasource.username= root
 #spring.datasource.password= root