潘钊 / bsth_control · Commits

Commit ef1bfdae32ed5d33156260ccdb08e7afe9290da7

Authored by 廖磊
1 parent a3efe9dc
build: skipped

调度日报排序

Inline Side-by-side
Showing 3 changed files with 10 additions and 5 deletions
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
  View file @ef1bfda
... ... @@ -133,7 +133,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository<ScheduleRealI
133 133  
134 134 //去掉了 xlBm is not null
135 135 @EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
136   - @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)")
  136 + @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)")
137 137 List<ScheduleRealInfo> scheduleByDateAndLine(String line,String date);
138 138  
139 139 @EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
... ...
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
  View file @ef1bfda
... ... @@ -968,13 +968,13 @@ public class FormsServiceImpl implements FormsService {
968 968 }
969 969  
970 970 String sql="select t.schedule_date_str,"
971   - + " t.cl_zbh,t.j_gh,t.j_name,x.yh from (select r.schedule_date_str,r.xl_bm,r.xl_name,"
  971 + + " t.cl_zbh,t.j_gh,t.j_name,x.yh from (select r.schedule_date_str,r.xl_bm,"
972 972 + " r.cl_zbh,r.j_gh,r.j_name from bsth_c_s_sp_info_real r WHERE "
973 973 + " r.xl_bm='" + map.get("line").toString() + "' "
974 974 + " and to_days(r.schedule_date)=to_days('"+map.get("date").toString()+"') "
975 975 + " and r.gs_bm like '%"+gsbm+"%' "
976 976 + " and r.fgs_bm like '%"+fgsbm+"%' "
977   - + " GROUP BY r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name) t"
  977 + + " GROUP BY r.schedule_date_str,r.xl_bm,r.cl_zbh,r.j_gh,r.j_name) t"
978 978 + " left join (select * from bsth_c_ylb y where "
979 979 + " to_days(y.rq)=to_days('"+map.get("date").toString()+"') "
980 980 + " and y.xlbm= '" + map.get("line").toString() + "'"
... ...
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
  View file @ef1bfda
... ... @@ -1374,7 +1374,10 @@ public class ReportServiceImpl implements ReportService{
1374 1374 // TODO Auto-generated method stub
1375 1375 // 转大写
1376 1376 String nbbm =maps.get("nbbm").toString().toUpperCase();
1377   - String gsbm=maps.get("gsbm").toString().trim();
  1377 + String gsbm="";
  1378 +
  1379 + if(maps.get("gsbm")!=null)
  1380 + gsbm= maps.get("gsbm").toString().trim();
1378 1381 // String fgsbm=maps.get("fgsbm").toString().trim();
1379 1382 String xlbm=maps.get("xlbm").toString().trim();
1380 1383 List<Map<String, String>> list = new ArrayList<Map<String, String>>();
... ... @@ -1430,7 +1433,9 @@ public class ReportServiceImpl implements ReportService{
1430 1433 // TODO Auto-generated method stub
1431 1434 // 转大写
1432 1435 String jsy =maps.get("jsy").toString().toUpperCase();
1433   - String gsbm=maps.get("gsbm").toString().trim();
  1436 + String gsbm="";
  1437 + if(maps.get("gsbm")!=null)
  1438 + gsbm=maps.get("gsbm").toString().trim();
1434 1439 // String fgsbm=maps.get("fgsbm").toString().trim();
1435 1440 List<Map<String, String>> list = new ArrayList<Map<String, String>>();
1436 1441 Map<String, String> map;
... ...