潘钊 / bsth_control · Commits

Commit fc536c92d4c3f29251fec139bb02bc78ad7074d2

Authored by 廖磊
1 parent b5963449

嘉定班次日报修改

Inline Side-by-side
Showing 3 changed files with 61 additions and 21 deletions
src/main/java/com/bsth/service/jdtest/impl/JdtestServiceImpl.java
  View file @fc536c9
... ... @@ -105,20 +105,40 @@ public class JdtestServiceImpl implements JdtestService {
105 105  
106 106 @Override
107 107 public List<Map<String, Object>> daily(Map<String, Object> map) {
108   - String xlbm="";;
  108 + String xlbm="";
109 109 if(map.get("line")!=null){
110 110 xlbm=map.get("line").toString().trim();
111 111 }
  112 + String gsbm="";
  113 + if(map.get("gsbm")!=null){
  114 + gsbm=map.get("gsbm").toString().trim();
  115 + }
  116 +
  117 + String fgsbm="";
  118 + if(map.get("fgsbm")!=null){
  119 + fgsbm=map.get("fgsbm").toString().trim();
  120 + }
112 121  
113   - String sql="select r.cl_zbh,r.j_gh,r.lp_name "
  122 + String sql="select r.xl_bm, r.cl_zbh,r.j_gh,r.lp_name "
114 123 + " from bsth_c_s_sp_info_real r where "
115   - + "r.schedule_date_str = '"+map.get("date").toString()+"' "
116   - + " and r.xl_bm = '"+xlbm+"' group by r.cl_zbh,r.j_gh,r.lp_name order by r.cl_zbh";
  124 + + "r.schedule_date_str = '"+map.get("date").toString()+"'";
  125 + if(!gsbm.equals("")){
  126 + sql += "and r.gs_bm ='"+gsbm+"'";
  127 + }
  128 + if(!fgsbm.equals("")){
  129 + sql += "and r.fgs_bm='"+fgsbm+"'";
  130 + }
  131 + if(!xlbm.equals("")){
  132 + sql += " and r.xl_bm = '"+xlbm+"'";
  133 + }
  134 +
  135 + sql += " group by r.xl_bm, r.cl_zbh,r.j_gh,r.lp_name order by r.xl_bm,r.cl_zbh";
117 136  
118 137 List<Map<String, Object>> list = jdbcTemplate.query(sql, new RowMapper<Map<String, Object>>() {
119 138 @Override
120 139 public Map<String, Object> mapRow(ResultSet arg0, int arg1) throws SQLException {
121 140 Map<String, Object> m=new HashMap<>();
  141 + m.put("xlBm", arg0.getString("xl_bm"));
122 142 m.put("lp", arg0.getString("lp_name"));
123 143 m.put("jGh", arg0.getString("j_gh"));
124 144 m.put("clZbh", arg0.getString("cl_zbh"));
... ... @@ -132,19 +152,29 @@ public class JdtestServiceImpl implements JdtestService {
132 152 Dictionary d=it.next();
133 153 dMap.put(d.getdCode(), d.getdName());
134 154 }
135   -
136   - List<Ylb> listYlb= ylbRepository.obtainYlEq(map.get("date").toString(), "", "", xlbm, "", "xlbm");
  155 + List<Ylb> listYlb=new ArrayList<Ylb>();
  156 + if(xlbm.equals("")){
  157 + listYlb=ylbRepository.obtainYl(map.get("date").toString(), gsbm, fgsbm, xlbm, "", "xlbm");
  158 + }else{
  159 + listYlb=ylbRepository.obtainYlEq(map.get("date").toString(), "", "", xlbm, "", "xlbm");
  160 + }
137 161 Map<String, Ylb> mapYlb=new HashMap<>();
138 162 for (int j = 0; j < listYlb.size(); j++) {
139 163 Ylb y=listYlb.get(j);
140   - if(mapYlb.get(y.getJsy()+y.getNbbm()+y.getLp())==null){
141   - mapYlb.put(y.getJsy()+y.getNbbm()+y.getLp(), y);
  164 + if(mapYlb.get(y.getXlbm()+y.getJsy()+y.getNbbm()+y.getLp())==null){
  165 + mapYlb.put(y.getXlbm()+y.getJsy()+y.getNbbm()+y.getLp(), y);
142 166 }
143 167 }
144 168  
145 169 List<ScheduleRealInfo> sList;
146 170 List<ScheduleRealInfo> jList;
147   - List<ScheduleRealInfo> lists=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(map.get("line").toString(), map.get("date").toString());
  171 + List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
  172 + if(xlbm.equals("")){
  173 + lists=scheduleRealInfoRepository.scheduleByDateAndLineByGs_(gsbm, fgsbm, map.get("date").toString());
  174 + }else{
  175 + lists=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(xlbm, map.get("date").toString());
  176 +
  177 + }
148 178 double jzyl_z=0.0;
149 179 double czyl_z=0.0;
150 180 double jzl_z=0.0;
... ... @@ -165,8 +195,8 @@ public class JdtestServiceImpl implements JdtestService {
165 195 double yh=0.0;
166 196 String rylx="";
167 197  
168   - if(mapYlb.get(m.get("jGh").toString()+m.get("clZbh").toString()+m.get("lp").toString())!=null){
169   - Ylb t=mapYlb.get(m.get("jGh").toString()+m.get("clZbh").toString()+m.get("lp").toString());
  198 + if(mapYlb.get(m.get("xlBm").toString()+m.get("jGh").toString()+m.get("clZbh").toString()+m.get("lp").toString())!=null){
  199 + Ylb t=mapYlb.get(m.get("xlBm").toString()+m.get("jGh").toString()+m.get("clZbh").toString()+m.get("lp").toString());
170 200 jzyl=t.getJzyl();
171 201 czyl=t.getCzyl();
172 202 jzl=t.getJzl();
... ... @@ -191,7 +221,8 @@ public class JdtestServiceImpl implements JdtestService {
191 221 m.put("dh", "");
192 222 for (int j = 0; j < lists.size(); j++) {
193 223 ScheduleRealInfo s=lists.get(j);
194   - if(m.get("clZbh").toString().equals(s.getClZbh()) &&
  224 + if(m.get("xlBm").toString().equals(s.getXlBm()) &&
  225 + m.get("clZbh").toString().equals(s.getClZbh()) &&
195 226 m.get("jGh").toString().equals(s.getjGh()) &&
196 227 m.get("lp").toString().equals(s.getLpName()) ){
197 228 jList.add(s);
... ... @@ -206,7 +237,7 @@ public class JdtestServiceImpl implements JdtestService {
206 237  
207 238 }
208 239 }
209   -
  240 + m.put("xlName", jList.get(0).getXlName());
210 241 m.put("jName", jList.get(0).getjName());
211 242  
212 243 int jhbc=culateMileageService.culateJhbc(jList, "");
... ... @@ -233,7 +264,8 @@ public class JdtestServiceImpl implements JdtestService {
233 264  
234 265 }
235 266 Map<String, Object> mmp=new HashMap<>();
236   - mmp.put("lp", "合计");
  267 + mmp.put("xlName", "合计");
  268 + mmp.put("lp", "");
237 269 mmp.put("jGh", "");
238 270 mmp.put("clZbh", "");
239 271 mmp.put("jName", "");
... ...
src/main/resources/static/pages/forms/mould/jd_daily.xls
View file @fc536c9
No preview for this file type
src/main/resources/static/pages/forms/statement/jd_daily.html
  View file @fc536c9
... ... @@ -55,15 +55,16 @@
55 55 <table class="table table-bordered table-hover table-checkable" id="forms">
56 56 <thead>
57 57 <tr>
58   - <th colspan="16">调度班次日报</th>
  58 + <th colspan="17">调度班次日报</th>
59 59 </tr>
60 60 <tr>
61 61 <td>线路</td>
62   - <td colspan="7"><span id="form_line">&nbsp;</span></td>
  62 + <td colspan="8"><span id="form_line">&nbsp;</span></td>
63 63 <td>时间</td>
64 64 <td colspan="7"><span id="form_date">&nbsp;</span></td>
65 65 </tr>
66 66 <tr>
  67 + <td>线路</td>
67 68 <td>路牌</td>
68 69 <td>车辆</td>
69 70 <td>工号</td>
... ... @@ -138,7 +139,7 @@
138 139 $("#gsdmDaily").on("change",updateCompany);
139 140 function updateCompany(){
140 141 var company = $('#gsdmDaily').val();
141   - var options = '';
  142 + var options = '<option value="">全部分公司</option>';
142 143 for(var i = 0; i < obj.length; i++){
143 144 if(obj[i].companyCode == company){
144 145 var children = obj[i].children;
... ... @@ -153,7 +154,7 @@
153 154 var tempData = {};
154 155 $.get('/report/lineList',function(xlList){
155 156 var data = [];
156   -// data.push({id: " ", text: "全部线路"});
  157 + data.push({id: " ", text: "全部线路"});
157 158 $.get('/user/companyData', function(result){
158 159 for(var i = 0; i < result.length; i++){
159 160 var companyCode = result[i].companyCode;
... ... @@ -204,7 +205,7 @@
204 205 fgsdmDaily = $("#fgsdmDaily").val();
205 206 lineName=$("#select2-line-container").html();
206 207 var i = layer.load(2);
207   - $get('/jdtest/daily',{ line:line,date:date,type:'query'},function(result){
  208 + $get('/jdtest/daily',{ gsbm:gsdmDaily,fgsbm:fgsdmDaily, line:line,date:date,type:'query'},function(result){
208 209 $("#form_line").text(lineName);
209 210 $("#form_date").text(date);
210 211 // 把数据填充到模版中
... ... @@ -222,9 +223,15 @@
222 223 }
223 224 line = $("#line").val();
224 225 date = $("#date").val();
225   - lineName=$("#select2-line-container").html();
  226 +
  227 + lineName = $("#select2-line-container").html();
  228 + if(lineName == "全部线路")
  229 + lineName = $('#fgsdmDaily option:selected').text()+"全部线路";
  230 + if(lineName == "全部分公司全部线路")
  231 + lineName = $('#gsdmDaily option:selected').text()+"全部线路";
  232 +
226 233 var i = layer.load(2);
227   - $get('/jdtest/daily',{line:line,date:date,type:'export',lineName:lineName},function(result){
  234 + $get('/jdtest/daily',{gsbm:gsdmDaily,fgsbm:fgsdmDaily,line:line,date:date,type:'export',lineName:lineName},function(result){
228 235 window.open("/downloadFile/download?fileName="
229 236 +date+"-"+lineName+"-班次日报表");
230 237 layer.close(i);
... ... @@ -235,6 +242,7 @@
235 242 <script type="text/html" id="dailyJdtest">
236 243 {{each list as obj i}}
237 244 <tr>
  245 + <td>{{obj.xlName}}</td>
238 246 <td>{{obj.lp}}</td>
239 247 <td>{{obj.clZbh}}</td>
240 248 <td>{{obj.jGh}}</td>
... ...