潘钊 / bsth_control · Commits

Commit e6e783d40ebc7d4bbe4baccb8ec57e90666a2d19

Authored by 娄高锋
1 parent 801aed78
build: skipped

多加了个导出

Inline Side-by-side
Showing 2 changed files with 95 additions and 20 deletions
src/main/java/com/bsth/service/calc/impl/CalcIntervalServiceImpl.java
  View file @e6e783d
... ... @@ -710,20 +710,41 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl<CalcInterval,Intege
710 710 @Override
711 711 public List<Map<String, Object>> exportDetail(Map<String, Object> map) {
712 712 // TODO Auto-generated method stub
713   - String line=map.get("line").toString();
  713 + String line=map.get("line").toString().trim();
714 714 String date=map.get("date").toString();
715 715 String endDate=map.get("endDate").toString();
716 716 String level=map.get("levelType").toString();
717   - String sql="select * from bsth_c_calc_interval_detail where line_code='"+line+"' and "
718   - + " date >= '"+date+"' and date <= '"+endDate+"' and level like '%"+level+"%'"
719   - + " and level is not null and level <> ''"
720   - + " order by date asc, level asc";
  717 + String nature="0", gs = "", fgs = "";
  718 + if(map.containsKey("nature")){
  719 + nature = map.get("nature").toString().trim();
  720 + }
  721 + if(map.containsKey("fgs")){
  722 + fgs = map.get("fgs").toString().trim();
  723 + }
  724 + if(map.containsKey("gs")){
  725 + gs = map.get("gs").toString().trim();
  726 + }
721 727  
722   - List<Map<String, Object>> list=jdbcTemplate.query(sql,
  728 + List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
  729 +
  730 + String sql="select d.*, i.gsbm, i.fgsbm from bsth_c_calc_interval_detail d "
  731 + + " left join bsth_c_calc_interval i "
  732 + + " on d.date = i.date and d.line_code = i.xl_bm "
  733 + + " and d.level = i.level "
  734 + + " where "
  735 + + " d.date >= '"+date+"' and d.date <= '"+endDate+"' "
  736 + + " and d.level like '%"+level+"%' "
  737 + + " and d.level is not null and d.level <> '' "
  738 + + " order by d.line_code, d.date asc, d.level asc ";
  739 +
  740 + List<Map<String, Object>> resList=jdbcTemplate.query(sql,
723 741 new RowMapper<Map<String,Object>>(){
724 742 @Override
725 743 public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
726 744 Map<String, Object> m=new HashMap<String,Object>();
  745 + m.put("gs", rs.getString("gsbm")!=null?rs.getString("gsbm"):"");
  746 + m.put("fgs", rs.getString("fgsbm")!=null?rs.getString("fgsbm"):"");
  747 + m.put("xlBm", rs.getString("line_code"));
727 748 m.put("xlName", rs.getString("line_name"));
728 749 m.put("level", rs.getString("level"));
729 750 m.put("jhfc1", rs.getString("jhfc1"));
... ... @@ -737,6 +758,39 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
737 758 return m;
738 759 }
739 760 });
  761 +
  762 + //根据线路类型确定是否营运
  763 + Map<String, Boolean> lineMap=lineService.lineNature();
  764 + for (int i = 0; i < resList.size(); i++) {
  765 + Map<String, Object> m=resList.get(i);
  766 + if(null != line && line.length() > 0){
  767 + if(line.equals(m.get("xlBm").toString())){
  768 + list.add(m);
  769 + }
  770 + } else {
  771 + if(fgs.length() > 0){
  772 + if(!(fgs.equals(m.get("fgs").toString()))){
  773 + continue;
  774 + }
  775 + } else if(gs.length() > 0){
  776 + if(!(gs.equals(m.get("gs").toString()))){
  777 + continue;
  778 + }
  779 + }
  780 + if (nature.equals("0")) {
  781 + list.add(m);
  782 + }else if(nature.equals("1")){
  783 + if(lineMap.get(m.get("xlBm").toString())){
  784 + list.add(m);
  785 + }
  786 + }else{
  787 + if(!lineMap.get(m.get("xlBm").toString())){
  788 + list.add(m);
  789 + }
  790 + }
  791 + }
  792 + }
  793 +
740 794 if(map.get("type").toString().equals("export")){
741 795 List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
742 796 Map<String, Object> m = new HashMap<String, Object>();
... ...
src/main/resources/static/pages/report/sheet/intervalCount.html
  View file @e6e783d
... ... @@ -75,7 +75,8 @@
75 75 <input type="hidden" id="id"/>
76 76 <input type="hidden" id="dataLevel"/>
77 77 <input class="btn btn-default" type="button" id="query" value="查询"/>
78   - <input class="btn btn-default" type="button" id="export" value="导出"/>
  78 + <input class="btn btn-default" type="button" id="export" value="导出" title="导出查询的大间隔情况"/>
  79 + <input class="btn btn-default" type="button" id="export2" value="导出全部详情" title="导出查询的全部线路的大间隔详细"/>
79 80 </div>
80 81 </form>
81 82 </div>
... ... @@ -125,8 +126,8 @@
125 126 </div>
126 127  
127 128 <div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
128   - <input class="btn btn-default" style="display: none" type="button" id="export_1" value="导出"/>
129   - <input class="btn btn-default" style="display: none;margin-left: 10px;" type="button" id="export_2" value="导出全部详细"/>
  129 + <input class="btn btn-default" style="display: none" type="button" id="export_1" value="导出" title="导出选中线路每日大间隔明细"/>
  130 + <input class="btn btn-default" style="display: none;margin-left: 10px;" type="button" id="export_2" value="导出详细" title="导出选中线路的全部大间隔详细"/>
130 131 <table class="table table-bordered table-hover table-checkable" style="display: none" id="forms_1">
131 132 <thead>
132 133 <tr >
... ... @@ -285,6 +286,7 @@
285 286 });
286 287  
287 288 $("#export").attr('disabled',"true");
  289 + $("#export2").attr('disabled',"true");
288 290  
289 291 //查询
290 292 $("#query").on('click',function(){
... ... @@ -310,16 +312,19 @@
310 312 $("#forms_d").hide();
311 313 $("#forms").show();
312 314 // }
313   - $("#forms_d_1").hide();
314   - $("#forms_1").hide();
315   - $("#export_1").hide();
316   - $("#export_2").hide();
317   -
318   - layer.close(i);
319   - if(result.length == 0)
320   - $("#export").attr('disabled',"true");
321   - else
322   - $("#export").removeAttr("disabled");
  315 + $("#forms_d_1").hide();
  316 + $("#forms_1").hide();
  317 + $("#export_1").hide();
  318 + $("#export_2").hide();
  319 +
  320 + layer.close(i);
  321 + if(result.length == 0){
  322 + $("#export").attr('disabled',"true");
  323 + $("#export2").attr('disabled',"true");
  324 + } else {
  325 + $("#export").removeAttr("disabled");
  326 + $("#export2").removeAttr("disabled");
  327 + }
323 328 });
324 329 });
325 330  
... ... @@ -449,6 +454,22 @@
449 454 });
450 455 });
451 456  
  457 + $("#export2").on("click",function(){
  458 + var id = $("#line").val();
  459 + var date = $("#date").val();
  460 + var endDate = $("#endDate").val();
  461 + var levelType=$('#levelType').val();
  462 + var nature=$('#nature').val();
  463 + var fgs=$('#fgsdm').val();
  464 + var gs=$('#gsdm').val();
  465 +
  466 + var i = layer.load(2);
  467 + $get('/calcInterval/exportDetail',{gs:gs,fgs:fgs,line:id,date:date,endDate:endDate,levelType:levelType,nature:nature,type:'export'},function(result){
  468 + window.open("/downloadFile/download?fileName="+moment(date).format("YYYYMMDD")+"-"+moment(endDate).format("YYYYMMDD")+"大间隔详细");
  469 + layer.close(i);
  470 + });
  471 + });
  472 +
452 473 $("#export_1").on("click",function(){
453 474 var id = $("#id").val();
454 475 var date = $("#date").val();
... ... @@ -508,7 +529,7 @@
508 529 {{/each}}
509 530 {{if list.length == 0}}
510 531 <tr>
511   - <td colspan="12"><h6 class="muted">没有找到相关数据</h6></td>
  532 + <td colspan="13"><h6 class="muted">没有找到相关数据</h6></td>
512 533 </tr>
513 534 {{/if}}
514 535 </script>
... ...