Merge branch 'jiading' of http://192.168.168.201:8888/panzhaov5/bsth_control.git into jiading

王通
2 parents 86f692ff 2c592e36
Showing 1 changed file with 15 additions and 13 deletions
src/main/java/com/bsth/service/schedule/impl/SchedulePlanServiceImpl.java
@@ -231,25 +231,27 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
             fgs=map.get("fgsdm").toString();
         }
  
-        String sql ="SELECT sp.xl as xl,MAX(sp.tt_info_names) as tt_info_name, " +
-                "MAX(sp.schedule_from_time) as from_time ,MAX(sp.schedule_to_time) as to_time, " +
-                "MAX(line.name) as name , MAX(us.user_name) as uname, " +
-                "MAX(sp.update_date) as updata_date,max(bu.business_name) as business_name  " +
-                "from bsth_c_s_sp sp " +
-                "LEFT JOIN bsth_c_line  line on sp.xl = line.line_code   " +
-                "left join bsth_c_sys_user us  on sp.update_by = us.id " +
-                "LEFT JOIN bsth_c_business bu on line.branche_company = bu.business_code " +
-                "where line.name not like '%测试线路%' and sfyy = '1' " +
-                "and line.destroy = '0' " ;
+        String sql ="" +
+                "SELECT sp.xl as xl,sp.tt_info_names as tt_info_name, " +
+                "  sp.schedule_from_time as from_time ,sp.schedule_to_time as to_time, " +
+                "  line.name as name , us.user_name as uname, " +
+                "  sp.update_date as updata_date,bu.business_name as business_name  " +
+                "  from bsth_c_s_sp sp " +
+                "  LEFT JOIN bsth_c_line  line on sp.xl = line.line_code   " +
+                "  left join bsth_c_sys_user us  on sp.update_by = us.id " +
+                "  LEFT JOIN bsth_c_business bu on line.branche_company = bu.business_code " +
+                "  where   sp.id in (select max(id) from bsth_c_s_sp spt  where plan_result ='ok' GROUP BY spt.xl)" +
+                "  and line.name not like '%测试线路%' and sfyy = '1' " +
+                "  and line.destroy = '0'  " ;
         if(!fgs.equals(" ") && !fgs.equals("")){
             sql +=" and line.branche_company = '"+fgs+"'";
         }
         if(!line.equals(" ") && !line.equals("")){
             sql += "and sp.xl="+line;
         }
-         
-        sql += " GROUP BY sp.xl ORDER BY MAX(sp.schedule_from_time) desc,MAX(line.name) ;";
-            List<Map> list = null;
+
+        sql += " ORDER BY sp.schedule_from_time desc,sp.tt_info_names ;";
+        List<Map> list = null;
         try {
               list = jdbcTemplate.query(sql, new RowMapper<Map>() {
                 @Override