Commit c9ae8bb1b7212f2e37affd4e193eb99c8951cbeb

Authored by 廖磊
1 parent 34d5e365

早高峰出车表统计

src/main/java/com/bsth/service/report/impl/CalcSheetServiceImpl.java
@@ -790,11 +790,11 @@ public class CalcSheetServiceImpl extends BaseServiceImpl<CalcSheet, Integer> im @@ -790,11 +790,11 @@ public class CalcSheetServiceImpl extends BaseServiceImpl<CalcSheet, Integer> im
790 if(map.get("fgsdmTurn")!=null){ 790 if(map.get("fgsdmTurn")!=null){
791 fgs=map.get("fgsdmTurn").toString().trim(); 791 fgs=map.get("fgsdmTurn").toString().trim();
792 } 792 }
793 -// String nature="0";  
794 -// if(map.get("nature")!=null){  
795 -// nature=map.get("nature").toString();  
796 -// }  
797 -// Map<String, Boolean> lineMap=lineService.lineNature(); 793 + String nature="0";
  794 + if(map.get("nature")!=null){
  795 + nature=map.get("nature").toString();
  796 + }
  797 + Map<String, Boolean> lineMap=lineService.lineNature();
798 798
799 String startDate=map.get("startDate").toString(); 799 String startDate=map.get("startDate").toString();
800 String endDate=map.get("endDate").toString(); 800 String endDate=map.get("endDate").toString();
@@ -847,16 +847,82 @@ public class CalcSheetServiceImpl extends BaseServiceImpl&lt;CalcSheet, Integer&gt; im @@ -847,16 +847,82 @@ public class CalcSheetServiceImpl extends BaseServiceImpl&lt;CalcSheet, Integer&gt; im
847 return s; 847 return s;
848 } 848 }
849 }); 849 });
  850 +
  851 +
  852 + List<Map<String, Object>> list=new ArrayList<Map<String,Object>>();
  853 + int jhcc = 0, sjcc = 0;
  854 + int jhcczgf = 0, sjcczgf = 0;
  855 + int count=0;
  856 + Map<String, String> xlMap=new HashMap<String,String>();
  857 + for(Map<String, Object> m : lists){
  858 + if(nature.equals("0")){
  859 + list.add(m);
  860 + jhcc += Integer.valueOf(m.get("jhcc").toString());
  861 + sjcc += Integer.valueOf(m.get("sjcc").toString());
  862 + jhcczgf += Integer.valueOf(m.get("jhcczgf").toString());
  863 + sjcczgf +=Integer.valueOf(m.get("sjcczgf").toString());
  864 + if(xlMap.get(m.get("xl").toString())==null){
  865 + count++;
  866 + xlMap.put(m.get("xl").toString(), m.get("xl").toString());
  867 + }
  868 + }else if(nature.equals("1")){
  869 + if(lineMap.get(m.get("xl").toString())){
  870 + list.add(m);
  871 + jhcc += Integer.valueOf(m.get("jhcc").toString());
  872 + sjcc += Integer.valueOf(m.get("sjcc").toString());
  873 + jhcczgf += Integer.valueOf(m.get("jhcczgf").toString());
  874 + sjcczgf +=Integer.valueOf(m.get("sjcczgf").toString());
  875 + if(xlMap.get(m.get("xl").toString())==null){
  876 + count++;
  877 + xlMap.put(m.get("xl").toString(), m.get("xl").toString());
  878 + }
  879 + }
  880 + }else{
  881 + if(!lineMap.get(m.get("xl").toString())){
  882 + list.add(m);
  883 + jhcc += Integer.valueOf(m.get("jhcc").toString());
  884 + sjcc += Integer.valueOf(m.get("sjcc").toString());
  885 + jhcczgf += Integer.valueOf(m.get("jhcczgf").toString());
  886 + sjcczgf +=Integer.valueOf(m.get("sjcczgf").toString());
  887 + if(xlMap.get(m.get("xl").toString())==null){
  888 + count++;
  889 + xlMap.put(m.get("xl").toString(), m.get("xl").toString());
  890 + }
  891 + }
  892 + }
  893 +
  894 + }
  895 +
  896 + Map<String, Object> tempMap=new HashMap<String,Object>();
  897 + tempMap.put("rq", "分类汇总");
  898 + tempMap.put("line_", "共" + list.size() + "条线路");
  899 + tempMap.put("xlName", "共" +count + "条线路");
  900 + tempMap.put("jhcc", jhcc);
  901 + tempMap.put("sjcc", sjcc);
  902 + tempMap.put("sjcczgf", sjcczgf);
  903 + tempMap.put("jhcczgf", jhcczgf);
  904 + tempMap.put("sm", "");
  905 + list.add(tempMap);
  906 + if(jhcc != 0 && sjcc != 0){
  907 + tempMap.put("ccl", df.format(((float)sjcc / jhcc)*100)+"%");
  908 + }else{
  909 + tempMap.put("ccl", "0.00%");
  910 + }
  911 + if(jhcczgf != 0 && sjcczgf != 0){
  912 + tempMap.put("cclzgf", df.format(((float)sjcczgf / jhcczgf)*100)+"%");
  913 + }else{
  914 + tempMap.put("cclzgf", "0.00%");
  915 + }
850 if (type.equals("export")) { 916 if (type.equals("export")) {
851 String lineName=map.get("lineName").toString(); 917 String lineName=map.get("lineName").toString();
852 ReportUtils ee = new ReportUtils(); 918 ReportUtils ee = new ReportUtils();
853 List<Iterator<?>> listI = new ArrayList<Iterator<?>>(); 919 List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
854 - listI.add(lists.iterator()); 920 + listI.add(list.iterator());
855 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; 921 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
856 ee.excelReplace(listI, new Object[] { map }, path + "mould/calcTurnoutrateZgf.xls", path + "export/" 922 ee.excelReplace(listI, new Object[] { map }, path + "mould/calcTurnoutrateZgf.xls", path + "export/"
857 + dates + "-" + lineName + "-营运线路出车率统计表.xls"); 923 + dates + "-" + lineName + "-营运线路出车率统计表.xls");
858 } 924 }
859 - return lists; 925 + return list;
860 } 926 }
861 927
862 @Override 928 @Override
src/main/resources/static/pages/mforms/shifdays/shifday.html
@@ -277,7 +277,10 @@ $(function(){ @@ -277,7 +277,10 @@ $(function(){
277 var gsdmShif = $("#gsdmShif").val(); 277 var gsdmShif = $("#gsdmShif").val();
278 var fgsdmShif = $("#fgsdmShif").val(); 278 var fgsdmShif = $("#fgsdmShif").val();
279 var params = {}; 279 var params = {};
280 - params.fgsdmShif =fgsdmShif; 280 + if(line )
  281 + if(line ==" " || line ==""){
  282 + params.fgsdmShif =fgsdmShif;
  283 + }
281 params.date =date; 284 params.date =date;
282 params.gsdmShif =gsdmShif; 285 params.gsdmShif =gsdmShif;
283 params.line =line; 286 params.line =line;
@@ -308,12 +311,14 @@ $(function(){ @@ -308,12 +311,14 @@ $(function(){
308 var fgsdmShif = $("#fgsdmShif").val(); 311 var fgsdmShif = $("#fgsdmShif").val();
309 var lineName = $('#line option:selected').text(); 312 var lineName = $('#line option:selected').text();
310 var params = {}; 313 var params = {};
311 - params.fgsdmShif =fgsdmShif;  
312 - params.date =date;  
313 - params.gsdmShif =gsdmShif;  
314 - params.line =line;  
315 - params.type='export';  
316 - params.lineName =lineName; 314 + if(line ==" " || line ==""){
  315 + params.fgsdmShif =fgsdmShif;
  316 + }
  317 + params.date =date;
  318 + params.gsdmShif =gsdmShif;
  319 + params.line =line;
  320 + params.type='export';
  321 + params.lineName =lineName;
317 $get('/mcy_export/shifdayExport',params,function(result){ 322 $get('/mcy_export/shifdayExport',params,function(result){
318 window.open("/downloadFile/download?fileName=" 323 window.open("/downloadFile/download?fileName="
319 +moment(date).format("YYYYMMDD")+ 324 +moment(date).format("YYYYMMDD")+
src/main/resources/static/pages/mforms/turnoutrates/calcTurnoutrateZgf.html
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 28
29 <div class="page-head"> 29 <div class="page-head">
30 <div class="page-title"> 30 <div class="page-title">
31 - <h1>营运线路出车率统计表</h1> 31 + <h1>营运线路早高峰出车率统计表</h1>
32 </div> 32 </div>
33 </div> 33 </div>
34 34
@@ -50,6 +50,15 @@ @@ -50,6 +50,15 @@
50 <select class="form-control" name="line" id="line" style="width: 140px;"></select> 50 <select class="form-control" name="line" id="line" style="width: 140px;"></select>
51 </div> 51 </div>
52 <div style="margin-top: 10px"></div> 52 <div style="margin-top: 10px"></div>
  53 + <div style="display: inline-block;">
  54 + <span class="item-label" style="width: 80px;">线路性质: </span> <select
  55 + class="form-control" name="nature" id="nature"
  56 + style="width: 140px;">
  57 + <option value="0">全部线路</option>
  58 + <option value="1" selected="selected">营运线路</option>
  59 + <option value="2">非营运线路</option>
  60 + </select>
  61 + </div>
53 <div style="display: inline-block;margin-left: 15px;"> 62 <div style="display: inline-block;margin-left: 15px;">
54 <span class="item-label" style="width: 80px;">开始时间: </span> 63 <span class="item-label" style="width: 80px;">开始时间: </span>
55 <input class="form-control" type="text" id="startDate" style="width: 140px;"/> 64 <input class="form-control" type="text" id="startDate" style="width: 140px;"/>