潘钊 / bsth_control · Commits

Commit c92c2f667d5e5bf7e80d9fff4475e66bb8bccfaf

Authored by 廖磊
1 parent f66adf3d

换人换车

Inline Side-by-side
Showing 6 changed files with 48 additions and 45 deletions
src/main/java/com/bsth/controller/forms/ExportController.java
  View file @c92c2f6
... ... @@ -303,12 +303,10 @@ public class ExportController {
303 303 m.put("fssj", l.getFssj());
304 304 m.put("xgsj", l.getXgsj());
305 305 m.put("pcch", l.getPcch());
306   - m.put("pcry", l.getPcry());
307   - m.put("jhch", l.getJhch());
308   - m.put("jhgh", l.getJhgh());
309 306 m.put("sjch", l.getSjch());
  307 + m.put("fcgh", l.getPcry());
310 308 m.put("sjgh", l.getSjgh());
311   - m.put("yy", l.getYy());
  309 + m.put("yy", l.getYy()==null?"":l.getYy());
312 310 m.put("xgr", l.getXgr());
313 311 resList.add(m);
314 312 }
... ...
src/main/java/com/bsth/controller/forms/MCY_FormsController.java
  View file @c92c2f6
... ... @@ -66,7 +66,7 @@ public class MCY_FormsController {
66 66 }
67 67  
68 68 // 换人换车情况统计表
69   - @RequestMapping(value = "/changetochange", method = RequestMethod.POST)
  69 + @RequestMapping(value = "/changetochange", method = RequestMethod.GET)
70 70 public List<Changetochange> changetochange(@RequestParam Map<String, Object> map) {
71 71  
72 72 return formsService.changetochange(map);
... ...
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
  View file @c92c2f6
... ... @@ -407,7 +407,19 @@ public class FormsServiceImpl implements FormsService {
407 407  
408 408 rq = rq2 + "-" + rq3;
409 409  
410   - String sql = " select c.*,l.line_code from bsth_c_chtoch c LEFT JOIN bsth_c_line l on c.xl=l.name WHERE 1=1 ";
  410 + String line="";
  411 + if(map.get("line")!=null){
  412 + line=map.get("line").toString().trim();
  413 + }
  414 + String gs="";
  415 + if(map.get("gsdm")!=null){
  416 + gs=map.get("gsdm").toString();
  417 + }
  418 + String fgs="";
  419 + if(map.get("fgsdm")!=null){
  420 + fgs =map.get("fgsdm").toString();
  421 + }
  422 + /*String sql = " select c.*,l.line_code from bsth_c_chtoch c LEFT JOIN bsth_c_line l on c.xl=l.name WHERE 1=1 ";
411 423 if (!map.get("startDate").toString().equals(" ") && !map.get("endDate").toString().equals(" ")) {
412 424 sql += "and DATE_FORMAT( c.rq,'%Y-%m-%d') BETWEEN '" + map.get("startDate").toString() + "' and '"
413 425 + map.get("endDate").toString() + "'";
... ... @@ -419,18 +431,28 @@ public class FormsServiceImpl implements FormsService {
419 431 sql += " and c.pcch!=c.pcry";
420 432 } else if (map.get("sel").equals("1")) {
421 433 sql += " and c.jhgh!=c.sjgh";
422   - }
  434 + }*/
423 435  
  436 + String sql="select * from bsth_c_chtoch where rq BETWEEN '"+ map.get("startDate").toString()+"' "
  437 + + " and '"+map.get("endDate").toString() +"'";
  438 +
  439 + if(!line.equals("")){
  440 + sql +=" and xl= '"+line+"'";
  441 + }else{
  442 + sql += " and gs= '"+gs+"' and fgs= '"+fgs+"'";
  443 + }
  444 +
  445 + sql +=" order by rq";
424 446 List<Changetochange> list = jdbcTemplate.query(sql, new RowMapper<Changetochange>() {
425 447  
426 448  
427 449 @Override
428 450 public Changetochange mapRow(ResultSet arg0, int arg1) throws SQLException {
429 451 Changetochange chan = new Changetochange();
430   - chan.setRq(rq);
431   - chan.setGs(arg0.getString("gs"));
432   - chan.setFgs(arg0.getString("fgs"));
433   - chan.setXl(arg0.getString("xl"));
  452 + chan.setRq(arg0.getString("rq"));
  453 + chan.setGs(BasicData.businessCodeNameMap.get(arg0.getString("gs")));
  454 + chan.setFgs(BasicData.businessFgsCodeNameMap.get(arg0.getString("fgs")+"_"+arg0.getString("gs")));
  455 + chan.setXl(BasicData.lineCode2NameMap.get(arg0.getString("xl")));
434 456 chan.setLp(arg0.getString("lp"));
435 457 chan.setFssj(arg0.getString("fssj"));
436 458 chan.setXgsj(arg0.getString("xgsj"));
... ...
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
  View file @c92c2f6
... ... @@ -558,7 +558,7 @@ public class CulateMileageServiceImpl implements CulateMileageService{
558 558 //有子任务
559 559 if (cts != null && cts.size() > 0) {
560 560 for(ChildTaskPlan c : cts){
561   - if(c.isDestroy() && c.getDestroyReason().equals(item))
  561 + if(c.isDestroy() && (c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item))
562 562 sum = Arith.add(sum, c.getMileage());
563 563 }
564 564 }
... ...
src/main/resources/static/pages/forms/mould/changetochange.xls
View file @c92c2f6
No preview for this file type
src/main/resources/static/pages/mforms/changetochanges/changetochange.html
  View file @c92c2f6
... ... @@ -70,14 +70,14 @@
70 70 class="form-control" type="text" id="endDate"
71 71 style="width: 140px;" />
72 72 </div>
73   - <div style="display: inline-block; margin-left: 10px;">
74   - <span class="item-label" style="width: 120px;">类型: </span> <select
75   - class="form-control" id="sel">
76   - <option value="">请选择</option>
77   - <option value="1">换人</option>
78   - <option value="2">换车</option>
79   - </select>
80   - </div>
  73 +<!-- <div style="display: inline-block; margin-left: 10px;"> -->
  74 +<!-- <span class="item-label" style="width: 120px;">类型: </span> <select -->
  75 +<!-- class="form-control" id="sel"> -->
  76 +<!-- <option value="">请选择</option> -->
  77 +<!-- <option value="1">换人</option> -->
  78 +<!-- <option value="2">换车</option> -->
  79 +<!-- </select> -->
  80 +<!-- </div> -->
81 81 <div class="form-group">
82 82 <input class="btn btn-default" type="button" id="query" value="筛选" />
83 83 <input class="btn btn-default" type="button" id="export"
... ... @@ -117,10 +117,8 @@
117 117 <tr>
118 118 <td>车号</td>
119 119 <td>车号</td>
120   - <td>工号</td>
121   - <td>人员</td>
122   - <td>工号</td>
123   - <td>人员</td>
  120 + <td colspan="2">工号/人员</td>
  121 + <td colspan="2">工号/人员</td>
124 122 </tr>
125 123 </thead>
126 124 <tbody>
... ... @@ -188,6 +186,7 @@
188 186 $("#fgsdmChange").on("change",initXl);
189 187 function initXl(){
190 188 var data=[];
  189 + data.push({id: " ", text: "请选择"});
191 190 if(fage){
192 191 $("#line").select2("destroy").html('');
193 192 }
... ... @@ -223,29 +222,15 @@
223 222 var gsdmChange= $("#gsdmChange").val();
224 223 var fgsdmChange= $("#fgsdmChange").val();
225 224 if (startDate1 != '' && endDate1 != '') {
226   - $post('/mcy_forms/changetochange', {
  225 + $get('/mcy_forms/changetochange', {
227 226 sel : sel,
228 227 line : line,
229 228 startDate : $("#startDate").val(),
230 229 endDate : $("#endDate").val(),
  230 + gsdm:gsdmChange,
  231 + fgsdm:fgsdmChange,
231 232 type : 'query'
232 233 }, function(result) {
233   - startDate = $("#startDate").val();
234   - endDate = $("#endDate").val();
235   - $("#sDate").text(startDate);
236   - $("#eDate").text(endDate);
237   - var temp = {};
238   - var today_account = 0;
239   - temp["line"] = $("#line").text();
240   - $.each(result, function(i, obj) {
241   - if (moment(obj.schedule_date_str).format(
242   - "YYYY-MM-DD") == moment(obj.startDate)
243   - .format("YYYY-MM-DD")) {
244   - today_account++;
245   - }
246   - obj.updateDate = moment(obj.startDate).format(
247   - "YYYY-MM-DD HH:mm:ss");
248   - });
249 234 // 把数据填充到模版中
250 235 var tbodyHtml = template('changetochange', {
251 236 list : result
... ... @@ -294,11 +279,9 @@
294 279 <td>{{obj.fssj}}</td>
295 280 <td>{{obj.xgsj}}</td>
296 281 <td>{{obj.pcch}}</td>
297   - <td>{{obj.pcry}}</td>
298   - <td>{{obj.jhgh}}</td>
299   - <td>{{obj.jhch}}</td>
300   - <td>{{obj.sjgh}}</td>
301 282 <td>{{obj.sjch}}</td>
  283 + <td colspan="2">{{obj.pcry}}</td>
  284 + <td colspan="2">{{obj.sjgh}}</td>
302 285 <td>{{obj.yy}}</td>
303 286 <td>{{obj.xgr}}</td>
304 287 </tr>
... ...