电量导出格式修改，路单数据添加所以线路查询

廖磊
1 parent c7ff3d12
Showing 4 changed files with 7 additions and 4 deletions
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/resources/static/pages/forms/mould/listDl.xls
src/main/resources/static/pages/mforms/singledatas/singledata.html
@@ -239,7 +239,7 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 			m.put("rq", y.getRq());
 			m.put("gsname",y.getGsname() );
 			m.put("fgsname", y.getFgsname());
-			m.put("xlname", y.getXlname());
+			m.put("xlname", y.getXlname()==null?"":y.getXlname());
 			m.put("nbbm", y.getNbbm());
 			m.put("jsy", y.getJsy());
 			m.put("name", y.getName());
@@ -258,6 +258,7 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 			m.put("ns", y.getNs());
 			String shyy ="无";
 			if(y.getShyy()!=null){
+				shyy=y.getShyy();
 				 if(shyy.equals("1")){shyy="票务用油";}
 				 else if(shyy.equals("2")){shyy="保养用油";}
 				 else if(shyy.equals("3")){shyy="报废车用油";}
@@ -486,7 +486,7 @@ public class FormsServiceImpl implements FormsService {
 //				+ " on y.nbbm=t.cl_zbh and y.jsy= t.j_gh";
 		String sql="select r.s_gh,r.s_name, "
-				+ " r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm"
+				+ " r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm"
 				+ " from bsth_c_s_sp_info_real r where r.schedule_date_str = '"+startDate+"'";
 		if(xlbm.equals("")){
 			sql +="and r.gs_bm='"+gsdm+"' "
@@ -495,7 +495,7 @@ public class FormsServiceImpl implements FormsService {
 			sql += " and r.xl_bm = '"+xlbm+"'";
 		}
 	       sql += " group  by  r.s_gh,r.s_name,"
-	       		+ " r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm";
+	       		+ " r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm order by r.xl_bm";
 		List<Singledata> list = jdbcTemplate.query(sql, new RowMapper<Singledata>() {
 			//SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -503,7 +503,7 @@ public class FormsServiceImpl implements FormsService {
 			public Singledata mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Singledata sin = new Singledata();
 				sin.setrQ(startDate);
-				sin.setxL(arg0.getString("xl_name"));
+				sin.setxL(arg0.getString("xl_bm"));
 				sin.setClzbh(arg0.getString("cl_zbh"));
 				sin.setJsy(arg0.getString("j_gh"));
 				sin.setjName(arg0.getString("j_name"));
@@ -520,6 +520,7 @@ public class FormsServiceImpl implements FormsService {
 		for (int i = 0; i < list.size(); i++) {
 			List<ScheduleRealInfo>  newList=new ArrayList<ScheduleRealInfo>();
 			Singledata sin=list.get(i);
+			sin.setxL(BasicData.lineCode2NameMap.get(sin.getxL()));
 			String jsy=sin.getJsy();
 			String clzbh=sin.getClzbh();
 			for (int j = 0; j < listReal.size(); j++) {
@@ -140,6 +140,7 @@
 		$("#fgsdmSing").on("change",initXl);
 		function initXl(){
 			var data=[];
+			data.push({id: " ", text: "请选择"});
 			if(fage){
 				$("#line").select2("destroy").html('');
 			}