潘钊 / bsth_control · Commits

Commit d35c93f70cc642143040a24ffea88f80415d0d2c

Authored by mcy123
1 parent ae3c4d66

mcy

Inline Side-by-side
Showing 22 changed files with 367 additions and 209 deletions
src/main/java/com/bsth/controller/forms/ExportController.java
  View file @d35c93f
@@ -65,10 +65,12 @@ public class ExportController { @@ -65,10 +65,12 @@ public class ExportController {
65 i++; 65 i++;
66 } 66 }
67 67
  68 +
  69 +
68 try { 70 try {
69 listI.add(resList.iterator()); 71 listI.add(resList.iterator());
70 String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\"; 72 String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
71 - ee.excelReplace(listI, new Object[] { map }, path + "mould\\linepassengerflow.xls", 73 + ee.excelReplace(listI, new Object[] { map }, path + "mould\\linepasswengerflow.xls",
72 path + "export\\线路客流量报表" + sdfSimple.format(sdfMonth.parse(map.get("date").toString())) + ".xls"); 74 path + "export\\线路客流量报表" + sdfSimple.format(sdfMonth.parse(map.get("date").toString())) + ".xls");
73 } catch (Exception e) { 75 } catch (Exception e) {
74 e.printStackTrace(); 76 e.printStackTrace();
@@ -189,7 +191,7 @@ public class ExportController { @@ -189,7 +191,7 @@ public class ExportController {
189 listI.add(resList.iterator()); 191 listI.add(resList.iterator());
190 String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\"; 192 String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
191 ee.excelReplace(listI, new Object[] { map }, path + "mould\\singledata.xls", 193 ee.excelReplace(listI, new Object[] { map }, path + "mould\\singledata.xls",
192 - path + "export\\路单报表" + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls"); 194 + path + "export\\路单数据" + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
193 } catch (Exception e) { 195 } catch (Exception e) {
194 e.printStackTrace(); 196 e.printStackTrace();
195 } 197 }
@@ -203,8 +205,8 @@ public class ExportController { @@ -203,8 +205,8 @@ public class ExportController {
203 SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd"); 205 SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd");
204 List<Iterator<?>> listI = new ArrayList<Iterator<?>>(); 206 List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
205 ReportUtils ee = new ReportUtils(); 207 ReportUtils ee = new ReportUtils();
206 - List<Vehicleloading> vehicleloading = formsService.vehicleloading(/*map.get("gsdmVehic").toString(),map.get("fgsdmVehic").toString(),*/map.get("line").toString(),  
207 - map.get("date").toString()); 208 + List<Vehicleloading> vehicleloading = formsService.vehicleloading(map.get("gsdmVehic").toString(),map.get("fgsdmVehic").toString(),map.get("line").toString(),
  209 + map.get("data").toString());
208 List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>(); 210 List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
209 int i = 1; 211 int i = 1;
210 for (Vehicleloading l : vehicleloading) { 212 for (Vehicleloading l : vehicleloading) {
@@ -214,8 +216,8 @@ public class ExportController { @@ -214,8 +216,8 @@ public class ExportController {
214 m.put("gS", l.getgS()); 216 m.put("gS", l.getgS());
215 m.put("xL", l.getxL()); 217 m.put("xL", l.getxL());
216 m.put("clzbh", l.getClzbh()); 218 m.put("clzbh", l.getClzbh());
217 - m.put("hyl", l.getHyl());  
218 m.put("jzl", l.getJzl()); 219 m.put("jzl", l.getJzl());
  220 + m.put("hyl", l.getHyl());
219 m.put("ls", l.getLs()); 221 m.put("ls", l.getLs());
220 m.put("jhlc", l.getJhlc()); 222 m.put("jhlc", l.getJhlc());
221 m.put("unyyyl", l.getUnyyyl()); 223 m.put("unyyyl", l.getUnyyyl());
@@ -229,7 +231,7 @@ public class ExportController { @@ -229,7 +231,7 @@ public class ExportController {
229 listI.add(resList.iterator()); 231 listI.add(resList.iterator());
230 String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\"; 232 String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
231 ee.excelReplace(listI, new Object[] { map }, path + "mould\\vehicleloading.xls", 233 ee.excelReplace(listI, new Object[] { map }, path + "mould\\vehicleloading.xls",
232 - path + "export\\车辆加注" + sdfSimple.format(sdfMonth.parse(map.get("date").toString())) + ".xls"); 234 + path + "export\\车辆加注" + sdfSimple.format(sdfMonth.parse(map.get("dat").toString())) + ".xls");
233 } catch (Exception e) { 235 } catch (Exception e) {
234 e.printStackTrace(); 236 e.printStackTrace();
235 } 237 }
@@ -417,5 +419,9 @@ public class ExportController { @@ -417,5 +419,9 @@ public class ExportController {
417 } 419 }
418 return resList; 420 return resList;
419 } 421 }
  422 +
  423 +
  424 +
  425 +
420 426
421 } 427 }
src/main/java/com/bsth/controller/forms/MCY_FormsController.java
  View file @d35c93f
@@ -80,9 +80,9 @@ public class MCY_FormsController { @@ -80,9 +80,9 @@ public class MCY_FormsController {
80 80
81 // 车辆加注 81 // 车辆加注
82 @RequestMapping(value = "/vehicleloading", method = RequestMethod.POST) 82 @RequestMapping(value = "/vehicleloading", method = RequestMethod.POST)
83 - public List<Vehicleloading> vehicleloading(/*@RequestParam String gsdmVehic, @RequestParam String fgsdmVehic,*/ 83 + public List<Vehicleloading> vehicleloading(@RequestParam String gsdmVehic, @RequestParam String fgsdmVehic,
84 @RequestParam String line, @RequestParam String data) { 84 @RequestParam String line, @RequestParam String data) {
85 - return formsService.vehicleloading(/*gsdmVehic, fgsdmVehic, */line, data); 85 + return formsService.vehicleloading(gsdmVehic, fgsdmVehic, line, data);
86 } 86 }
87 87
88 // 运营服务阶段报表 88 // 运营服务阶段报表
src/main/java/com/bsth/entity/mcy_forms/Changetochange.java
  View file @d35c93f
1 package com.bsth.entity.mcy_forms; 1 package com.bsth.entity.mcy_forms;
2 2
3 -import java.util.Date;  
4 -  
5 import javax.persistence.Entity; 3 import javax.persistence.Entity;
6 import javax.persistence.GeneratedValue; 4 import javax.persistence.GeneratedValue;
7 import javax.persistence.Id; 5 import javax.persistence.Id;
src/main/java/com/bsth/service/forms/FormsService.java
  View file @d35c93f
@@ -30,7 +30,7 @@ public interface FormsService { @@ -30,7 +30,7 @@ public interface FormsService {
30 30
31 public List<Singledata> singledata(Map<String, Object> map); 31 public List<Singledata> singledata(Map<String, Object> map);
32 32
33 - public List<Vehicleloading> vehicleloading(/*String gsdmVehic,String fgsdmVehic,*/String line,String data); 33 + public List<Vehicleloading> vehicleloading(String gsdmVehic,String fgsdmVehic,String line,String data);
34 34
35 public List<Operationservice> operationservice(Map<String, Object> map); 35 public List<Operationservice> operationservice(Map<String, Object> map);
36 36
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
  View file @d35c93f
@@ -26,6 +26,7 @@ import com.bsth.entity.mcy_forms.Waybillday; @@ -26,6 +26,7 @@ import com.bsth.entity.mcy_forms.Waybillday;
26 import com.bsth.entity.mcy_forms.Allline; 26 import com.bsth.entity.mcy_forms.Allline;
27 import com.bsth.entity.mcy_forms.Changetochange; 27 import com.bsth.entity.mcy_forms.Changetochange;
28 import com.bsth.entity.mcy_forms.Executionrate; 28 import com.bsth.entity.mcy_forms.Executionrate;
  29 +import com.bsth.service.forms.CommonService;
29 import com.bsth.service.forms.FormsService; 30 import com.bsth.service.forms.FormsService;
30 import com.bsth.service.realcontrol.ScheduleRealInfoService; 31 import com.bsth.service.realcontrol.ScheduleRealInfoService;
31 32
@@ -38,20 +39,32 @@ public class FormsServiceImpl implements FormsService { @@ -38,20 +39,32 @@ public class FormsServiceImpl implements FormsService {
38 @Autowired 39 @Autowired
39 ScheduleRealInfoService scheduleRealInfoService; 40 ScheduleRealInfoService scheduleRealInfoService;
40 41
  42 + @Autowired
  43 + CommonService commonService;
  44 +
41 // 行车路单日报表 45 // 行车路单日报表
42 @Override 46 @Override
43 public List<Waybillday> waybillday(Map<String, Object> map) { 47 public List<Waybillday> waybillday(Map<String, Object> map) {
  48 +
44 String sql ="select x.j_gh,x.cl_zbh,z.JZL,z.YH,z.personnel_name,x.schedule_date,x.gs_bm,x.gs_name,x.fgs_bm,x.fgs_name " 49 String sql ="select x.j_gh,x.cl_zbh,z.JZL,z.YH,z.personnel_name,x.schedule_date,x.gs_bm,x.gs_name,x.fgs_bm,x.fgs_name "
45 + " from bsth_c_s_sp_info_real x INNER join " 50 + " from bsth_c_s_sp_info_real x INNER join "
46 + " ( select y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH,c.personnel_name from" 51 + " ( select y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH,c.personnel_name from"
47 + " bsth_c_ylb y LEFT JOIN bsth_c_personnel c ON c.job_code=y.JSY " 52 + " bsth_c_ylb y LEFT JOIN bsth_c_personnel c ON c.job_code=y.JSY "
48 - + " where to_days(y.RQ)=to_days('"+map.get("date").toString() + "') and y.XLBM= '"+ map.get("line").toString()+"' GROUP BY y.NBBM) "  
49 - + " z on x.cl_zbh=z.nbbm where to_days( x.schedule_date)=to_days('"+map.get("date").toString()+"') "  
50 - + " and x.xl_bm='"+map.get("line").toString()+"'"  
51 - /*+ " and x.gs_bm='"+map.get("gsdmWaybillday").toString()+"'"  
52 - + " and x.fgs_bm='"+map.get("fgsdmWaybillday").toString()+"'"*/  
53 - + " GROUP BY x.j_gh,x.cl_zbh,z.JZL,z.YH,z.personnel_name,x.schedule_date,x.gs_bm,x.gs_name,x.fgs_bm,x.fgs_name";  
54 - //x.cl_zbh,j_gh 53 + + " where 1=1 ";
  54 + if(map.get("date").toString()!=""){
  55 + sql+=" and to_days(y.RQ)=to_days('"+map.get("date").toString() + "') ";
  56 + }
  57 + if( map.get("line").toString()!=""){
  58 + sql+=" and y.XLBM= '"+ map.get("line").toString()+"' GROUP BY y.NBBM) ";
  59 + }
  60 + sql+= " z on x.cl_zbh=z.nbbm where to_days( x.schedule_date)=to_days('"+map.get("date").toString()+"') ";
  61 + if(map.get("gsdmWaybillday").toString()!=""){
  62 + sql+=" and x.gs_bm='"+map.get("gsdmWaybillday").toString()+"'";
  63 + }
  64 + if(map.get("fgsdmWaybillday").toString()!=""){
  65 + sql+=" and x.fgs_bm='"+map.get("fgsdmWaybillday").toString()+"'";
  66 + }
  67 + sql += " GROUP BY x.j_gh,x.cl_zbh,z.JZL,z.YH,z.personnel_name,x.schedule_date,x.gs_bm,x.gs_name,x.fgs_bm,x.fgs_name ";
55 List<Waybillday> list = jdbcTemplate.query(sql, new RowMapper<Waybillday>() { 68 List<Waybillday> list = jdbcTemplate.query(sql, new RowMapper<Waybillday>() {
56 @Override 69 @Override
57 public Waybillday mapRow(ResultSet arg0, int arg1) throws SQLException { 70 public Waybillday mapRow(ResultSet arg0, int arg1) throws SQLException {
@@ -60,21 +73,16 @@ public class FormsServiceImpl implements FormsService { @@ -60,21 +73,16 @@ public class FormsServiceImpl implements FormsService {
60 wbd.setJzl(arg0.getString("JZL")); 73 wbd.setJzl(arg0.getString("JZL"));
61 wbd.setYh(arg0.getString("YH")); 74 wbd.setYh(arg0.getString("YH"));
62 wbd.setjName(arg0.getString("personnel_name")); 75 wbd.setjName(arg0.getString("personnel_name"));
63 - // wbd.setZlc(arg0.getInt("zlc"));  
64 - // System.out.println(arg0.getObject("yl"));  
65 - // wbd.setYl(arg0.getString("yl"));  
66 - // wbd.setNbbm(arg0.getString("nbbm"));  
67 wbd.setRq(arg0.getString("schedule_date")); 76 wbd.setRq(arg0.getString("schedule_date"));
68 wbd.setJgh(arg0.getString("j_gh")); 77 wbd.setJgh(arg0.getString("j_gh"));
69 return wbd; 78 return wbd;
70 -  
71 } 79 }
72 }); 80 });
73 81
74 for(int i=0;i<list.size();i++){ 82 for(int i=0;i<list.size();i++){
75 Waybillday w=list.get(i); 83 Waybillday w=list.get(i);
76 Map<String, Object> maps = new HashMap<>(); 84 Map<String, Object> maps = new HashMap<>();
77 - maps = scheduleRealInfoService.findKMBC2(w.getJgh(), w.getCarPlate(), 85 + maps = commonService.findKMBC2(w.getJgh(), w.getCarPlate(),
78 w.getRq()); 86 w.getRq());
79 w.setJzl1(maps.get("ksgl").toString()); 87 w.setJzl1(maps.get("ksgl").toString());
80 w.setZlc(maps.get("realMileage").toString()); 88 w.setZlc(maps.get("realMileage").toString());
@@ -86,18 +94,25 @@ public class FormsServiceImpl implements FormsService { @@ -86,18 +94,25 @@ public class FormsServiceImpl implements FormsService {
86 // 线路客流量报表 94 // 线路客流量报表
87 @Override 95 @Override
88 public List<Linepasswengerflow> linepasswengerflow(Map<String, Object> map) { 96 public List<Linepasswengerflow> linepasswengerflow(Map<String, Object> map) {
89 - String sql = " SELECT s.station_name,l.name,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name" 97 + String sql = " SELECT r.schedule_date,s.station_name,l.name,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name"
90 + " from bsth_c_stationroute s " 98 + " from bsth_c_stationroute s "
91 + " LEFT JOIN bsth_c_line l on s.line_code=l.line_code " 99 + " LEFT JOIN bsth_c_line l on s.line_code=l.line_code "
92 + " LEFT JOIN bsth_c_s_sp_info_real r on r.xl_bm=l.line_code" 100 + " LEFT JOIN bsth_c_s_sp_info_real r on r.xl_bm=l.line_code"
93 - + " where to_days(l.create_date)=to_days('"+map.get("date").toString() + "') "  
94 - + " and l.line_code=" + map.get("line").toString()  
95 - + " AND r.gs_bm is not null"  
96 - /*+ " and r.gs_bm='"+map.get("gsdmLine").toString()+"'"  
97 - + " and r.fgs_bm='"+map.get("fgsdmLine").toString()+"'"*/  
98 - + " GROUP BY s.station_name,l.name,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";  
99 -  
100 - //s.station_name 101 + + " where 1=1 ";
  102 + if(map.get("date").toString()!=""){
  103 + sql+="and to_days(r.schedule_date)=to_days('"+map.get("date").toString() + "') ";
  104 + }
  105 + if( map.get("line").toString()!=""){
  106 + sql+=" and l.line_code=" + map.get("line").toString();
  107 + }
  108 + sql+= " AND r.gs_bm is not null";
  109 + if(map.get("gsdmLine").toString()!=""){
  110 + sql+=" and r.gs_bm='"+map.get("gsdmLine").toString()+"' ";
  111 + }
  112 + if(map.get("fgsdmLine").toString()!=""){
  113 + sql+=" and r.fgs_bm='"+map.get("fgsdmLine").toString()+"'";
  114 + }
  115 + sql += " GROUP BY s.station_name,l.name,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";
101 List<Linepasswengerflow> list = jdbcTemplate.query(sql, new RowMapper<Linepasswengerflow>() { 116 List<Linepasswengerflow> list = jdbcTemplate.query(sql, new RowMapper<Linepasswengerflow>() {
102 117
103 @Override 118 @Override
@@ -109,8 +124,6 @@ public class FormsServiceImpl implements FormsService { @@ -109,8 +124,6 @@ public class FormsServiceImpl implements FormsService {
109 } 124 }
110 }); 125 });
111 126
112 -  
113 -  
114 return list; 127 return list;
115 } 128 }
116 129
@@ -122,16 +135,26 @@ public class FormsServiceImpl implements FormsService { @@ -122,16 +135,26 @@ public class FormsServiceImpl implements FormsService {
122 public List<Shiftuehiclemanth> shiftuehiclemanth(Map<String, Object> map) { 135 public List<Shiftuehiclemanth> shiftuehiclemanth(Map<String, Object> map) {
123 String sql = "select r.j_name,r.cl_zbh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type " 136 String sql = "select r.j_name,r.cl_zbh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type "
124 + " from bsth_c_s_sp_info_real r " 137 + " from bsth_c_s_sp_info_real r "
125 - + " where to_days(r.schedule_date_str) BETWEEN to_days('" + map.get("startDate").toString() + "') "  
126 - + " and to_days('" + map.get("endDate").toString() + "') "  
127 - + " and r.xl_bm='"+ map.get("line").toString() + "'"  
128 - + " AND r.gs_bm is not null"  
129 - + " and r.bc_type not in('in','out')"  
130 - /* + " and r.gs_bm='"+map.get("gsdmManth").toString()+"'"  
131 - + " and r.fgs_bm='"+map.get("fgsdmManth").toString()+"'"*/  
132 - + " GROUP BY r.j_name,r.cl_zbh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name"  
133 - + " ORDER BY r.j_name";  
134 - //r.j_name 138 + + " where 1=1 ";
  139 + if(map.get("startDate").toString()!=""){
  140 + sql+=" and to_days(r.schedule_date_str) BETWEEN to_days('" + map.get("startDate").toString() + "') ";
  141 + }
  142 +
  143 + if(map.get("endDate").toString()!=""){
  144 + sql+=" and to_days('" + map.get("endDate").toString() + "') ";
  145 + }
  146 + if( map.get("line").toString()!=""){
  147 + sql+=" and r.xl_bm='"+ map.get("line").toString() + "' ";
  148 + }
  149 + sql+= " AND r.gs_bm is not null and r.bc_type not in('in','out')";
  150 + if(map.get("gsdmManth").toString()!=""){
  151 + sql+=" and r.gs_bm='"+map.get("gsdmManth").toString()+"' ";
  152 + }
  153 + if(map.get("fgsdmManth").toString()!=""){
  154 + sql+=" and r.fgs_bm='"+map.get("fgsdmManth").toString()+"' ";
  155 + }
  156 + sql += " GROUP BY r.j_name,r.cl_zbh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type ";
  157 +
135 startDate = map.get("startDate").toString(); 158 startDate = map.get("startDate").toString();
136 endDate = map.get("endDate").toString(); 159 endDate = map.get("endDate").toString();
137 List<Shiftuehiclemanth> list = jdbcTemplate.query(sql, new RowMapper<Shiftuehiclemanth>() { 160 List<Shiftuehiclemanth> list = jdbcTemplate.query(sql, new RowMapper<Shiftuehiclemanth>() {
@@ -150,7 +173,7 @@ public class FormsServiceImpl implements FormsService { @@ -150,7 +173,7 @@ public class FormsServiceImpl implements FormsService {
150 Shiftuehiclemanth s=list.get(i); 173 Shiftuehiclemanth s=list.get(i);
151 Map<String, Object> maps = new HashMap<>(); 174 Map<String, Object> maps = new HashMap<>();
152 175
153 - maps = scheduleRealInfoService.findKMBC1(s.getjName(),s.getZbh(), startDate, 176 + maps = commonService.findKMBC1(s.getjName(),s.getZbh(), startDate,
154 endDate); 177 endDate);
155 178
156 s.setJhlc(maps.get("jhlc").toString()); 179 s.setJhlc(maps.get("jhlc").toString());
@@ -172,13 +195,22 @@ public class FormsServiceImpl implements FormsService { @@ -172,13 +195,22 @@ public class FormsServiceImpl implements FormsService {
172 String sql = " select r.schedule_date,r.lp_name,r.xl_name,r.j_name,r.s_name, r.cl_zbh,r.xl_bm," 195 String sql = " select r.schedule_date,r.lp_name,r.xl_name,r.j_name,r.s_name, r.cl_zbh,r.xl_bm,"
173 + " r.cl_zbh,r.j_gh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type " 196 + " r.cl_zbh,r.j_gh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type "
174 + " FROM bsth_c_s_sp_info_real r " 197 + " FROM bsth_c_s_sp_info_real r "
175 - + " where to_days(r.schedule_date)=to_days('"  
176 - + map.get("date").toString() + "') and r.xl_bm=" + map.get("line").toString()  
177 - + " and r.bc_type not in('in','out')"  
178 - /*+ " and r.gs_bm='"+map.get("gsdmShif").toString()+"'"  
179 - + " and r.fgs_bm='"+map.get("fgsdmShif").toString()+"'"*/  
180 - + " GROUP BY r.schedule_date,r.lp_name,r.xl_name,r.j_name,r.s_name, r.cl_zbh,r.xl_bm,r.cl_zbh,r.j_gh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name "  
181 - + " ORDER BY r.lp_name asc"; 198 + + " where 1=1 ";
  199 + if(map.get("date").toString()!=""){
  200 + sql+=" and to_days(r.schedule_date)=to_days('"+ map.get("date").toString() + "') ";
  201 + }
  202 + if( map.get("line").toString()!=""){
  203 + sql+=" and r.xl_bm=" + map.get("line").toString();
  204 + }
  205 + sql+= " and r.bc_type not in('in','out')";
  206 + if(map.get("gsdmShif").toString()!=""){
  207 + sql+=" and r.gs_bm='"+map.get("gsdmShif").toString()+"'";
  208 + }
  209 + if(map.get("fgsdmShif").toString()!=""){
  210 + sql+=" and r.fgs_bm='"+map.get("fgsdmShif").toString()+"'";
  211 + }
  212 + sql += " GROUP BY r.schedule_date,r.lp_name,r.xl_name,r.j_name,r.s_name, r.cl_zbh,r.xl_bm,r.cl_zbh,r.j_gh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name "
  213 + + " ORDER BY r.lp_name asc";
182 214
183 List<Shifday> list = jdbcTemplate.query(sql, new RowMapper<Shifday>() { 215 List<Shifday> list = jdbcTemplate.query(sql, new RowMapper<Shifday>() {
184 216
@@ -200,7 +232,7 @@ public class FormsServiceImpl implements FormsService { @@ -200,7 +232,7 @@ public class FormsServiceImpl implements FormsService {
200 for(int i=0;i<list.size();i++){ 232 for(int i=0;i<list.size();i++){
201 Shifday shi=list.get(i); 233 Shifday shi=list.get(i);
202 Map<String, Object> maps = new HashMap<>(); 234 Map<String, Object> maps = new HashMap<>();
203 - maps = scheduleRealInfoService.findKMBC2(shi.getJgh(), shi.getCarPlate(), 235 + maps = commonService.findKMBC2(shi.getJgh(), shi.getCarPlate(),
204 shi.getRq()); 236 shi.getRq());
205 shi.setJhlc(maps.get("jhlc").toString());// 计划里程 237 shi.setJhlc(maps.get("jhlc").toString());// 计划里程
206 //shifday.setSjjhlc(map.get("remMileage").toString());//实际计划里程 238 //shifday.setSjjhlc(map.get("remMileage").toString());//实际计划里程
@@ -261,7 +293,6 @@ public class FormsServiceImpl implements FormsService { @@ -261,7 +293,6 @@ public class FormsServiceImpl implements FormsService {
261 @Override 293 @Override
262 public Changetochange mapRow(ResultSet arg0, int arg1) throws SQLException { 294 public Changetochange mapRow(ResultSet arg0, int arg1) throws SQLException {
263 Changetochange chan = new Changetochange(); 295 Changetochange chan = new Changetochange();
264 -  
265 chan.setRq(rq); 296 chan.setRq(rq);
266 chan.setGs(arg0.getString("gs")); 297 chan.setGs(arg0.getString("gs"));
267 chan.setFgs(arg0.getString("fgs")); 298 chan.setFgs(arg0.getString("fgs"));
@@ -302,18 +333,22 @@ public class FormsServiceImpl implements FormsService { @@ -302,18 +333,22 @@ public class FormsServiceImpl implements FormsService {
302 333
303 rq = rq2 + "-" + rq3; 334 rq = rq2 + "-" + rq3;
304 335
305 - String sql = " SELECT r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name " 336 + String sql = " SELECT r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name "
306 + " FROM bsth_c_s_sp_info_real r " 337 + " FROM bsth_c_s_sp_info_real r "
307 - + " INNER join ( select y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH from bsth_c_ylb y "  
308 - + " where y.RQ BETWEEN '" + map.get("startDate").toString() + "' and '"+ map.get("endDate").toString() + "'"  
309 - + " and y.XLBM= '" + map.get("line").toString() + "' GROUP BY y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH) y on r.cl_zbh=y.nbbm " 338 + + " left join bsth_c_ylb y"
  339 + + " ON r.cl_zbh = y.nbbm "
310 + " where r.schedule_date_str BETWEEN '" + map.get("startDate").toString() + "'" 340 + " where r.schedule_date_str BETWEEN '" + map.get("startDate").toString() + "'"
311 + " and '"+ map.get("endDate").toString() + "'" 341 + " and '"+ map.get("endDate").toString() + "'"
312 + " and r.xl_bm='" + map.get("line").toString() + "'" 342 + " and r.xl_bm='" + map.get("line").toString() + "'"
313 - + " AND r.gs_bm is not null"  
314 - /* + " and r.gs_bm='"+map.get("gsdmSing").toString()+"'"  
315 - + " and r.fgs_bm='"+map.get("fgsdmSing").toString()+"'"*/  
316 - + " GROUP BY r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name "; 343 + + " AND r.gs_bm is not null";
  344 +
  345 + if(map.get("gsdmSing").toString()!=""){
  346 + sql+=" and r.gs_bm='"+map.get("gsdmSing").toString()+"'";
  347 + }
  348 + if(map.get("fgsdmSing").toString()!=""){
  349 + sql+=" and r.fgs_bm='"+map.get("fgsdmSing").toString()+"'";
  350 + }
  351 + sql += " GROUP BY r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";
317 352
318 startDate = map.get("startDate").toString(); 353 startDate = map.get("startDate").toString();
319 endDate = map.get("endDate").toString(); 354 endDate = map.get("endDate").toString();
@@ -324,7 +359,7 @@ public class FormsServiceImpl implements FormsService { @@ -324,7 +359,7 @@ public class FormsServiceImpl implements FormsService {
324 Singledata sin = new Singledata(); 359 Singledata sin = new Singledata();
325 sin.setrQ(rq); 360 sin.setrQ(rq);
326 sin.setgS(arg0.getString("gs_name")); 361 sin.setgS(arg0.getString("gs_name"));
327 - sin.setxL(arg0.getString("xl_bm")); 362 + sin.setxL(arg0.getString("xl_name"));
328 sin.setClzbh(arg0.getString("cl_zbh")); 363 sin.setClzbh(arg0.getString("cl_zbh"));
329 sin.setJsy(arg0.getString("j_gh")); 364 sin.setJsy(arg0.getString("j_gh"));
330 sin.setjName(arg0.getString("j_name")); 365 sin.setjName(arg0.getString("j_name"));
@@ -339,7 +374,7 @@ public class FormsServiceImpl implements FormsService { @@ -339,7 +374,7 @@ public class FormsServiceImpl implements FormsService {
339 for(int i=0;i<list.size();i++){ 374 for(int i=0;i<list.size();i++){
340 Singledata si=list.get(i); 375 Singledata si=list.get(i);
341 Map<String, Object> maps = new HashMap<>(); 376 Map<String, Object> maps = new HashMap<>();
342 - maps = scheduleRealInfoService.findKMBC1(si.getjName(),si.getClzbh(), startDate, 377 + maps = commonService.findKMBC1(si.getjName(),si.getClzbh(), startDate,
343 endDate); 378 endDate);
344 //sin.setjName(maps.get("j_name") == null ? "" : maps.get("j_name").toString()); 379 //sin.setjName(maps.get("j_name") == null ? "" : maps.get("j_name").toString());
345 si.setSgh(maps.get("s_gh") == null ? "" : maps.get("s_gh").toString()); 380 si.setSgh(maps.get("s_gh") == null ? "" : maps.get("s_gh").toString());
@@ -356,24 +391,30 @@ public class FormsServiceImpl implements FormsService { @@ -356,24 +391,30 @@ public class FormsServiceImpl implements FormsService {
356 @Override 391 @Override
357 public List<Operationservice> operationservice(Map<String, Object> map) { 392 public List<Operationservice> operationservice(Map<String, Object> map) {
358 393
359 - String sql = " SELECT r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type " 394 + String sql = " SELECT r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type "
360 + " FROM bsth_c_s_sp_info_real r " 395 + " FROM bsth_c_s_sp_info_real r "
361 // + "LEFT JOIN bsth_c_s_sp_info_real r on r.cl_zbh=y.NBBM" 396 // + "LEFT JOIN bsth_c_s_sp_info_real r on r.cl_zbh=y.NBBM"
362 - + " INNER join ( select y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH from bsth_c_ylb y "  
363 - + " where y.RQ BETWEEN '" + map.get("startDate").toString() + "' and '"+ map.get("endDate").toString() + "'"  
364 - + " and y.XLBM= '" + map.get("line").toString() + "' GROUP BY y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH) y on r.cl_zbh=y.nbbm "  
365 - + " where r.schedule_date_str BETWEEN '"+ map.get("startDate").toString()  
366 - + "'" + " and '" + map.get("endDate").toString() + "'"  
367 - + " and r.xl_bm='" + map.get("line").toString() + "'"  
368 - + " and r.bc_type not in('in','out')"  
369 - /* + " and r.gs_bm='"+map.get("gsdmOperat").toString()+"'"  
370 - + " and r.fgs_bm='"+map.get("fgsdmOperat").toString()+"'"*/  
371 - + " AND r.gs_bm is not null"  
372 - + " GROUP BY r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name"; 397 + + " left join bsth_c_ylb y ON r.cl_zbh = y.nbbm "
  398 + + " where 1=1 ";
  399 + if(map.get("startDate").toString()!=""){
  400 + sql+=" and to_days(r.schedule_date_str) BETWEEN to_days('" + map.get("startDate").toString() + "') ";
  401 + }
373 402
374 - //r.j_name  
375 - startDate = map.get("startDate").toString();  
376 - endDate = map.get("endDate").toString(); 403 + if(map.get("endDate").toString()!=""){
  404 + sql+=" and to_days('" + map.get("endDate").toString() + "') ";
  405 + }
  406 + sql+=" and r.xl_bm='" + map.get("line").toString() + "'" ;
  407 + sql+=" and r.bc_type not in('in','out')";
  408 + if(map.get("gsdmOperat").toString()!=""){
  409 + sql+=" and r.gs_bm='"+map.get("gsdmOperat").toString()+"'";
  410 + }
  411 + if(map.get("fgsdmOperat").toString()!=""){
  412 + sql+=" and r.fgs_bm='"+map.get("fgsdmOperat").toString()+"'";
  413 + }
  414 + sql += " AND r.gs_bm is not null";
  415 + sql += " GROUP BY r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name";
  416 + startDate = map.get("startDate").toString();
  417 + endDate = map.get("endDate").toString();
377 List<Operationservice> list = jdbcTemplate.query(sql, new RowMapper<Operationservice>() { 418 List<Operationservice> list = jdbcTemplate.query(sql, new RowMapper<Operationservice>() {
378 419
379 @Override 420 @Override
@@ -392,9 +433,9 @@ public class FormsServiceImpl implements FormsService { @@ -392,9 +433,9 @@ public class FormsServiceImpl implements FormsService {
392 for(int i=0;i<list.size();i++){ 433 for(int i=0;i<list.size();i++){
393 Operationservice o=list.get(i); 434 Operationservice o=list.get(i);
394 Map<String, Object> maps = new HashMap<>(); 435 Map<String, Object> maps = new HashMap<>();
395 - maps = scheduleRealInfoService.findKMBC1(o.getJname(), o.getClzbh(), startDate, 436 + maps = commonService.findKMBC1(o.getJname(), o.getClzbh(), startDate,
396 endDate); 437 endDate);
397 - o.setXsgl(maps.get("yygl").toString() == null ? "" : maps.get("yygl").toString()); 438 + o.setXsgl(maps.get("jhlc").toString() == null ? "" : maps.get("jhlc").toString());
398 o.setEmptMileage(maps.get("ksgl").toString() == null ? "" : maps.get("ksgl").toString()); 439 o.setEmptMileage(maps.get("ksgl").toString() == null ? "" : maps.get("ksgl").toString());
399 o.setSjbc(maps.get("sjbc").toString() == null ? "" : maps.get("sjbc").toString()); 440 o.setSjbc(maps.get("sjbc").toString() == null ? "" : maps.get("sjbc").toString());
400 } 441 }
@@ -404,7 +445,7 @@ public class FormsServiceImpl implements FormsService { @@ -404,7 +445,7 @@ public class FormsServiceImpl implements FormsService {
404 445
405 // 车辆加注 446 // 车辆加注
406 @Override 447 @Override
407 - public List<Vehicleloading> vehicleloading(/*String gsdmVehic,String fgsdmVehic,*/String line, String date) { 448 + public List<Vehicleloading> vehicleloading(String gsdmVehic,String fgsdmVehic,String line, String date) {
408 449
409 String sql = " SELECT r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_name,y.YH,y.JZL,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type " 450 String sql = " SELECT r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_name,y.YH,y.JZL,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type "
410 + " FROM bsth_c_s_sp_info_real r " 451 + " FROM bsth_c_s_sp_info_real r "
@@ -414,13 +455,14 @@ public class FormsServiceImpl implements FormsService { @@ -414,13 +455,14 @@ public class FormsServiceImpl implements FormsService {
414 + " where to_days(r.schedule_date_str)=to_days('" + date + "')" 455 + " where to_days(r.schedule_date_str)=to_days('" + date + "')"
415 + " and r.xl_bm='" + line + "' " 456 + " and r.xl_bm='" + line + "' "
416 + " AND r.gs_bm is not null" 457 + " AND r.gs_bm is not null"
417 - + " and r.bc_type not in('in','out')"  
418 - /* + " and r.gs_bm='"+gsdmVehic +"'"  
419 - + " and r.fgs_bm='"+fgsdmVehic +"'"*/  
420 - + " GROUP BY r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_name,y.YH,y.JZL,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";  
421 -  
422 -  
423 - //r.cl_zbh 458 + + " and r.bc_type not in('in','out')";
  459 + if(gsdmVehic.toString()!=""){
  460 + sql+=" and r.gs_bm='"+gsdmVehic+"'";
  461 + }
  462 + if(fgsdmVehic.toString()!=""){
  463 + sql+=" and r.fgs_bm='"+fgsdmVehic +"'";
  464 + }
  465 + sql += " GROUP BY r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_name,y.YH,y.JZL,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";
424 List<Vehicleloading> list = jdbcTemplate.query(sql, new RowMapper<Vehicleloading>() { 466 List<Vehicleloading> list = jdbcTemplate.query(sql, new RowMapper<Vehicleloading>() {
425 @Override 467 @Override
426 public Vehicleloading mapRow(ResultSet arg0, int arg1) throws SQLException { 468 public Vehicleloading mapRow(ResultSet arg0, int arg1) throws SQLException {
@@ -429,8 +471,8 @@ public class FormsServiceImpl implements FormsService { @@ -429,8 +471,8 @@ public class FormsServiceImpl implements FormsService {
429 ve.setgS(arg0.getString("gs_name")); 471 ve.setgS(arg0.getString("gs_name"));
430 ve.setxL(arg0.getString("xl_name")); 472 ve.setxL(arg0.getString("xl_name"));
431 ve.setClzbh(arg0.getString("cl_zbh")); 473 ve.setClzbh(arg0.getString("cl_zbh"));
432 - ve.setHyl(arg0.getString("YH"));  
433 ve.setJzl(arg0.getString("JZL")); 474 ve.setJzl(arg0.getString("JZL"));
  475 + ve.setHyl(arg0.getString("YH"));
434 // ve.setLs(arg0.getString("").toString());//尿素 476 // ve.setLs(arg0.getString("").toString());//尿素
435 ve.setJgh(arg0.getString("j_gh").toString()); 477 ve.setJgh(arg0.getString("j_gh").toString());
436 return ve; 478 return ve;
@@ -440,9 +482,9 @@ public class FormsServiceImpl implements FormsService { @@ -440,9 +482,9 @@ public class FormsServiceImpl implements FormsService {
440 for(int i=0;i<list.size();i++){ 482 for(int i=0;i<list.size();i++){
441 Vehicleloading v=list.get(i); 483 Vehicleloading v=list.get(i);
442 Map<String, Object> maps = new HashMap<>(); 484 Map<String, Object> maps = new HashMap<>();
443 - maps = scheduleRealInfoService.findKMBC2(v.getJgh(), line,  
444 - date);  
445 - v.setJhlc(maps.get("yygl") == null ? "" : maps.get("yygl").toString()); 485 + maps = commonService.findKMBC2(v.getJgh(), v.getClzbh(),
  486 + v.getrQ());
  487 + v.setJhlc(maps.get("jhlc") == null ? "" : maps.get("jhlc").toString());
446 v.setJhbc(maps.get("jhbc").toString() == null ? "" : maps.get("jhbc").toString());// 计划班次 488 v.setJhbc(maps.get("jhbc").toString() == null ? "" : maps.get("jhbc").toString());// 计划班次
447 v.setSjbc(maps.get("sjbc").toString() == null ? "" : maps.get("sjbc").toString());// 实际班次 489 v.setSjbc(maps.get("sjbc").toString() == null ? "" : maps.get("sjbc").toString());// 实际班次
448 } 490 }
@@ -476,8 +518,8 @@ public class FormsServiceImpl implements FormsService { @@ -476,8 +518,8 @@ public class FormsServiceImpl implements FormsService {
476 + " and '" + map.get("endDate").toString() + "' and xl_bm='"+ map.get("line").toString() + "' " 518 + " and '" + map.get("endDate").toString() + "' and xl_bm='"+ map.get("line").toString() + "' "
477 + " AND gs_bm is not null " 519 + " AND gs_bm is not null "
478 + " AND bc_type NOT IN ('in', 'out')" 520 + " AND bc_type NOT IN ('in', 'out')"
479 - /*+ " and gs_bm='"+ map.get("gsdmTurn").toString() + "'"  
480 - + " and fgs_bm='"+ map.get("fgsdmTurn").toString() + "'"*/ 521 + + " and gs_bm='"+ map.get("gsdmTurn").toString() + "'"
  522 + + " and fgs_bm='"+ map.get("fgsdmTurn").toString() + "'"
481 + " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type ) a left JOIN (" 523 + " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type ) a left JOIN ("
482 + " SELECT COUNT(*) as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl,t.warrant_car " 524 + " SELECT COUNT(*) as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl,t.warrant_car "
483 + " from bsth_c_line t RIGHT JOIN (select gs_bm,fgs_bm,xl_bm,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl,bc_type from bsth_c_s_sp_info_real " 525 + " from bsth_c_line t RIGHT JOIN (select gs_bm,fgs_bm,xl_bm,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl,bc_type from bsth_c_s_sp_info_real "
@@ -510,7 +552,7 @@ public class FormsServiceImpl implements FormsService { @@ -510,7 +552,7 @@ public class FormsServiceImpl implements FormsService {
510 tu.setBcjh(arg0.getString("jbc").toString()); 552 tu.setBcjh(arg0.getString("jbc").toString());
511 tu.setBcsj(arg0.getString("sbc").toString()); 553 tu.setBcsj(arg0.getString("sbc").toString());
512 tu.setBbzxl(result2 + "%");// 班次执行率 554 tu.setBbzxl(result2 + "%");// 班次执行率
513 - // tu.setSm(arg0.getString("gs_name").toString()); 555 + tu.setSm(arg0.getString("gs_name").toString());
514 tu.setGsgs(arg0.getString("gslsbm").toString()); 556 tu.setGsgs(arg0.getString("gslsbm").toString());
515 tu.setFgsgs(arg0.getString("fgsbm").toString()); 557 tu.setFgsgs(arg0.getString("fgsbm").toString());
516 return tu; 558 return tu;
@@ -547,8 +589,8 @@ public class FormsServiceImpl implements FormsService { @@ -547,8 +589,8 @@ public class FormsServiceImpl implements FormsService {
547 + " from bsth_c_s_sp_info" + " where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '" 589 + " from bsth_c_s_sp_info" + " where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"
548 + map.get("startDate").toString() + "' and '" + map.get("endDate").toString() + "' and xl_bm='" 590 + map.get("startDate").toString() + "' and '" + map.get("endDate").toString() + "' and xl_bm='"
549 + map.get("line").toString() + "' AND gs_bm is not null AND bc_type NOT IN ('in', 'out')" 591 + map.get("line").toString() + "' AND gs_bm is not null AND bc_type NOT IN ('in', 'out')"
550 - /*+ " and gs_bm='"+ map.get("gsdmEcecut").toString() + "'"  
551 - + " and fgs_bm='"+ map.get("fgsdmEcecut").toString() + "'"*/ 592 + + " and gs_bm='"+ map.get("gsdmEcecut").toString() + "'"
  593 + + " and fgs_bm='"+ map.get("fgsdmEcecut").toString() + "'"
552 + " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type ) a left JOIN (" 594 + " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type ) a left JOIN ("
553 + "SELECT COUNT(*) as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b.xl_name,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl " 595 + "SELECT COUNT(*) as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b.xl_name,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl "
554 + "from bsth_c_line t RIGHT JOIN (select gs_bm,fgs_bm,xl_bm,xl_name,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl,bc_type from bsth_c_s_sp_info_real " 596 + "from bsth_c_line t RIGHT JOIN (select gs_bm,fgs_bm,xl_bm,xl_name,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl,bc_type from bsth_c_s_sp_info_real "
@@ -618,8 +660,8 @@ public class FormsServiceImpl implements FormsService { @@ -618,8 +660,8 @@ public class FormsServiceImpl implements FormsService {
618 + " from bsth_c_s_sp_info" + " where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '" 660 + " from bsth_c_s_sp_info" + " where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"
619 + map.get("startDate").toString() + "' and '" + map.get("endDate").toString() + "' and xl_bm='" 661 + map.get("startDate").toString() + "' and '" + map.get("endDate").toString() + "' and xl_bm='"
620 + map.get("line").toString() + "' AND gs_bm is not null AND bc_type NOT IN ('in', 'out') " 662 + map.get("line").toString() + "' AND gs_bm is not null AND bc_type NOT IN ('in', 'out') "
621 - /*+ " and gs_bm='"+ map.get("gsdmAllline").toString() + "'"  
622 - + " and fgs_bm='"+ map.get("fgsdmAllline").toString() + "'"*/ 663 + + " and gs_bm='"+ map.get("gsdmAllline").toString() + "'"
  664 + + " and fgs_bm='"+ map.get("fgsdmAllline").toString() + "'"
623 + " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type ) a left JOIN (" 665 + " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type ) a left JOIN ("
624 + "SELECT COUNT(*" 666 + "SELECT COUNT(*"
625 + ") as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b." 667 + ") as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b."
@@ -655,18 +697,13 @@ public class FormsServiceImpl implements FormsService { @@ -655,18 +697,13 @@ public class FormsServiceImpl implements FormsService {
655 tu.setBcsj(arg0.getString("sbc").toString()); 697 tu.setBcsj(arg0.getString("sbc").toString());
656 tu.setBbzxl(result2 + "%");// 班次执行率 698 tu.setBbzxl(result2 + "%");// 班次执行率
657 699
658 - // tu.setSm(arg0.getString("xl_name").toString()); 700 + tu.setSm(arg0.getString("xl_name").toString());
659 tu.setGsgs(arg0.getString("gslsbm").toString()); 701 tu.setGsgs(arg0.getString("gslsbm").toString());
660 tu.setFgsgs(arg0.getString("fgsbm").toString()); 702 tu.setFgsgs(arg0.getString("fgsbm").toString());
661 return tu; 703 return tu;
662 - }  
663 -  
664 - 704 + }
665 }); 705 });
666 706
667 -  
668 -  
669 -  
670 return list; 707 return list;
671 } 708 }
672 } 709 }
src/main/resources/static/pages/forms/mould/linepasswengerflow.xls 0 → 100644
View file @d35c93f
No preview for this file type
src/main/resources/static/pages/forms/mould/operationservice.xls 0 → 100644
View file @d35c93f
No preview for this file type
src/main/resources/static/pages/forms/mould/shifday.xls 0 → 100644
View file @d35c93f
No preview for this file type
src/main/resources/static/pages/forms/mould/shiftuehiclemanth.xls 0 → 100644
View file @d35c93f
No preview for this file type
src/main/resources/static/pages/forms/mould/singledata.xls 0 → 100644
View file @d35c93f
No preview for this file type
src/main/resources/static/pages/forms/mould/vehicleloading.xls 0 → 100644
View file @d35c93f
No preview for this file type
src/main/resources/static/pages/forms/statement/allline.html
  View file @d35c93f
@@ -43,14 +43,18 @@ @@ -43,14 +43,18 @@
43 <div class="portlet light porttlet-fit bordered"> 43 <div class="portlet light porttlet-fit bordered">
44 <div class="portlet-title"> 44 <div class="portlet-title">
45 <form class="form-inline" action="" method="post"> 45 <form class="form-inline" action="" method="post">
46 - <!-- <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_allline">  
47 - <span class="item-label" style="width: 80px;">公司: </span>  
48 - <select class="form-control" name="company" id="gsdmAllline" style="width: 140px;"></select>  
49 - </div>  
50 - <div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_allline">  
51 - <span class="item-label" style="width: 80px;">分公司: </span>  
52 - <select class="form-control" name="subCompany" id="fgsdmAllline" style="width: 140px;"></select>  
53 - </div> --> 46 + <div style="display: inline-block; margin-left: 33px;"
  47 + id="gsdmDiv_allline">
  48 + <span class="item-label" style="width: 80px;">公司: </span> <select
  49 + class="form-control" name="company" id="gsdmAllline"
  50 + style="width: 140px;"></select>
  51 + </div>
  52 + <div style="display: inline-block; margin-left: 24px;"
  53 + id="fgsdmDiv_allline">
  54 + <span class="item-label" style="width: 80px;">分公司: </span> <select
  55 + class="form-control" name="subCompany" id="fgsdmAllline"
  56 + style="width: 140px;"></select>
  57 + </div>
54 <div style="display: inline-block;"> 58 <div style="display: inline-block;">
55 <span class="item-label" style="width: 80px;">线路: </span> <select 59 <span class="item-label" style="width: 80px;">线路: </span> <select
56 class="form-control" name="line" id="line" style="width: 120px;"></select> 60 class="form-control" name="line" id="line" style="width: 120px;"></select>
@@ -188,15 +192,20 @@ @@ -188,15 +192,20 @@
188 var endDate; 192 var endDate;
189 var gsdmAllline; 193 var gsdmAllline;
190 var fgsdmAllline; 194 var fgsdmAllline;
191 - $("#query").on("click",function() { 195 + $("#query")
  196 + .on(
  197 + "click",
  198 + function() {
192 line = $("#line").val(); 199 line = $("#line").val();
193 startDate1 = $("#startDate").val(); 200 startDate1 = $("#startDate").val();
194 endDate1 = $("#endDate").val(); 201 endDate1 = $("#endDate").val();
195 gsdmAllline = $("#gsdmAllline").val(); 202 gsdmAllline = $("#gsdmAllline").val();
196 fgsdmAllline = $("#fgsdmAllline").val(); 203 fgsdmAllline = $("#fgsdmAllline").val();
197 if (startDate1 != '' && endDate1 != '') { 204 if (startDate1 != '' && endDate1 != '') {
198 - $post('/mcy_forms/allline',{  
199 - /* gsdmAllline:gsdmAllline,fgsdmAllline:fgsdmAllline, */ 205 + $post(
  206 + '/mcy_forms/allline',
  207 + {
  208 + gsdmAllline:gsdmAllline,fgsdmAllline:fgsdmAllline,
200 line : line, 209 line : line,
201 startDate : $("#startDate").val(), 210 startDate : $("#startDate").val(),
202 endDate : $("#endDate").val(), 211 endDate : $("#endDate").val(),
@@ -285,7 +294,14 @@ @@ -285,7 +294,14 @@
285 $("#export").on( 294 $("#export").on(
286 "click", 295 "click",
287 function() { 296 function() {
  297 + line = $("#line").val();
  298 + startDate1 = $("#startDate").val();
  299 + endDate1 = $("#endDate").val();
  300 + gsdmAllline = $("#gsdmAllline").val();
  301 + fgsdmAllline = $("#fgsdmAllline").val();
288 $post('/mcy_export/alllineExport', { 302 $post('/mcy_export/alllineExport', {
  303 + gsdmAllline : gsdmAllline,
  304 + fgsdmAllline : fgsdmAllline,
289 line : line, 305 line : line,
290 startDate : startDate, 306 startDate : startDate,
291 endDate : endDate, 307 endDate : endDate,
src/main/resources/static/pages/forms/statement/changetochange.html
  View file @d35c93f
@@ -43,18 +43,22 @@ @@ -43,18 +43,22 @@
43 <div class="portlet light porttlet-fit bordered"> 43 <div class="portlet light porttlet-fit bordered">
44 <div class="portlet-title"> 44 <div class="portlet-title">
45 <form class="form-inline" action="" method="post"> 45 <form class="form-inline" action="" method="post">
46 - <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_change">  
47 - <span class="item-label" style="width: 80px;">公司: </span>  
48 - <select class="form-control" name="company" id="gsdmChange" style="width: 140px;"></select>  
49 - </div>  
50 - <div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_change">  
51 - <span class="item-label" style="width: 80px;">分公司: </span>  
52 - <select class="form-control" name="subCompany" id="fgsdmChange" style="width: 140px;"></select>  
53 - </div> 46 + <div style="display: inline-block; margin-left: 33px;"
  47 + id="gsdmDiv_change">
  48 + <span class="item-label" style="width: 80px;">公司: </span> <select
  49 + class="form-control" name="company" id="gsdmChange"
  50 + style="width: 140px;"></select>
  51 + </div>
  52 + <div style="display: inline-block; margin-left: 24px;"
  53 + id="fgsdmDiv_change">
  54 + <span class="item-label" style="width: 80px;">分公司: </span> <select
  55 + class="form-control" name="subCompany" id="fgsdmChange"
  56 + style="width: 140px;"></select>
  57 + </div>
54 <div style="display: inline-block;"> 58 <div style="display: inline-block;">
55 - <span class="item-label" style="width: 80px;">线路: </span>  
56 - <select class="form-control" name="line" id="line" style="width: 180px;"></select>  
57 - </div> 59 + <span class="item-label" style="width: 80px;">线路: </span> <select
  60 + class="form-control" name="line" id="line" style="width: 180px;"></select>
  61 + </div>
58 <div style="display: inline-block; margin-left: 15px;"> 62 <div style="display: inline-block; margin-left: 15px;">
59 <span class="item-label" style="width: 80px;">开始时间: </span> <input 63 <span class="item-label" style="width: 80px;">开始时间: </span> <input
60 class="form-control" type="text" id="startDate" 64 class="form-control" type="text" id="startDate"
@@ -139,51 +143,55 @@ @@ -139,51 +143,55 @@
139 locale : 'zh-cn' 143 locale : 'zh-cn'
140 }); 144 });
141 145
142 -  
143 var obj = []; 146 var obj = [];
144 - $.get('/user/companyData', function(result){ 147 + $.get('/user/companyData', function(result) {
145 obj = result; 148 obj = result;
146 var options = ''; 149 var options = '';
147 - for(var i = 0; i < obj.length; i++){  
148 - options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>'; 150 + for (var i = 0; i < obj.length; i++) {
  151 + options += '<option value="'+obj[i].companyCode+'">'
  152 + + obj[i].companyName + '</option>';
149 } 153 }
150 - if(obj.length ==0){  
151 - $("#gsdmDiv_change").css('display','none');  
152 - $('#fgsdmDiv_change').css('display','none');  
153 - }else if(obj.length ==1){  
154 - $("#gsdmDiv_change").css('display','none');  
155 - if(obj[0].children.length == 1 || obj[0].children.length ==0)  
156 - $('#fgsdmDiv_change').css('display','none'); 154 + if (obj.length == 0) {
  155 + $("#gsdmDiv_change").css('display', 'none');
  156 + $('#fgsdmDiv_change').css('display', 'none');
  157 + } else if (obj.length == 1) {
  158 + $("#gsdmDiv_change").css('display', 'none');
  159 + if (obj[0].children.length == 1 || obj[0].children.length == 0)
  160 + $('#fgsdmDiv_change').css('display', 'none');
157 } 161 }
158 $('#gsdmChange').html(options); 162 $('#gsdmChange').html(options);
159 updateCompany(); 163 updateCompany();
160 }); 164 });
161 165
162 - $("#gsdmChange").on("change",updateCompany);  
163 - function updateCompany(){ 166 + $("#gsdmChange").on("change", updateCompany);
  167 + function updateCompany() {
164 var company = $('#gsdmChange').val(); 168 var company = $('#gsdmChange').val();
165 var options = ''; 169 var options = '';
166 - for(var i = 0; i < obj.length; i++){  
167 - if(obj[i].companyCode == company){ 170 + for (var i = 0; i < obj.length; i++) {
  171 + if (obj[i].companyCode == company) {
168 var children = obj[i].children; 172 var children = obj[i].children;
169 - for(var j = 0; j < children.length; j++){  
170 - options += '<option value="'+children[j].code+'">'+children[j].name+'</option>'; 173 + for (var j = 0; j < children.length; j++) {
  174 + options += '<option value="'+children[j].code+'">'
  175 + + children[j].name + '</option>';
171 } 176 }
172 } 177 }
173 } 178 }
174 $('#fgsdmChange').html(options); 179 $('#fgsdmChange').html(options);
175 - } 180 + }
  181 +
  182 + $.get('/basic/lineCode2Name', function(result) {
  183 + var data = [];
176 184
177 - $.get('/basic/lineCode2Name',function(result){  
178 - var data=[];  
179 -  
180 - for(var code in result){  
181 - data.push({id: code, text: result[code]}); 185 + for ( var code in result) {
  186 + data.push({
  187 + id : code,
  188 + text : result[code]
  189 + });
182 } 190 }
183 - initPinYinSelect2('#line',data,'');  
184 - 191 + initPinYinSelect2('#line', data, '');
  192 +
185 }) 193 })
186 - 194 +
187 var line; 195 var line;
188 var startDate; 196 var startDate;
189 var endDate; 197 var endDate;
@@ -194,7 +202,8 @@ @@ -194,7 +202,8 @@
194 sel = $("#sel").val(); 202 sel = $("#sel").val();
195 var startDate1 = $("#startDate").val(); 203 var startDate1 = $("#startDate").val();
196 var endDate1 = $("#endDate").val(); 204 var endDate1 = $("#endDate").val();
197 - 205 + var gsdmChange= $("#gsdmChange").val();
  206 + var fgsdmChange= $("#fgsdmChange").val();
198 if (startDate1 != '' && endDate1 != '') { 207 if (startDate1 != '' && endDate1 != '') {
199 $post('/mcy_forms/changetochange', { 208 $post('/mcy_forms/changetochange', {
200 sel : sel, 209 sel : sel,
@@ -235,7 +244,15 @@ @@ -235,7 +244,15 @@
235 $("#export").on( 244 $("#export").on(
236 "click", 245 "click",
237 function() { 246 function() {
  247 + var startDate = $("#startDate").val();
  248 + var endDate = $("#endDate").val();
  249 + var lpName = $("#lpName").val();
  250 + var gsdmChange= $("#gsdmChange").val();
  251 + var fgsdmChange= $("#fgsdmChange").val();
238 $post('/mcy_export/changetochangeExport', { 252 $post('/mcy_export/changetochangeExport', {
  253 + line:line,
  254 + gsdmChange:gsdmChange,
  255 + fgsdmChange:fgsdmChange,
239 startDate : startDate, 256 startDate : startDate,
240 endDate : endDate, 257 endDate : endDate,
241 type : 'export' 258 type : 'export'
src/main/resources/static/pages/forms/statement/executionrate.html
  View file @d35c93f
@@ -37,14 +37,14 @@ @@ -37,14 +37,14 @@
37 <div class="portlet light porttlet-fit bordered"> 37 <div class="portlet light porttlet-fit bordered">
38 <div class="portlet-title"> 38 <div class="portlet-title">
39 <form class="form-inline" action="" method="post"> 39 <form class="form-inline" action="" method="post">
40 - <!-- <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_ececut"> 40 + <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_ececut">
41 <span class="item-label" style="width: 80px;">公司: </span> 41 <span class="item-label" style="width: 80px;">公司: </span>
42 <select class="form-control" name="company" id="gsdmEcecut" style="width: 140px;"></select> 42 <select class="form-control" name="company" id="gsdmEcecut" style="width: 140px;"></select>
43 </div> 43 </div>
44 <div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_ececut"> 44 <div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_ececut">
45 <span class="item-label" style="width: 80px;">分公司: </span> 45 <span class="item-label" style="width: 80px;">分公司: </span>
46 <select class="form-control" name="subCompany" id="fgsdmEcecut" style="width: 140px;"></select> 46 <select class="form-control" name="subCompany" id="fgsdmEcecut" style="width: 140px;"></select>
47 - </div> --> 47 + </div>
48 <div style="display: inline-block;"> 48 <div style="display: inline-block;">
49 <span class="item-label" style="width: 80px;">线路: </span> 49 <span class="item-label" style="width: 80px;">线路: </span>
50 <select class="form-control" name="line" id="line" style="width: 120px;"></select> 50 <select class="form-control" name="line" id="line" style="width: 120px;"></select>
@@ -71,7 +71,7 @@ @@ -71,7 +71,7 @@
71 <th colspan="11">班次执行率统计表</th> 71 <th colspan="11">班次执行率统计表</th>
72 </tr> 72 </tr>
73 <tr> 73 <tr>
74 - <td rowspan="2" style=" padding-top: 20px;">日期</td> 74 + <td rowspan="2" style=" padding-top: 20px;">日期</td>
75 <td rowspan="2" style=" padding-top: 20px;">公司</td> 75 <td rowspan="2" style=" padding-top: 20px;">公司</td>
76 <td rowspan="2" style=" padding-top: 20px;">直属公司</td> 76 <td rowspan="2" style=" padding-top: 20px;">直属公司</td>
77 <td rowspan="2" style=" padding-top: 20px;">线路条数</td> 77 <td rowspan="2" style=" padding-top: 20px;">线路条数</td>
@@ -181,15 +181,15 @@ @@ -181,15 +181,15 @@
181 gsdmEcecut=$("#gsdmEcecut").val(); 181 gsdmEcecut=$("#gsdmEcecut").val();
182 fgsdmEcecut=$("#fgsdmEcecut").val(); 182 fgsdmEcecut=$("#fgsdmEcecut").val();
183 if(startDate1!=''&&endDate1!=''){ 183 if(startDate1!=''&&endDate1!=''){
184 - $post('/mcy_forms/executionrate',{/* gsdmEcecut:gsdmEcecut,fgsdmEcecut:fgsdmEcecut, */line:line,startDate:$("#startDate").val(),endDate:$("#endDate").val(),type:'query'},function(result){ 184 + $post('/mcy_forms/executionrate',{ gsdmEcecut:gsdmEcecut,fgsdmEcecut:fgsdmEcecut, line:line,startDate:$("#startDate").val(),endDate:$("#endDate").val(),type:'query'},function(result){
185 // 把数据填充到模版中 185 // 把数据填充到模版中
186 var tbodyHtml = template('executionrate',{list:result}); 186 var tbodyHtml = template('executionrate',{list:result});
187 // 把渲染好的模版html文本追加到表格中 187 // 把渲染好的模版html文本追加到表格中
188 $('#tbody').html(tbodyHtml); 188 $('#tbody').html(tbodyHtml);
189 - line = $("#line").val(); 189 + line = $("#line").val();
190 190
191 - startDate = $("#startDate").val();  
192 - endDate = $("#endDate").val(); 191 + startDate = $("#startDate").val();
  192 + endDate = $("#endDate").val();
193 $("#sDate").text(startDate); 193 $("#sDate").text(startDate);
194 $("#eDate").text(endDate); 194 $("#eDate").text(endDate);
195 195
@@ -240,7 +240,12 @@ @@ -240,7 +240,12 @@
240 }); 240 });
241 241
242 $("#export").on("click",function(){ 242 $("#export").on("click",function(){
243 - $post('/mcy_export/executionrateExport',{line:line,startDate:startDate,endDate:endDate,type:'export'},function(result){ 243 + line = $("#line").val();
  244 + startDate=$("#startDate").val();
  245 + endDate=$("#endDate").val();
  246 + gsdmEcecut=$("#gsdmEcecut").val();
  247 + fgsdmEcecut=$("#fgsdmEcecut").val();
  248 + $post('/mcy_export/executionrateExport',{gsdmEcecut:gsdmEcecut,fgsdmEcecut:fgsdmEcecut,line:line,startDate:startDate,endDate:endDate,type:'export'},function(result){
244 window.open("/downloadFile/download?fileName=班次执行率统计表"+moment(startDate).format("YYYYMMDD")); 249 window.open("/downloadFile/download?fileName=班次执行率统计表"+moment(startDate).format("YYYYMMDD"));
245 }); 250 });
246 }); 251 });
src/main/resources/static/pages/forms/statement/linepassengerflow.html
  View file @d35c93f
@@ -27,14 +27,14 @@ @@ -27,14 +27,14 @@
27 <div class="portlet light porttlet-fit bordered"> 27 <div class="portlet light porttlet-fit bordered">
28 <div class="portlet-title"> 28 <div class="portlet-title">
29 <form class="form-inline" action=""> 29 <form class="form-inline" action="">
30 - <!-- <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_line"> 30 + <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_line">
31 <span class="item-label" style="width: 80px;">公司: </span> 31 <span class="item-label" style="width: 80px;">公司: </span>
32 <select class="form-control" name="company" id="gsdmLine" style="width: 140px;"></select> 32 <select class="form-control" name="company" id="gsdmLine" style="width: 140px;"></select>
33 </div> 33 </div>
34 <div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_line"> 34 <div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_line">
35 <span class="item-label" style="width: 80px;">分公司: </span> 35 <span class="item-label" style="width: 80px;">分公司: </span>
36 <select class="form-control" name="subCompany" id="fgsdmLine" style="width: 140px;"></select> 36 <select class="form-control" name="subCompany" id="fgsdmLine" style="width: 140px;"></select>
37 - </div> --> 37 + </div>
38 <div style="display: inline-block;"> 38 <div style="display: inline-block;">
39 <span class="item-label" style="width: 80px;">线路: </span> 39 <span class="item-label" style="width: 80px;">线路: </span>
40 <select class="form-control" name="line" id="line" style="width: 180px;"></select> 40 <select class="form-control" name="line" id="line" style="width: 180px;"></select>
@@ -140,7 +140,7 @@ @@ -140,7 +140,7 @@
140 var date = $("#date").val(); 140 var date = $("#date").val();
141 var gsdmLine = $("#gsdmLine").val(); 141 var gsdmLine = $("#gsdmLine").val();
142 var fgsdmLine = $("#fgsdmLine").val(); 142 var fgsdmLine = $("#fgsdmLine").val();
143 - $post('/mcy_forms/linepasswengerflow',{/* gsdmLine:gsdmLine,fgsdmLine:fgsdmLine, */line:line,date:date,type:'query'},function(result){ 143 + $post('/mcy_forms/linepasswengerflow',{ gsdmLine:gsdmLine,fgsdmLine:fgsdmLine,line:line,date:date,type:'query'},function(result){
144 $.each(result, function(i, obj) { 144 $.each(result, function(i, obj) {
145 obj.requestType = reqCodeMap[obj.requestType]; 145 obj.requestType = reqCodeMap[obj.requestType];
146 }); 146 });
@@ -150,6 +150,16 @@ @@ -150,6 +150,16 @@
150 $('#forms tbody').html(tbodyHtml); 150 $('#forms tbody').html(tbodyHtml);
151 }); 151 });
152 }); 152 });
  153 +
  154 + $("#export").on("click",function(){
  155 + var line = $("#line").val();
  156 + var date = $("#date").val();
  157 + var gsdmLine = $("#gsdmLine").val();
  158 + var fgsdmLine = $("#fgsdmLine").val();
  159 + $post('/mcy_export/linepasswengerflowExport',{gsdmLine:gsdmLine,fgsdmLine:fgsdmLine,line:line,date:date,type:'export'},function(result){
  160 + window.open("/downloadFile/download?fileName=线路客流量报表"+moment(date).format("YYYYMMDD"));
  161 + });
  162 + });
153 }); 163 });
154 </script> 164 </script>
155 <script type="text/html" id="list_linepasswengerflow"> 165 <script type="text/html" id="list_linepasswengerflow">
src/main/resources/static/pages/forms/statement/operationservice.html
  View file @d35c93f
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 <div class="portlet light porttlet-fit bordered"> 30 <div class="portlet light porttlet-fit bordered">
31 <div class="portlet-title"> 31 <div class="portlet-title">
32 <form class="form-inline" action="" method="post"> 32 <form class="form-inline" action="" method="post">
33 - <!--<div style="display: inline-block; margin-left: 33px;" 33 + <div style="display: inline-block; margin-left: 33px;"
34 id="gsdmDiv_operat"> 34 id="gsdmDiv_operat">
35 <span class="item-label" style="width: 80px;">公司: </span> <select 35 <span class="item-label" style="width: 80px;">公司: </span> <select
36 class="form-control" name="company" id="gsdmOperat" 36 class="form-control" name="company" id="gsdmOperat"
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
41 <span class="item-label" style="width: 80px;">分公司: </span> <select 41 <span class="item-label" style="width: 80px;">分公司: </span> <select
42 class="form-control" name="subCompany" id="fgsdmOperat" 42 class="form-control" name="subCompany" id="fgsdmOperat"
43 style="width: 140px;"></select> 43 style="width: 140px;"></select>
44 - </div> --> 44 + </div>
45 <div style="display: inline-block;"> 45 <div style="display: inline-block;">
46 <span class="item-label" style="width: 80px;">线路: </span> <select 46 <span class="item-label" style="width: 80px;">线路: </span> <select
47 class="form-control" name="line" id="line" style="width: 180px;"></select> 47 class="form-control" name="line" id="line" style="width: 180px;"></select>
@@ -173,11 +173,11 @@ @@ -173,11 +173,11 @@
173 var startDate = $("#startDate").val(); 173 var startDate = $("#startDate").val();
174 var endDate = $("#endDate").val(); 174 var endDate = $("#endDate").val();
175 var lpName = $("#lpName").val(); 175 var lpName = $("#lpName").val();
176 - /* var gsdmOperat = $("#gsdmOperat").val();  
177 - var fgsdmOperat = $("#fgsdmOperat").val(); */ 176 + var gsdmOperat = $("#gsdmOperat").val();
  177 + var fgsdmOperat = $("#fgsdmOperat").val();
178 $post("/mcy_forms/operationservice", { 178 $post("/mcy_forms/operationservice", {
179 - /* gsdmOperat : gsdmOperat,  
180 - fgsdmOperat : fgsdmOperat, */ 179 + gsdmOperat : gsdmOperat,
  180 + fgsdmOperat : fgsdmOperat,
181 line : line, 181 line : line,
182 startDate : startDate, 182 startDate : startDate,
183 endDate : endDate, 183 endDate : endDate,
@@ -206,6 +206,18 @@ @@ -206,6 +206,18 @@
206 206
207 }); 207 });
208 }); 208 });
  209 + $("#export").on("click",function(){
  210 + line = $("#line").val();
  211 + startDate=$("#startDate").val();
  212 + endDate=$("#endDate").val();
  213 + gsdmOperat=$("#gsdmOperat").val();
  214 + fgsdmOperat=$("#fgsdmOperat").val();
  215 + $post('/mcy_export/operationserviceExport',{gsdmOperat:gsdmOperat,fgsdmOperat:fgsdmOperat,line:line,startDate:startDate,endDate:endDate,type:'export'},function(result){
  216 + window.open("/downloadFile/download?fileName=运营服务阶段报表"+moment(startDate).format("YYYYMMDD"));
  217 + });
  218 + });
  219 +
  220 +
209 }); 221 });
210 </script> 222 </script>
211 <script type="text/html" id="operationservice"> 223 <script type="text/html" id="operationservice">
src/main/resources/static/pages/forms/statement/shifday.html
  View file @d35c93f
@@ -28,14 +28,14 @@ @@ -28,14 +28,14 @@
28 <div class="portlet light porttlet-fit bordered"> 28 <div class="portlet light porttlet-fit bordered">
29 <div class="portlet-title"> 29 <div class="portlet-title">
30 <form class="form-inline" action="" method="post"> 30 <form class="form-inline" action="" method="post">
31 - <!-- <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_shif"> 31 + <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_shif">
32 <span class="item-label" style="width: 80px;">公司: </span> 32 <span class="item-label" style="width: 80px;">公司: </span>
33 <select class="form-control" name="company" id="gsdmShif" style="width: 140px;"></select> 33 <select class="form-control" name="company" id="gsdmShif" style="width: 140px;"></select>
34 </div> 34 </div>
35 <div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_shif"> 35 <div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_shif">
36 <span class="item-label" style="width: 80px;">分公司: </span> 36 <span class="item-label" style="width: 80px;">分公司: </span>
37 <select class="form-control" name="subCompany" id="fgsdmShif" style="width: 140px;"></select> 37 <select class="form-control" name="subCompany" id="fgsdmShif" style="width: 140px;"></select>
38 - </div> --> 38 + </div>
39 <div style="display: inline-block;"> 39 <div style="display: inline-block;">
40 <span class="item-label" style="width: 80px;">线路: </span> 40 <span class="item-label" style="width: 80px;">线路: </span>
41 <select class="form-control" name="line" id="line" style="width: 180px;"></select> 41 <select class="form-control" name="line" id="line" style="width: 180px;"></select>
@@ -154,9 +154,9 @@ $(function(){ @@ -154,9 +154,9 @@ $(function(){
154 $("#query").on("click",function(){ 154 $("#query").on("click",function(){
155 var line = $("#line").val(); 155 var line = $("#line").val();
156 var date = $("#date").val(); 156 var date = $("#date").val();
157 - /* var gsdmShif = $("#gsdmShif").val();  
158 - var fgsdmShif = $("#fgsdmShif").val(); */  
159 - $post('/mcy_forms/shifday',{/* gsdmShif:gsdmShif,fgsdmShif:fgsdmShif, */line:line,date:date},function(result){ 157 + var gsdmShif = $("#gsdmShif").val();
  158 + var fgsdmShif = $("#fgsdmShif").val();
  159 + $post('/mcy_forms/shifday',{gsdmShif:gsdmShif,fgsdmShif:fgsdmShif, line:line,date:date},function(result){
160 $.each(result, function(i, obj) { 160 $.each(result, function(i, obj) {
161 obj.requestType = reqCodeMap[obj.requestType]; 161 obj.requestType = reqCodeMap[obj.requestType];
162 }); 162 });
@@ -166,6 +166,16 @@ $(function(){ @@ -166,6 +166,16 @@ $(function(){
166 $('#forms tbody').html(tbodyHtml); 166 $('#forms tbody').html(tbodyHtml);
167 }); 167 });
168 }); 168 });
  169 +
  170 + $("#export").on("click",function(){
  171 + var line = $("#line").val();
  172 + var date = $("#date").val();
  173 + var gsdmShif = $("#gsdmShif").val();
  174 + var fgsdmShif = $("#fgsdmShif").val();
  175 + $post('/mcy_export/shifdayExport',{gsdmShif:gsdmShif,fgsdmShif:fgsdmShif,line:line,date:date,type:'export'},function(result){
  176 + window.open("/downloadFile/download?fileName=班次车辆人员日报表"+moment(date).format("YYYYMMDD"));
  177 + });
  178 + });
169 }); 179 });
170 </script> 180 </script>
171 <script type="text/html" id="shifday"> 181 <script type="text/html" id="shifday">
@@ -175,7 +185,6 @@ $(function(){ @@ -175,7 +185,6 @@ $(function(){
175 <td>{{obj.sName}}</td> 185 <td>{{obj.sName}}</td>
176 <td>{{obj.lpName}}</td> 186 <td>{{obj.lpName}}</td>
177 <td>{{obj.carPlate}}</td> 187 <td>{{obj.carPlate}}</td>
178 -  
179 <td>{{obj.jhlc}}</td> 188 <td>{{obj.jhlc}}</td>
180 <td>{{obj.sjjhlc}}</td> 189 <td>{{obj.sjjhlc}}</td>
181 <td>{{obj.yygl}}</td> 190 <td>{{obj.yygl}}</td>
src/main/resources/static/pages/forms/statement/shiftuehiclemanth.html
  View file @d35c93f
@@ -28,14 +28,14 @@ @@ -28,14 +28,14 @@
28 <div class="portlet light porttlet-fit bordered"> 28 <div class="portlet light porttlet-fit bordered">
29 <div class="portlet-title"> 29 <div class="portlet-title">
30 <form class="form-inline" action=""> 30 <form class="form-inline" action="">
31 - <!-- <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_manth"> 31 + <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_manth">
32 <span class="item-label" style="width: 80px;">公司: </span> 32 <span class="item-label" style="width: 80px;">公司: </span>
33 <select class="form-control" name="company" id="gsdmManth" style="width: 140px;"></select> 33 <select class="form-control" name="company" id="gsdmManth" style="width: 140px;"></select>
34 </div> 34 </div>
35 <div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_manth"> 35 <div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_manth">
36 <span class="item-label" style="width: 80px;">分公司: </span> 36 <span class="item-label" style="width: 80px;">分公司: </span>
37 <select class="form-control" name="subCompany" id="fgsdmManth" style="width: 140px;"></select> 37 <select class="form-control" name="subCompany" id="fgsdmManth" style="width: 140px;"></select>
38 - </div> --> 38 + </div>
39 <div style="display: inline-block;"> 39 <div style="display: inline-block;">
40 <span class="item-label" style="width: 80px;">线路: </span> 40 <span class="item-label" style="width: 80px;">线路: </span>
41 <select class="form-control" name="line" id="line" style="width: 136px;"></select> 41 <select class="form-control" name="line" id="line" style="width: 136px;"></select>
@@ -183,9 +183,9 @@ @@ -183,9 +183,9 @@
183 var startDate = $("#startDate").val(); 183 var startDate = $("#startDate").val();
184 var endDate = $("#endDate").val(); 184 var endDate = $("#endDate").val();
185 var lpName = $("#lpName").val(); 185 var lpName = $("#lpName").val();
186 - /* var gsdmManth= $("#gsdmManth").val();  
187 - var fgsdmManth= $("#fgsdmManth").val(); */  
188 - $post("/mcy_forms/shiftuehiclemanth",{/* gsdmManth:gsdmManth,fgsdmManth:fgsdmManth, */line:line,startDate:startDate,endDate:endDate ,lpName:lpName},function(result){ 186 + var gsdmManth= $("#gsdmManth").val();
  187 + var fgsdmManth= $("#fgsdmManth").val();
  188 + $post("/mcy_forms/shiftuehiclemanth",{gsdmManth:gsdmManth,fgsdmManth:fgsdmManth, line:line,startDate:startDate,endDate:endDate ,lpName:lpName},function(result){
189 $("#sDate").text(startDate); 189 $("#sDate").text(startDate);
190 $("#eDate").text(endDate); 190 $("#eDate").text(endDate);
191 var temp = {}; 191 var temp = {};
@@ -203,7 +203,20 @@ @@ -203,7 +203,20 @@
203 $('#forms tbody').html(list_shiftuehiclemanth); 203 $('#forms tbody').html(list_shiftuehiclemanth);
204 204
205 }); 205 });
206 - }); 206 + });
  207 +
  208 + $("#export").on("click",function(){
  209 + var line = $("#line").val();
  210 + var startDate = $("#startDate").val();
  211 + var endDate = $("#endDate").val();
  212 + var lpName = $("#lpName").val();
  213 + var gsdmManth= $("#gsdmManth").val();
  214 + var fgsdmManth= $("#fgsdmManth").val();
  215 + $post('/mcy_export/shiftuehiclemanthExport',{gsdmManth:gsdmManth,fgsdmManth:fgsdmManth,line:line,startDate:startDate,endDate:endDate,type:'export'},function(result){
  216 + window.open("/downloadFile/download?fileName=班次车辆人员月报表"+moment(startDate).format("YYYYMMDD"));
  217 + });
  218 + });
  219 +
207 }); 220 });
208 </script> 221 </script>
209 <script type="text/html" id="list_shiftuehiclemanth"> 222 <script type="text/html" id="list_shiftuehiclemanth">
src/main/resources/static/pages/forms/statement/singledata.html
  View file @d35c93f
@@ -28,14 +28,14 @@ @@ -28,14 +28,14 @@
28 <div class="portlet light porttlet-fit bordered"> 28 <div class="portlet light porttlet-fit bordered">
29 <div class="portlet-title"> 29 <div class="portlet-title">
30 <form class="form-inline" action=""> 30 <form class="form-inline" action="">
31 - <!-- <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_sing"> 31 + <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_sing">
32 <span class="item-label" style="width: 80px;">公司: </span> 32 <span class="item-label" style="width: 80px;">公司: </span>
33 <select class="form-control" name="company" id="gsdmSing" style="width: 140px;"></select> 33 <select class="form-control" name="company" id="gsdmSing" style="width: 140px;"></select>
34 </div> 34 </div>
35 <div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_sing"> 35 <div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_sing">
36 <span class="item-label" style="width: 80px;">分公司: </span> 36 <span class="item-label" style="width: 80px;">分公司: </span>
37 <select class="form-control" name="subCompany" id="fgsdmSing" style="width: 140px;"></select> 37 <select class="form-control" name="subCompany" id="fgsdmSing" style="width: 140px;"></select>
38 - </div> --> 38 + </div>
39 <div style="display: inline-block;"> 39 <div style="display: inline-block;">
40 <span class="item-label" style="width: 80px;">线路: </span> 40 <span class="item-label" style="width: 80px;">线路: </span>
41 <select class="form-control" name="line" id="line" style="width: 136px;"></select> 41 <select class="form-control" name="line" id="line" style="width: 136px;"></select>
@@ -152,9 +152,9 @@ @@ -152,9 +152,9 @@
152 var startDate = $("#startDate").val(); 152 var startDate = $("#startDate").val();
153 var endDate = $("#endDate").val(); 153 var endDate = $("#endDate").val();
154 var lpName = $("#lpName").val(); 154 var lpName = $("#lpName").val();
155 - /* var gsdmSing = $("#gsdmSing").val();  
156 - var fgsdmSing = $("#fgsdmSing").val(); */  
157 - $post("/mcy_forms/singledata",{/* gsdmSing:gsdmSing,fgsdmSing:fgsdmSing, */line:line,startDate:startDate,endDate:endDate ,lpName:lpName},function(result){ 155 + var gsdmSing = $("#gsdmSing").val();
  156 + var fgsdmSing = $("#fgsdmSing").val();
  157 + $post("/mcy_forms/singledata",{ gsdmSing:gsdmSing,fgsdmSing:fgsdmSing, line:line,startDate:startDate,endDate:endDate ,lpName:lpName},function(result){
158 $("#sDate").text(startDate); 158 $("#sDate").text(startDate);
159 $("#eDate").text(endDate); 159 $("#eDate").text(endDate);
160 var temp = {}; 160 var temp = {};
@@ -172,6 +172,18 @@ @@ -172,6 +172,18 @@
172 172
173 }); 173 });
174 }); 174 });
  175 +
  176 + $("#export").on("click",function(){
  177 + var line = $("#line").val();
  178 + var startDate = $("#startDate").val();
  179 + var endDate = $("#endDate").val();
  180 + var lpName = $("#lpName").val();
  181 + var gsdmSing = $("#gsdmSing").val();
  182 + var fgsdmSing = $("#fgsdmSing").val();
  183 + $post('/mcy_export/singledataExport',{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,type:'export'},function(result){
  184 + window.open("/downloadFile/download?fileName=路单数据"+moment(startDate).format("YYYYMMDD"));
  185 + });
  186 + });
175 }); 187 });
176 </script> 188 </script>
177 <script type="text/html" id="singledata"> 189 <script type="text/html" id="singledata">
src/main/resources/static/pages/forms/statement/turnoutrate.html
  View file @d35c93f
@@ -37,14 +37,14 @@ @@ -37,14 +37,14 @@
37 <div class="portlet light porttlet-fit bordered"> 37 <div class="portlet light porttlet-fit bordered">
38 <div class="portlet-title"> 38 <div class="portlet-title">
39 <form class="form-inline" action="" method="post"> 39 <form class="form-inline" action="" method="post">
40 - <!-- <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_turn"> 40 + <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_turn">
41 <span class="item-label" style="width: 80px;">公司: </span> 41 <span class="item-label" style="width: 80px;">公司: </span>
42 <select class="form-control" name="company" id="gsdmTurn" style="width: 140px;"></select> 42 <select class="form-control" name="company" id="gsdmTurn" style="width: 140px;"></select>
43 </div> 43 </div>
44 <div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_turn"> 44 <div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_turn">
45 <span class="item-label" style="width: 80px;">分公司: </span> 45 <span class="item-label" style="width: 80px;">分公司: </span>
46 <select class="form-control" name="subCompany" id="fgsdmTurn" style="width: 140px;"></select> 46 <select class="form-control" name="subCompany" id="fgsdmTurn" style="width: 140px;"></select>
47 - </div> --> 47 + </div>
48 <div style="display: inline-block;"> 48 <div style="display: inline-block;">
49 <span class="item-label" style="width: 80px;">线路: </span> 49 <span class="item-label" style="width: 80px;">线路: </span>
50 <select class="form-control" name="line" id="line" style="width: 120px;"></select> 50 <select class="form-control" name="line" id="line" style="width: 120px;"></select>
@@ -183,7 +183,7 @@ @@ -183,7 +183,7 @@
183 gsdmTurn=$("#gsdmTurn").val(); 183 gsdmTurn=$("#gsdmTurn").val();
184 fgsdmTurn=$("#fgsdmTurn").val(); 184 fgsdmTurn=$("#fgsdmTurn").val();
185 if(startDate1!=''&&endDate1!=''){ 185 if(startDate1!=''&&endDate1!=''){
186 - $post('/mcy_forms/turnoutrate',{/* gsdmTurn:gsdmTurn,fgsdmTurn:fgsdmTurn, */line:line,startDate:$("#startDate").val(),endDate:$("#endDate").val(),type:'query'},function(result){ 186 + $post('/mcy_forms/turnoutrate',{ gsdmTurn:gsdmTurn,fgsdmTurn:fgsdmTurn, line:line,startDate:$("#startDate").val(),endDate:$("#endDate").val(),type:'query'},function(result){
187 // 把数据填充到模版中 187 // 把数据填充到模版中
188 var tbodyHtml = template('turnoutrate',{list:result}); 188 var tbodyHtml = template('turnoutrate',{list:result});
189 // 把渲染好的模版html文本追加到表格中 189 // 把渲染好的模版html文本追加到表格中
@@ -243,7 +243,12 @@ @@ -243,7 +243,12 @@
243 }); 243 });
244 244
245 $("#export").on("click",function(){ 245 $("#export").on("click",function(){
246 - $post('/mcy_export/turnoutrateExport',{line:line,startDate:startDate,endDate:endDate,type:'export'},function(result){ 246 + line = $("#line").val();
  247 + startDate=$("#startDate").val();
  248 + endDate=$("#endDate").val();
  249 + gsdmTurn=$("#gsdmTurn").val();
  250 + fgsdmTurn=$("#fgsdmTurn").val();
  251 + $post('/mcy_export/turnoutrateExport',{gsdmTurn:gsdmTurn,fgsdmTurn:fgsdmTurn,line:line,startDate:startDate,endDate:endDate,type:'export'},function(result){
247 window.open("/downloadFile/download?fileName=营运线路出车率统计表"+moment(startDate).format("YYYYMMDD")); 252 window.open("/downloadFile/download?fileName=营运线路出车率统计表"+moment(startDate).format("YYYYMMDD"));
248 }); 253 });
249 }); 254 });
src/main/resources/static/pages/forms/statement/vehicleloading.html
  View file @d35c93f
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 19
20 <div class="page-head"> 20 <div class="page-head">
21 <div class="page-title"> 21 <div class="page-title">
22 - <h1>车辆加注/消耗量</h1> 22 + <h1>车辆加注</h1>
23 </div> 23 </div>
24 </div> 24 </div>
25 25
@@ -28,14 +28,14 @@ @@ -28,14 +28,14 @@
28 <div class="portlet light porttlet-fit bordered"> 28 <div class="portlet light porttlet-fit bordered">
29 <div class="portlet-title"> 29 <div class="portlet-title">
30 <form class="form-inline" action="" method="post"> 30 <form class="form-inline" action="" method="post">
31 - <!-- <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_vehic"> 31 + <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_vehic">
32 <span class="item-label" style="width: 80px;">公司: </span> 32 <span class="item-label" style="width: 80px;">公司: </span>
33 <select class="form-control" name="company" id="gsdmVehic" style="width: 140px;"></select> 33 <select class="form-control" name="company" id="gsdmVehic" style="width: 140px;"></select>
34 </div> 34 </div>
35 <div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_vehic"> 35 <div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_vehic">
36 <span class="item-label" style="width: 80px;">分公司: </span> 36 <span class="item-label" style="width: 80px;">分公司: </span>
37 <select class="form-control" name="subCompany" id="fgsdmVehic" style="width: 140px;"></select> 37 <select class="form-control" name="subCompany" id="fgsdmVehic" style="width: 140px;"></select>
38 - </div> --> 38 + </div>
39 <div style="display: inline-block;"> 39 <div style="display: inline-block;">
40 <span class="item-label" style="width: 80px;">线路: </span> 40 <span class="item-label" style="width: 80px;">线路: </span>
41 <select class="form-control" name="line" id="line" style="width: 180px;"></select> 41 <select class="form-control" name="line" id="line" style="width: 180px;"></select>
@@ -135,18 +135,32 @@ @@ -135,18 +135,32 @@
135 }) 135 })
136 136
137 137
  138 + var line ;
  139 + var date ;
  140 + var gsdmVehic ;
  141 + var fgsdmVehic ;
138 $("#query").on("click",function(){ 142 $("#query").on("click",function(){
139 - var line = $("#line").val();  
140 - var date = $("#date").val();  
141 - /* var gsdmVehic = $("#gsdmVehic").val();  
142 - var fgsdmVehic = $("#fgsdmVehic").val(); */  
143 - $post('/mcy_forms/vehicleloading',{line:line,data:date},function(result){ 143 + line = $("#line").val();
  144 + date = $("#date").val();
  145 + gsdmVehic = $("#gsdmVehic").val();
  146 + fgsdmVehic = $("#fgsdmVehic").val();
  147 + $post('/mcy_forms/vehicleloading',{line:line,data:date, gsdmVehic: gsdmVehic,fgsdmVehic:fgsdmVehic},function(result){
144 // 把数据填充到模版中 148 // 把数据填充到模版中
145 var tbodyHtml = template('vehicleloading',{list:result}); 149 var tbodyHtml = template('vehicleloading',{list:result});
146 // 把渲染好的模版html文本追加到表格中 150 // 把渲染好的模版html文本追加到表格中
147 $('#forms tbody').html(tbodyHtml); 151 $('#forms tbody').html(tbodyHtml);
148 }); 152 });
149 - }); 153 + });
  154 +
  155 + $("#export").on("click",function(){
  156 + line = $("#line").val();
  157 + date = $("#date").val();
  158 + gsdmVehic = $("#gsdmVehic").val();
  159 + fgsdmVehic = $("#fgsdmVehic").val();
  160 + $post('/mcy_export/vehicleloadingExport',{line:line,data:date,gsdmVehic: gsdmVehic,fgsdmVehic:fgsdmVehic,type:'export'},function(result){
  161 + window.open("/downloadFile/download?fileName=车辆加注"+moment(date).format("YYYYMMDD"));
  162 + });
  163 + });
150 }); 164 });
151 </script> 165 </script>
152 <script type="text/html" id="vehicleloading"> 166 <script type="text/html" id="vehicleloading">
@@ -157,8 +171,8 @@ @@ -157,8 +171,8 @@
157 <td>{{obj.gS}}</td> 171 <td>{{obj.gS}}</td>
158 <td>{{obj.xL}}</td> 172 <td>{{obj.xL}}</td>
159 <td>{{obj.clzbh}}</td> 173 <td>{{obj.clzbh}}</td>
  174 + <td>{{obj.jzl}}</td>
160 <td>{{obj.hyl}}</td> 175 <td>{{obj.hyl}}</td>
161 - <td>{{obj.jzl}}</td>  
162 <td> </td> 176 <td> </td>
163 <td>{{obj.jhlc}}</td> 177 <td>{{obj.jhlc}}</td>
164 <td> </td> 178 <td> </td>
src/main/resources/static/pages/forms/statement/waybillday.html
  View file @d35c93f
@@ -28,14 +28,14 @@ @@ -28,14 +28,14 @@
28 <div class="portlet light porttlet-fit bordered"> 28 <div class="portlet light porttlet-fit bordered">
29 <div class="portlet-title"> 29 <div class="portlet-title">
30 <form class="form-inline" action="" method="post"> 30 <form class="form-inline" action="" method="post">
31 - <!-- <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_waybillday"> 31 + <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_waybillday">
32 <span class="item-label" style="width: 80px;">公司: </span> 32 <span class="item-label" style="width: 80px;">公司: </span>
33 <select class="form-control" name="company" id="gsdmWaybillday" style="width: 140px;"></select> 33 <select class="form-control" name="company" id="gsdmWaybillday" style="width: 140px;"></select>
34 </div> 34 </div>
35 <div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_waybillday"> 35 <div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_waybillday">
36 <span class="item-label" style="width: 80px;">分公司: </span> 36 <span class="item-label" style="width: 80px;">分公司: </span>
37 <select class="form-control" name="subCompany" id="fgsdmWaybillday" style="width: 140px;"></select> 37 <select class="form-control" name="subCompany" id="fgsdmWaybillday" style="width: 140px;"></select>
38 - </div> --> 38 + </div>
39 <div style="display: inline-block;"> 39 <div style="display: inline-block;">
40 <span class="item-label" style="width: 80px;">线路: </span> 40 <span class="item-label" style="width: 80px;">线路: </span>
41 <select class="form-control" name="line" id="line" style="width: 180px;"></select> 41 <select class="form-control" name="line" id="line" style="width: 180px;"></select>
@@ -142,7 +142,7 @@ @@ -142,7 +142,7 @@
142 gsdmWaybillday=$("#gsdmWaybillday").val(); 142 gsdmWaybillday=$("#gsdmWaybillday").val();
143 fgsdmWaybillday = $("#fgsdmWaybillday").val(); 143 fgsdmWaybillday = $("#fgsdmWaybillday").val();
144 144
145 - $post('/mcy_forms/waybillday',{/* gsdmWaybillday:gsdmWaybillday,fgsdmWaybillday:fgsdmWaybillday, */line:line,date:$("#date").val(),type:'query'},function(result){ 145 + $post('/mcy_forms/waybillday',{gsdmWaybillday:gsdmWaybillday,fgsdmWaybillday:fgsdmWaybillday, line:line,date:$("#date").val(),type:'query'},function(result){
146 $.each(result, function(i, obj) { 146 $.each(result, function(i, obj) {
147 obj.requestType = reqCodeMap[obj.requestType]; 147 obj.requestType = reqCodeMap[obj.requestType];
148 }); 148 });
@@ -154,7 +154,11 @@ @@ -154,7 +154,11 @@
154 }); 154 });
155 155
156 $("#export").on("click",function(){ 156 $("#export").on("click",function(){
157 - $post('/mcy_export/waybilldayExport',{line:line,date:date,type:'export'},function(result){ 157 + line = $("#line").val();
  158 + date = $("#date").val();
  159 + gsdmWaybillday=$("#gsdmWaybillday").val();
  160 + fgsdmWaybillday = $("#fgsdmWaybillday").val();
  161 + $post('/mcy_export/waybilldayExport',{gsdmWaybillday:gsdmWaybillday,fgsdmWaybillday:fgsdmWaybillday,line:line,date:date,type:'export'},function(result){
158 window.open("/downloadFile/download?fileName=行车路单日报表"+moment(date).format("YYYYMMDD")); 162 window.open("/downloadFile/download?fileName=行车路单日报表"+moment(date).format("YYYYMMDD"));
159 }); 163 });
160 }); 164 });