潘钊 / bsth_control · Commits

Commit 5f5c072229c3c05517787840fdbd4fd5b3772de5

Authored by 娄高锋
1 parent 2d075400
build: skipped

大间隔统计表 新增周一至周五与周六日的查询条件

Inline Side-by-side
Showing 3 changed files with 206 additions and 74 deletions
src/main/java/com/bsth/service/calc/impl/CalcIntervalServiceImpl.java
  View file @5f5c072
... ... @@ -13,9 +13,11 @@ import java.util.Comparator;
13 13 import java.util.Date;
14 14 import java.util.GregorianCalendar;
15 15 import java.util.HashMap;
  16 +import java.util.HashSet;
16 17 import java.util.Iterator;
17 18 import java.util.List;
18 19 import java.util.Map;
  20 +import java.util.Set;
19 21  
20 22 import org.apache.commons.lang3.StringUtils;
21 23 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -27,8 +29,6 @@ import com.bsth.data.BasicData;
27 29 import com.bsth.entity.Line;
28 30 import com.bsth.entity.calc.CalcInterval;
29 31 import com.bsth.entity.realcontrol.ScheduleRealInfo;
30   -import com.bsth.entity.sheet.CalcSheet;
31   -import com.bsth.entity.sheet.Sheet;
32 32 import com.bsth.repository.LineRepository;
33 33 import com.bsth.repository.calc.CalcIntervalRepository;
34 34 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
... ... @@ -36,9 +36,7 @@ import com.bsth.service.LineService;
36 36 import com.bsth.service.calc.CalcIntervalService;
37 37 import com.bsth.service.impl.BaseServiceImpl;
38 38 import com.bsth.util.Arith;
39   -import com.bsth.util.ComparableReal;
40 39 import com.bsth.util.ReportUtils;
41   -import com.mysql.fabric.xmlrpc.base.Array;
42 40  
43 41 @Service
44 42 public class CalcIntervalServiceImpl extends BaseServiceImpl<CalcInterval,Integer> implements CalcIntervalService {
... ... @@ -61,6 +59,8 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
61 59 public List<Map<String, Object>> countList(Map<String, Object> map) {
62 60 // TODO Auto-generated method stub
63 61 final DecimalFormat df = new DecimalFormat("0.00");
  62 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
  63 +
64 64 List<Map<String, Object>> list=new ArrayList<>();
65 65 String level=map.get("levelType").toString();
66 66 String line=map.get("line").toString().trim();
... ... @@ -69,6 +69,25 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
69 69 String sDate=map.get("date").toString();
70 70 String eDate=map.get("endDate").toString();
71 71 String nature=map.get("nature").toString();
  72 + String week=map.get("week").toString();
  73 + String weekend="";
  74 +
  75 + try {
  76 + if(!("0".equals(week))){
  77 + Date d1 = sdf.parse(sDate);
  78 + Date d2 = sdf.parse(eDate);
  79 + for(;d1.getTime() <= d2.getTime();d1.setTime(d1.getTime() + 1l*1000*60*60*24)){
  80 + if(d1.toString().contains("Sat") || d1.toString().contains("Sun")){
  81 + if(weekend.length() > 0){
  82 + weekend = weekend + ",";
  83 + }
  84 + weekend = weekend + "'" + sdf.format(d1) + "'";
  85 + }
  86 + }
  87 + }
  88 + } catch (Exception e) {
  89 + // TODO: handle exception
  90 + }
72 91  
73 92 //D级线路显示发车准点率
74 93 if(level.equals("D") && false){ //新的计算规则D级也显示大间隔
... ... @@ -136,7 +155,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
136 155 // + "SUM(djg_dg) as djgDg,SUM(djg_zgf) as djgZgf,SUM(djg_wgf) as djgWgf,MAX(djg_time) as djgTime "
137 156 // + "from bsth_c_calc_interval where date>= '"+sDate+"' and date<='"+eDate+"' and level <> 'D' ";
138 157 String sql="select gsbm,fgsbm,xl_bm,xl_name,SUM(bcs) as bcs,MAX(id) as id,SUM(djg_all) as djgAll,SUM(djg_gf) as djgGf,"
139   - + "SUM(djg_dg) as djgDg,SUM(djg_zgf) as djgZgf,SUM(djg_wgf) as djgWgf,MAX(djg_time) as djgTime, level "
  158 + + "SUM(djg_dg) as djgDg,SUM(djg_zgf) as djgZgf,SUM(djg_wgf) as djgWgf,MAX(djg_time) as djgTime,substr(level,1,1) level "
140 159 + "from bsth_c_calc_interval where date>= '"+sDate+"' and date<='"+eDate+"' and level like '%"+level+"%' "
141 160 + "and level is not null and level <> '' ";
142 161 if(line.equals("")){
... ... @@ -148,8 +167,13 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
148 167 }else{
149 168 sql +=" and xl_bm ='"+line+"'";
150 169 }
151   - sql += " group by xl_bm,gsbm,fgsbm,xl_name,level"
152   - +" order by xl_bm,level";
  170 + if(weekend.length() > 0 && "1".equals(week)){
  171 + sql +=" and date not in ("+weekend+")";
  172 + } else if(weekend.length() > 0 && "2".equals(week)){
  173 + sql +=" and date in ("+weekend+")";
  174 + }
  175 + sql += " group by xl_bm,gsbm,fgsbm,xl_name,substr(level,1,1)"
  176 + +" order by gsbm,fgsbm,xl_bm,level";
153 177  
154 178 list=jdbcTemplate.query(sql,
155 179 new RowMapper<Map<String,Object>>(){
... ... @@ -171,15 +195,15 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
171 195 }else{
172 196 m.put("fsl", "0.0");
173 197 }
174   - m.put("djgAll", rs.getString("djgAll"));
175   - m.put("djgGf", rs.getString("djgGf"));
176   - m.put("djgZgf", rs.getString("djgZgf"));
177   - m.put("djgWgf", rs.getString("djgWgf"));
178   - m.put("djgDg", rs.getString("djgDg"));
  198 + m.put("djgAll", rs.getString("djgAll")!=null?rs.getString("djgAll"):"");
  199 + m.put("djgGf", rs.getString("djgGf")!=null?rs.getString("djgGf"):"");
  200 + m.put("djgZgf", rs.getString("djgZgf")!=null?rs.getString("djgZgf"):"");
  201 + m.put("djgWgf", rs.getString("djgWgf")!=null?rs.getString("djgWgf"):"");
  202 + m.put("djgDg", rs.getString("djgDg")!=null?rs.getString("djgDg"):"");
179 203 if("0".equals(rs.getString("djgTime")) || "0.0".equals(rs.getString("djgTime"))){
180 204 m.put("djgTime", "");
181 205 } else {
182   - m.put("djgTime", rs.getString("djgTime"));
  206 + m.put("djgTime", rs.getString("djgTime")!=null?rs.getString("djgTime"):"");
183 207 }
184 208 if(rs.getString("level").toString().trim().length() > 1){
185 209 m.put("level", rs.getString("level").trim().substring(0, 1));
... ... @@ -263,15 +287,44 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
263 287 public List<Map<String, Object>> listInterval(Map<String, Object> map) {
264 288 // TODO Auto-generated method stub
265 289 final DecimalFormat df = new DecimalFormat("0.00");
  290 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
266 291  
267 292 String line=map.get("line").toString();
268 293 String date=map.get("date").toString();
269 294 String endDate=map.get("endDate").toString();
270 295 String levelType=map.get("levelType").toString();
  296 + String week=map.get("week").toString();
  297 + Set<String> weekend = new HashSet<String>();
  298 +
  299 + try {
  300 + if(!("0".equals(week))){
  301 + Date d1 = sdf.parse(date);
  302 + Date d2 = sdf.parse(endDate);
  303 + for(;d1.getTime() <= d2.getTime();d1.setTime(d1.getTime() + 1l*1000*60*60*24)){
  304 + if(d1.toString().contains("Sat") || d1.toString().contains("Sun")){
  305 + weekend.add(sdf.format(d1));
  306 + }
  307 + }
  308 + }
  309 + } catch (Exception e) {
  310 + // TODO: handle exception
  311 + }
  312 +
271 313 List<CalcInterval> listAll=calcIntervalRepository.selectByDateAndLine(line, date, endDate, levelType);
272 314 List<Map<String, Object>> tempList = new ArrayList<Map<String, Object>>();
273 315 for (int i = 0; i < listAll.size(); i++) {
274 316 CalcInterval t=listAll.get(i);
  317 +
  318 + if("1".equals(week)){
  319 + if(weekend.contains(t.getDate())){
  320 + continue;
  321 + }
  322 + } else if("2".equals(week)){
  323 + if(!(weekend.contains(t.getDate()))){
  324 + continue;
  325 + }
  326 + }
  327 +
275 328 // if(!t.getLevel().equals("D") && t.getDjgAll()>0){
276 329 if(t.getDjgAll() != null && t.getDjgAll() > 0){
277 330 Map<String, Object> m=new HashMap<>();
... ... @@ -300,7 +353,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
300 353 tempList.add(m);
301 354 }
302 355 }
303   - if(map.get("type").equals("export")){
  356 + if(map.get("type").equals("export")){
304 357 List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
305 358 Map<String, Object> m = new HashMap<String, Object>();
306 359 m.put("date", date);
... ... @@ -710,10 +763,29 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
710 763 @Override
711 764 public List<Map<String, Object>> exportDetail(Map<String, Object> map) {
712 765 // TODO Auto-generated method stub
  766 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
  767 +
713 768 String line=map.get("line").toString().trim();
714 769 String date=map.get("date").toString();
715 770 String endDate=map.get("endDate").toString();
716 771 String level=map.get("levelType").toString();
  772 + String week=map.get("week").toString();
  773 + Set<String> weekend = new HashSet<String>();
  774 +
  775 + try {
  776 + if(!("0".equals(week))){
  777 + Date d1 = sdf.parse(date);
  778 + Date d2 = sdf.parse(endDate);
  779 + for(;d1.getTime() <= d2.getTime();d1.setTime(d1.getTime() + 1l*1000*60*60*24)){
  780 + if(d1.toString().contains("Sat") || d1.toString().contains("Sun")){
  781 + weekend.add(sdf.format(d1));
  782 + }
  783 + }
  784 + }
  785 + } catch (Exception e) {
  786 + // TODO: handle exception
  787 + }
  788 +
717 789 String nature="0", gs = "", fgs = "";
718 790 if(map.containsKey("nature")){
719 791 nature = map.get("nature").toString().trim();
... ... @@ -735,7 +807,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
735 807 + " d.date >= '"+date+"' and d.date <= '"+endDate+"' "
736 808 + " and d.level like '%"+level+"%' "
737 809 + " and d.level is not null and d.level <> '' "
738   - + " order by d.line_code, d.date asc, d.level asc ";
  810 + + " order by i.gsbm, i.fgsbm, d.line_code, d.date asc, d.level asc ";
739 811  
740 812 List<Map<String, Object>> resList=jdbcTemplate.query(sql,
741 813 new RowMapper<Map<String,Object>>(){
... ... @@ -763,6 +835,17 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
763 835 Map<String, Boolean> lineMap=lineService.lineNature();
764 836 for (int i = 0; i < resList.size(); i++) {
765 837 Map<String, Object> m=resList.get(i);
  838 +
  839 + if("1".equals(week)){
  840 + if(weekend.contains(m.get("date"))){
  841 + continue;
  842 + }
  843 + } else if("2".equals(week)){
  844 + if(!(weekend.contains(m.get("date")))){
  845 + continue;
  846 + }
  847 + }
  848 +
766 849 if(null != line && line.length() > 0){
767 850 if(line.equals(m.get("xlBm").toString())){
768 851 list.add(m);
... ... @@ -811,12 +894,33 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
811 894  
812 895 public List<Map<String, Object>> sumInterval(Map<String, Object> map) {
813 896 // TODO Auto-generated method stub
814   - final DecimalFormat df = new DecimalFormat("0.00");
  897 + final DecimalFormat df = new DecimalFormat("0.00");
  898 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
  899 +
815 900 String gs=map.get("gs").toString().trim();
816 901 String fgs=map.get("fgs").toString().trim();
817 902 String sDate=map.get("date").toString();
818 903 String eDate=map.get("endDate").toString();
819 904 String nature=map.get("nature").toString();
  905 + String week=map.get("week").toString();
  906 + String weekend="";
  907 +
  908 + try {
  909 + if(!("0".equals(week))){
  910 + Date d1 = sdf.parse(sDate);
  911 + Date d2 = sdf.parse(eDate);
  912 + for(;d1.getTime() <= d2.getTime();d1.setTime(d1.getTime() + 1l*1000*60*60*24)){
  913 + if(d1.toString().contains("Sat") || d1.toString().contains("Sun")){
  914 + if(weekend.length() > 0){
  915 + weekend = weekend + ",";
  916 + }
  917 + weekend = weekend + "'" + sdf.format(d1) + "'";
  918 + }
  919 + }
  920 + }
  921 + } catch (Exception e) {
  922 + // TODO: handle exception
  923 + }
820 924  
821 925 List<Map<String, Object>> listAll=new ArrayList<Map<String, Object>>();
822 926  
... ... @@ -830,6 +934,11 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
830 934 sql +=" and gsbm = '"+gs+"'";
831 935 }
832 936 }
  937 + if(weekend.length() > 0 && "1".equals(week)){
  938 + sql +=" and date not in ("+weekend+")";
  939 + } else if(weekend.length() > 0 && "2".equals(week)){
  940 + sql +=" and date in ("+weekend+")";
  941 + }
833 942 sql += " order by gsbm,fgsbm,level";
834 943  
835 944 List<Map<String, Object>> countList = new ArrayList<Map<String, Object>>();
... ...
src/main/resources/static/pages/report/sheet/intervalCount.html
  View file @5f5c072
... ... @@ -27,54 +27,60 @@
27 27 <div class="portlet light porttlet-fit bordered">
28 28 <div class="portlet-title">
29 29 <form class="form-inline" action="">
30   - <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv">
31   - <span class="item-label" style="width: 80px;">公司: </span>
32   - <select class="form-control" name="company" id="gsdm" style="width: 180px;"></select>
33   - </div>
34   - <div style="display: inline-block; margin-left: 28px;" id="fgsdmDiv">
35   - <span class="item-label" style="width: 80px;">分公司: </span>
36   - <select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;"></select>
37   - </div>
38   - <div style="display: inline-block;margin-left: 33px;">
39   - <span class="item-label" style="width: 80px;">线路: </span>
40   - <select class="form-control" name="line" id="line" style="width: 180px;"></select>
41   - </div>
42   - <div style="display: inline-block;margin-left: 18px;">
  30 + <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv">
  31 + <span class="item-label" style="width: 80px;">公司: </span>
  32 + <select class="form-control" name="company" id="gsdm" style="width: 160px;"></select>
  33 + </div>
  34 + <div style="display: inline-block; margin-left: 20px;" id="fgsdmDiv">
  35 + <span class="item-label" style="width: 80px;">分公司: </span>
  36 + <select class="form-control" name="subCompany" id="fgsdm" style="width: 160px;"></select>
  37 + </div>
  38 + <div style="display: inline-block;margin-left: 33px;">
  39 + <span class="item-label" style="width: 80px;">线路: </span>
  40 + <select class="form-control" name="line" id="line" style="width: 160px;"></select>
  41 + </div>
  42 + <div style="display: inline-block;margin-left: 6px;">
43 43 <span class="item-label" style="width: 80px;">线路性质: </span>
44   - <select
45   - class="form-control" name="nature" id="nature"
46   - style="width: 180px;">
  44 + <select class="form-control" name="nature" id="nature" style="width: 160px;">
47 45 <option value="0">全部线路</option>
48 46 <option value="1" selected="selected">营运线路</option>
49 47 <option value="2">非营运线路</option>
50 48 </select>
51   - </div>
52   - <div style="margin-top: 10px">
  49 + </div>
  50 + <div style="display: inline-block;margin-left: 20px;">
  51 + <span class="item-label" style="width: 80px;">日期: </span>
  52 + <select class="form-control" name="week" id="week" style="width: 160px;">
  53 + <option value="0" selected="selected">全部</option>
  54 + <option value="1">周一至周五</option>
  55 + <option value="2">周六日</option>
  56 + </select>
  57 + </div>
  58 + <div style="margin-top: 10px">
53 59 </div>
54 60 <div style="display: inline-block;margin-left: 33px;">
55   - <span class="item-label" style="width: 80px;">等级: </span>
56   - <select class="form-control" style="width: 180px;" id=levelType>
57   - <option id="levelTypeAll" value="">全部</option>
58   - <option value="A" selected="selected">A级线路</option>
59   - <option value="B">B级线路</option>
60   - <option value="C">C级线路</option>
61   - <option value="D">D级线路</option>
62   - <option value="E">E级线路</option>
63   - </select>
  61 + <span class="item-label" style="width: 80px;">等级: </span>
  62 + <select class="form-control" style="width: 160px;" id=levelType>
  63 + <option id="levelTypeAll" value="">全部</option>
  64 + <option value="A" selected="selected">A级线路</option>
  65 + <option value="B">B级线路</option>
  66 + <option value="C">C级线路</option>
  67 + <option value="D">D级线路</option>
  68 + <option value="E">E级线路</option>
  69 + </select>
64 70 </div>
65 71 <div style="display: inline-block;">
66   - <span class="item-label" style="width: 80px;margin-left: 14px;">开始时间: </span>
67   - <input class="form-control" type="text" id="date" style="width: 180px;"/>
  72 + <span class="item-label" style="width: 80px;margin-left: 6px;">开始时间: </span>
  73 + <input class="form-control" type="text" id="date" style="width: 160px;"/>
68 74 </div>
69 75 <div style="display: inline-block;">
70   - <span class="item-label" style="width: 80px;margin-left: 14px;">结束时间: </span>
71   - <input class="form-control" type="text" id="endDate" style="width: 180px;"/>
  76 + <span class="item-label" style="width: 80px;margin-left: 6px;">结束时间: </span>
  77 + <input class="form-control" type="text" id="endDate" style="width: 160px;"/>
72 78 </div>
73 79  
74 80 <div class="form-group">
75 81 <input type="hidden" id="id"/>
76 82 <input type="hidden" id="dataLevel"/>
77   - <input class="btn btn-default" type="button" id="query" value="查询"/>
  83 + <input class="btn btn-default" type="button" id="query" value="查询" style="margin-left: 2px;"/>
78 84 <input class="btn btn-default" type="button" id="export" value="导出" title="导出查询的大间隔情况"/>
79 85 <input class="btn btn-default" type="button" id="export2" value="导出全部详情" title="导出查询的全部线路的大间隔详细"/>
80 86 </div>
... ... @@ -297,8 +303,9 @@
297 303 var gs=$('#gsdm').val();
298 304 var levelType=$('#levelType').val();
299 305 var nature=$("#nature").val();
  306 + var week=$("#week").val();
300 307 var i = layer.load(2);
301   - $get('/calcInterval/countList',{line:line,date:date,endDate:endDate,gs:gs,fgs:fgs,levelType:levelType,nature:nature,type:'query'},function(result){
  308 + $get('/calcInterval/countList',{line:line,date:date,endDate:endDate,gs:gs,fgs:fgs,levelType:levelType,nature:nature,week:week,type:'query'},function(result){
302 309 // if(levelType=="D"){
303 310 // var intervalList_d = template('intervalList_d',{list:result});
304 311 // $('#forms_d tbody').html(intervalList_d);
... ... @@ -334,9 +341,10 @@
334 341 var date = $("#date").val();
335 342 var endDate = $("#endDate").val();
336 343 var levelType=$(this).data('level');
  344 + var week=$("#week").val();
337 345 $("#id").val(id);
338 346 $("#dataLevel").val(levelType);
339   - $get('/calcInterval/listInterval',{line:id,date:date,endDate:endDate,levelType:levelType,type:'query'},function(result){
  347 + $get('/calcInterval/listInterval',{line:id,date:date,endDate:endDate,levelType:levelType,week:week,type:'query'},function(result){
340 348 var intervalList = template('intervalList_1',{list:result});
341 349 $('#forms_1 tbody').html(intervalList);
342 350 $('.btn-intervalList_1').on('click', openIntervalList);
... ... @@ -427,6 +435,7 @@
427 435 var gs=$('#gsdm').val();
428 436 var levelType=$('#levelType').val();
429 437 var nature=$('#nature').val();
  438 + var week=$("#week").val();
430 439 var lineName = $('#line option:selected').text();
431 440 if(lineName == "全部线路")
432 441 lineName = $('#fgsdm option:selected').text();
... ... @@ -434,7 +443,7 @@
434 443 lineName = $('#gsdm option:selected').text();
435 444  
436 445 var i = layer.load(2);
437   - $get('/calcInterval/countList',{line:line,date:date,endDate:endDate,gs:gs,fgs:fgs,levelType:levelType,nature:nature,type:"export",lineName:lineName},function(result){
  446 + $get('/calcInterval/countList',{line:line,date:date,endDate:endDate,gs:gs,fgs:fgs,levelType:levelType,nature:nature,week:week,type:"export",lineName:lineName},function(result){
438 447 var dateTime = "";
439 448 if(date == endDate){
440 449 dateTime = moment(date).format("YYYYMMDD");
... ... @@ -462,9 +471,10 @@
462 471 var nature=$('#nature').val();
463 472 var fgs=$('#fgsdm').val();
464 473 var gs=$('#gsdm').val();
  474 + var week=$("#week").val();
465 475  
466 476 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){
  477 + $get('/calcInterval/exportDetail',{gs:gs,fgs:fgs,line:id,date:date,endDate:endDate,levelType:levelType,nature:nature,week:week,type:'export'},function(result){
468 478 window.open("/downloadFile/download?fileName="+moment(date).format("YYYYMMDD")+"-"+moment(endDate).format("YYYYMMDD")+"大间隔详细");
469 479 layer.close(i);
470 480 });
... ... @@ -475,6 +485,7 @@
475 485 var date = $("#date").val();
476 486 var endDate = $("#endDate").val();
477 487 var levelType=$("#dataLevel").val();
  488 + var week=$("#week").val();
478 489 // if(levelType=='D'){
479 490 // var i = layer.load(2);
480 491 // $get('/calcSheet/calcListSheet',{line:id,date:date,endDate:endDate,type:'export'},function(result){
... ... @@ -483,7 +494,7 @@
483 494 // });
484 495 // }else{
485 496 var i = layer.load(2);
486   - $get('/calcInterval/listInterval',{line:id,date:date,endDate:endDate,levelType:levelType,type:'export'},function(result){
  497 + $get('/calcInterval/listInterval',{line:id,date:date,endDate:endDate,levelType:levelType,week:week,type:'export'},function(result){
487 498 window.open("/downloadFile/download?fileName=大间距汇总表"+moment(date).format("YYYYMMDD")+"-"+moment(endDate).format("YYYYMMDD"));
488 499 layer.close(i);
489 500 });
... ... @@ -496,8 +507,9 @@
496 507 var date = $("#date").val();
497 508 var endDate = $("#endDate").val();
498 509 var levelType=$("#dataLevel").val();
  510 + var week=$("#week").val();
499 511 var i = layer.load(2);
500   - $get('/calcInterval/exportDetail',{line:id,date:date,endDate:endDate,levelType:levelType,type:'export'},function(result){
  512 + $get('/calcInterval/exportDetail',{line:id,date:date,endDate:endDate,levelType:levelType,week:week,type:'export'},function(result){
501 513 window.open("/downloadFile/download?fileName="+moment(date).format("YYYYMMDD")+"-"+moment(endDate).format("YYYYMMDD")+"大间隔详细");
502 514 layer.close(i);
503 515 });
... ...
src/main/resources/static/pages/report/sheet/intervalSum.html
  View file @5f5c072
... ... @@ -27,24 +27,32 @@
27 27 <div class="portlet light porttlet-fit bordered">
28 28 <div class="portlet-title">
29 29 <form class="form-inline" action="">
30   - <div style="display: inline-block; margin-left: 42px;" id="gsdmDiv">
31   - <span class="item-label" style="width: 80px;">公司: </span>
32   - <select class="form-control" name="company" id="gsdm" style="width: 180px;"></select>
33   - </div>
34   - <div style="display: inline-block; margin-left: 28px;" id="fgsdmDiv">
35   - <span class="item-label" style="width: 80px;">分公司: </span>
36   - <select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;"></select>
37   - </div>
38   - <div style="display: inline-block;margin-left: 18px;">
39   - <span class="item-label" style="width: 80px;">线路性质: </span>
40   - <select
41   - class="form-control" name="nature" id="nature"
42   - style="width: 180px;">
43   - <option value="0" selected="selected">全部线路</option>
44   - <option value="1">营运线路</option>
45   - <option value="2">非营运线路</option>
46   - </select>
47   - </div>
  30 + <div style="display: inline-block; margin-left: 42px;" id="gsdmDiv">
  31 + <span class="item-label" style="width: 80px;">公司: </span>
  32 + <select class="form-control" name="company" id="gsdm" style="width: 180px;"></select>
  33 + </div>
  34 + <div style="display: inline-block; margin-left: 28px;" id="fgsdmDiv">
  35 + <span class="item-label" style="width: 80px;">分公司: </span>
  36 + <select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;"></select>
  37 + </div>
  38 + <div style="display: inline-block;margin-left: 18px;">
  39 + <span class="item-label" style="width: 80px;">线路性质: </span>
  40 + <select
  41 + class="form-control" name="nature" id="nature"
  42 + style="width: 180px;">
  43 + <option value="0">全部线路</option>
  44 + <option value="1" selected="selected">营运线路</option>
  45 + <option value="2">非营运线路</option>
  46 + </select>
  47 + </div>
  48 + <div style="display: inline-block;margin-left: 20px;">
  49 + <span class="item-label" style="width: 80px;">日期: </span>
  50 + <select class="form-control" name="week" id="week" style="width: 160px;">
  51 + <option value="0" selected="selected">全部</option>
  52 + <option value="1">周一至周五</option>
  53 + <option value="2">周六日</option>
  54 + </select>
  55 + </div>
48 56 <div style="margin-top: 10px">
49 57 </div>
50 58 <div style="display: inline-block;">
... ... @@ -167,8 +175,10 @@
167 175 var fgs=$('#fgsdm').val();
168 176 var gs=$('#gsdm').val();
169 177 var nature=$("#nature").val();
  178 + var week=$("#week").val();
  179 +
170 180 var i = layer.load(2);
171   - $get('/calcInterval/sumInterval',{date:date,endDate:endDate,gs:gs,fgs:fgs,nature:nature,type:'query'},function(result){
  181 + $get('/calcInterval/sumInterval',{date:date,endDate:endDate,gs:gs,fgs:fgs,nature:nature,week:week,type:'query'},function(result){
172 182 var intervalList_sum = template('intervalList_sum',{list:result});
173 183 $('#forms_djg_sum tbody').html(intervalList_sum);
174 184  
... ... @@ -186,12 +196,13 @@
186 196 var fgs=$('#fgsdm').val();
187 197 var gs=$('#gsdm').val();
188 198 var nature=$('#nature').val();
  199 + var week=$("#week").val();
189 200 var lineName = $('#fgsdm option:selected').text();
190 201 if(lineName=="全部分公司")
191 202 lineName = $('#gsdm option:selected').text();
192 203  
193 204 var i = layer.load(2);
194   - $get('/calcInterval/sumInterval',{date:date,endDate:endDate,gs:gs,fgs:fgs,nature:nature,type:"export",lineName:lineName},function(result){
  205 + $get('/calcInterval/sumInterval',{date:date,endDate:endDate,gs:gs,fgs:fgs,nature:nature,week:week,type:"export",lineName:lineName},function(result){
195 206 var dateTime = "";
196 207 if(date == endDate){
197 208 dateTime = moment(date).format("YYYYMMDD");
... ...