Commit 5ec0823f9dc55fce5c7aa6616231a3ef85e7542c
1 parent
c7ff3d12
电量导出格式修改，路单数据添加所以线路查询
Showing
4 changed files
with
7 additions
and
4 deletions
src/main/java/com/bsth/controller/oil/YlbController.java
| ... | ... | @@ -239,7 +239,7 @@ public class YlbController extends BaseController<Ylb, Integer>{ |
| 239 | 239 | m.put("rq", y.getRq()); |
| 240 | 240 | m.put("gsname",y.getGsname() ); |
| 241 | 241 | m.put("fgsname", y.getFgsname()); |
| 242 | - m.put("xlname", y.getXlname()); | |
| 242 | + m.put("xlname", y.getXlname()==null?"":y.getXlname()); | |
| 243 | 243 | m.put("nbbm", y.getNbbm()); |
| 244 | 244 | m.put("jsy", y.getJsy()); |
| 245 | 245 | m.put("name", y.getName()); |
| ... | ... | @@ -258,6 +258,7 @@ public class YlbController extends BaseController<Ylb, Integer>{ |
| 258 | 258 | m.put("ns", y.getNs()); |
| 259 | 259 | String shyy ="无"; |
| 260 | 260 | if(y.getShyy()!=null){ |
| 261 | + shyy=y.getShyy(); | |
| 261 | 262 | if(shyy.equals("1")){shyy="票务用油";} |
| 262 | 263 | else if(shyy.equals("2")){shyy="保养用油";} |
| 263 | 264 | else if(shyy.equals("3")){shyy="报废车用油";} | ... | ... |
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
| ... | ... | @@ -486,7 +486,7 @@ public class FormsServiceImpl implements FormsService { |
| 486 | 486 | // + " on y.nbbm=t.cl_zbh and y.jsy= t.j_gh"; |
| 487 | 487 | |
| 488 | 488 | String sql="select r.s_gh,r.s_name, " |
| 489 | - + " r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm" | |
| 489 | + + " r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm" | |
| 490 | 490 | + " from bsth_c_s_sp_info_real r where r.schedule_date_str = '"+startDate+"'"; |
| 491 | 491 | if(xlbm.equals("")){ |
| 492 | 492 | sql +="and r.gs_bm='"+gsdm+"' " |
| ... | ... | @@ -495,7 +495,7 @@ public class FormsServiceImpl implements FormsService { |
| 495 | 495 | sql += " and r.xl_bm = '"+xlbm+"'"; |
| 496 | 496 | } |
| 497 | 497 | sql += " group by 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 order by r.xl_bm"; | |
| 499 | 499 | |
| 500 | 500 | List<Singledata> list = jdbcTemplate.query(sql, new RowMapper<Singledata>() { |
| 501 | 501 | //SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); |
| ... | ... | @@ -503,7 +503,7 @@ public class FormsServiceImpl implements FormsService { |
| 503 | 503 | public Singledata mapRow(ResultSet arg0, int arg1) throws SQLException { |
| 504 | 504 | Singledata sin = new Singledata(); |
| 505 | 505 | sin.setrQ(startDate); |
| 506 | - sin.setxL(arg0.getString("xl_name")); | |
| 506 | + sin.setxL(arg0.getString("xl_bm")); | |
| 507 | 507 | sin.setClzbh(arg0.getString("cl_zbh")); |
| 508 | 508 | sin.setJsy(arg0.getString("j_gh")); |
| 509 | 509 | sin.setjName(arg0.getString("j_name")); |
| ... | ... | @@ -520,6 +520,7 @@ public class FormsServiceImpl implements FormsService { |
| 520 | 520 | for (int i = 0; i < list.size(); i++) { |
| 521 | 521 | List<ScheduleRealInfo> newList=new ArrayList<ScheduleRealInfo>(); |
| 522 | 522 | Singledata sin=list.get(i); |
| 523 | + sin.setxL(BasicData.lineCode2NameMap.get(sin.getxL())); | |
| 523 | 524 | String jsy=sin.getJsy(); |
| 524 | 525 | String clzbh=sin.getClzbh(); |
| 525 | 526 | for (int j = 0; j < listReal.size(); j++) { | ... | ... |
src/main/resources/static/pages/forms/mould/listDl.xls
No preview for this file type
src/main/resources/static/pages/mforms/singledatas/singledata.html