Merge branch 'minhang' of http://222.66.0.204:8090//panzhaov5/bsth_control into minhang

徐烜
2 parents e48fe9a1 6d8c8a5b
Showing 4 changed files with 16 additions and 9 deletions
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/excep/impl/OfflineServiceImpl.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
@@ -133,7 +133,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	//去掉了 xlBm is not null 
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by s.realExecDate,s.dfsj, (s.lpName+1)")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by s.xlDir,s.realExecDate,s.dfsj, (s.lpName+1)")
 	List<ScheduleRealInfo> scheduleByDateAndLine(String line,String date);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
@@ -43,15 +43,16 @@ public class OfflineServiceImpl implements OfflineService {
 		String days_year=map.get("days_year").toString();
 		String line_id=map.get("line_id").toString();
 		String device_id=map.get("device_id").toString();
+		String ts=map.get("ts").toString();
 		String sql="SELECT t.line_id,t.device_id,MIN(ts) as ts,days_year FROM bsth_c_gps_info t "
-				+ "  WHERE t.line_id='"+line_id+"' and t.device_id='"+device_id+"' and t.days_year='"+days_year+"' "
+				+ "  WHERE t.line_id='"+line_id+"' and t.device_id='"+device_id+"' and t.days_year='"+days_year+"' and t.ts>='"+ts+"' "
 				+ "  GROUP BY  t.device_id,t.line_id ";
-		sql +=" order by ts limit ?,?";
+		sql +=" order by ts ";
 		try {
 			conn = DBUtils_MS.getConnection();
 			ps = conn.prepareStatement(sql);
-			ps.setInt(1,0*10); // O-最大条数  -- M-起始条数
-			ps.setInt(2, 100000000); // O-最小条数 -- M-显示条数
+//			ps.setInt(1,0*10); // O-最大条数  -- M-起始条数
+//			ps.setInt(2, 1000000); // O-最小条数 -- M-显示条数
 			rs = ps.executeQuery();
 			list = resultSet(rs);
 		} catch (SQLException e) {
@@ -258,6 +259,7 @@ public class OfflineServiceImpl implements OfflineService {
 			gpsmap.put("device_id",deviceid );
 			gpsmap.put("line_id", lineid);
 			gpsmap.put("days_year", str);
+			gpsmap.put("ts", d1);
 		 List<Offline> gps=findGPS(gpsmap);
 	   if(gps.size()>0){
 		  Long ts= gps.get(0).getTs();
@@ -968,13 +968,13 @@ public class FormsServiceImpl implements FormsService {
 		}
 		String sql="select t.schedule_date_str,"
-				+ " t.cl_zbh,t.j_gh,t.j_name,x.yh from (select  r.schedule_date_str,r.xl_bm,r.xl_name,"
+				+ " t.cl_zbh,t.j_gh,t.j_name,x.yh from (select  r.schedule_date_str,r.xl_bm,"
 				+ " r.cl_zbh,r.j_gh,r.j_name from bsth_c_s_sp_info_real  r WHERE "
 				+ " r.xl_bm='" + map.get("line").toString() + "'  "
 				+ " and to_days(r.schedule_date)=to_days('"+map.get("date").toString()+"')  "
 				+ " and r.gs_bm like '%"+gsbm+"%' "
 				+ " and r.fgs_bm like '%"+fgsbm+"%'  "
-				+ " GROUP BY r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name) t"
+				+ " GROUP BY r.schedule_date_str,r.xl_bm,r.cl_zbh,r.j_gh,r.j_name) t"
 				+ " left join (select * from bsth_c_ylb y where "
 				+ " to_days(y.rq)=to_days('"+map.get("date").toString()+"') "
 				+ " and y.xlbm= '" + map.get("line").toString() + "'"
@@ -1374,7 +1374,10 @@ public class ReportServiceImpl implements ReportService{
 			// TODO Auto-generated method stub
 			 // 转大写
 	        String nbbm =maps.get("nbbm").toString().toUpperCase();
-	        String gsbm=maps.get("gsbm").toString().trim();
+	        String gsbm="";
+	        
+	       if(maps.get("gsbm")!=null)
+	    	   gsbm= maps.get("gsbm").toString().trim();
 //	        String fgsbm=maps.get("fgsbm").toString().trim();
 	        String xlbm=maps.get("xlbm").toString().trim();
 	        List<Map<String, String>> list = new ArrayList<Map<String, String>>();
@@ -1430,7 +1433,9 @@ public class ReportServiceImpl implements ReportService{
 			// TODO Auto-generated method stub
 			 // 转大写
 	        String jsy =maps.get("jsy").toString().toUpperCase();
-	        String gsbm=maps.get("gsbm").toString().trim();
+	        String gsbm="";
+	        if(maps.get("gsbm")!=null)
+	        	gsbm=maps.get("gsbm").toString().trim();
 //	        String fgsbm=maps.get("fgsbm").toString().trim();
 	        List<Map<String, String>> list = new ArrayList<Map<String, String>>();
 	        Map<String, String> map;