潘钊 / bsth_control · Commits

Commit e65e5e3bbf14ba8fdeef0d015a174c7588af6502

Authored by 娄高锋
1 parent 78cb1dd1
build: skipped

营运线路出车率统计表

Inline Side-by-side
Showing 1 changed file with 4 additions and 3 deletions
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
  View file @e65e5e3
... ... @@ -495,7 +495,7 @@ public class FormsServiceImpl implements FormsService {
495 495 // + " on y.nbbm=t.cl_zbh and y.jsy= t.j_gh";
496 496  
497 497 String sql="select r.s_gh,r.s_name, "
498   - + " r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm"
  498 + + " r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm"
499 499 + " from bsth_c_s_sp_info_real r where r.schedule_date_str = '"+startDate+"'";
500 500 if(xlbm.equals("")){
501 501 sql +="and r.gs_bm='"+gsdm+"' "
... ... @@ -504,7 +504,7 @@ public class FormsServiceImpl implements FormsService {
504 504 sql += " and r.xl_bm = '"+xlbm+"'";
505 505 }
506 506 sql += " group by r.s_gh,r.s_name,"
507   - + " r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm";
  507 + + " r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm order by r.xl_bm";
508 508  
509 509 List<Singledata> list = jdbcTemplate.query(sql, new RowMapper<Singledata>() {
510 510 //SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
... ... @@ -512,7 +512,7 @@ public class FormsServiceImpl implements FormsService {
512 512 public Singledata mapRow(ResultSet arg0, int arg1) throws SQLException {
513 513 Singledata sin = new Singledata();
514 514 sin.setrQ(startDate);
515   - sin.setxL(arg0.getString("xl_name"));
  515 + sin.setxL(arg0.getString("xl_bm"));
516 516 sin.setClzbh(arg0.getString("cl_zbh"));
517 517 sin.setJsy(arg0.getString("j_gh"));
518 518 sin.setjName(arg0.getString("j_name"));
... ... @@ -529,6 +529,7 @@ public class FormsServiceImpl implements FormsService {
529 529 for (int i = 0; i < list.size(); i++) {
530 530 List<ScheduleRealInfo> newList=new ArrayList<ScheduleRealInfo>();
531 531 Singledata sin=list.get(i);
  532 + sin.setxL(BasicData.lineCode2NameMap.get(sin.getxL()));
532 533 String jsy=sin.getJsy();
533 534 String clzbh=sin.getClzbh();
534 535 for (int j = 0; j < listReal.size(); j++) {
... ...