Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control into pudong

panzhaov5
2 parents b8ac0232 a59a1607
Showing 9 changed files with 69 additions and 16 deletions
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/java/com/bsth/service/report/impl/SheetServiceImpl.java
src/main/resources/static/pages/forms/statement/correctForm.html
src/main/resources/static/pages/forms/statement/statisticsDailyCalc.html
src/main/resources/static/pages/forms/statement/statisticsDailyCalc2.html
src/main/resources/static/pages/report/inoutstation.html
src/main/resources/static/pages/report/sheet/sheetList.html
@@ -53,6 +53,7 @@ public class ReportController {
 			Map<String, Object> m = new HashMap<String, Object>();
 			m.put("i", i);
 			m.put("nbbm", a.getNbbm());
+			m.put("pzh", a.getPzh());
 			m.put("stopName", a.getStopName());
 			m.put("jzsj", a.getJzsj());
 			m.put("czsj", a.getCzsj());
@@ -118,8 +119,7 @@ public class ReportController {
 			@RequestParam String zdlx,@RequestParam String fcsj,@RequestParam String ddsj){
 		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
 		ReportUtils ee = new ReportUtils();
-//		List<ArrivalInfo> list=service.queryListClzd(line,zd,zdlx,fcsj,ddsj);
-		List<ArrivalInfo> list = new ArrayList<ArrivalInfo>();
+		List<ArrivalInfo> list=service.queryListClzd(line,zd,zdlx,fcsj,ddsj);
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		int i=1;
 		for (ArrivalInfo a:list ) {
@@ -2226,10 +2226,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                  tempList.add(tempMap);
              }
              try {
+            	 String dateTime = sdfSimple.format(sdfMonth.parse(date));
+            	 String lineName = BasicData.lineCode2NameMap.get(line);
                  listI.add(tempList.iterator());
                  String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
                  ee.excelReplace(listI, new Object[]{m}, path + "mould/correctForm.xls",
-                         path + "export/修正报表" + date+ ".xls");
+                         path + "export/" + dateTime + "-" + lineName + "-修正报表.xls");
              } catch (Exception e) {
                  // TODO: handle exception
                  e.printStackTrace();
@@ -2844,11 +2846,29 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("dtbc_m", 0);
         map.put("dtbc_a", 0);
         if(list.size()>0){
-	        Map<String, Object> m_=culateService.culateDjg(list_s, list.get(0).getXlBm());
-	        map.put("djg", m_.get("djgcsq"));
-	        map.put("djg_m", m_.get("djgcsz"));
-	        map.put("djg_a", m_.get("djgcsw"));
-	        map.put("djg_time", m_.get("djgsj"));
+        	int djg = 0, djg_m = 0, djg_a = 0, djg_time = 0;
+        	for(Map<String, Object> m : lMap){
+        		if(m.containsKey("djg") && m.get("djg") != null)
+        			djg += Integer.valueOf(m.get("djg").toString());
+        		if(m.containsKey("djg_m") && m.get("djg_m") != null)
+        			djg_m += Integer.valueOf(m.get("djg_m").toString());
+        		if(m.containsKey("djg_a") && m.get("djg_a") != null)
+        			djg_a += Integer.valueOf(m.get("djg_a").toString());
+        		if(m.containsKey("djg_time") && m.get("djg_time") != null){
+        			int t = Integer.valueOf(m.get("djg_time").toString());
+        			if(t > djg_time)
+        				djg_time = t;
+        		}
+        	}
+        	map.put("djg", djg);
+        	map.put("djg_m", djg_m);
+        	map.put("djg_a", djg_a);
+        	map.put("djg_time", djg_time);
+//	        Map<String, Object> m_=culateService.culateDjg(list_s, list.get(0).getXlBm());
+//	        map.put("djg", m_.get("djgcsq"));
+//	        map.put("djg_m", m_.get("djgcsz"));
+//	        map.put("djg_a", m_.get("djgcsw"));
+//	        map.put("djg_time", m_.get("djgsj"));
         }else{
         	 map.put("djg", "0");
              map.put("djg_m", "0");
@@ -229,7 +229,7 @@ public class ReportServiceImpl implements ReportService{
 	public List<ArrivalInfo> load2(String line,Long date1,Long date2,Date dates1,Date dates2,String zd,String zdlx,String fcsj){
-		List<ArrivalInfo> list = null;
+		List<ArrivalInfo> list = new ArrayList<ArrivalInfo>();
 		Calendar cal = Calendar.getInstance();
 		cal.setTime(dates1);
 		//周数，表分区字段
@@ -614,16 +614,26 @@ public class SheetServiceImpl extends BaseServiceImpl&lt;Sheet, Integer&gt; implements
 		}
 		if(map.containsKey("type") && map.get("type").toString().equals("export")){
+			String lineName = "";
+			if(map.containsKey("lineName"))
+				lineName = map.get("lineName").toString();
 			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
 			Map<String, Object> m = new HashMap<String, Object>();
 			m.put("date", date);
 			m.put("endDate", endDate);
 			ReportUtils ee = new ReportUtils();
 			try {
+				String dateTime = "";
+				if(date.equals(endDate)){
+					dateTime = date.replaceAll("-", "");
+				} else {
+					dateTime = date.replaceAll("-", "")+"-"+
+							endDate.replaceAll("-", "");
+				}
 				listI.add(listmap.iterator());
 				String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
 				ee.excelReplace(listI, new Object[]{m}, path + "mould/" + "sheetList.xls",
-						path + "export/发车准点率"+date.replaceAll("-", "")+"-"+endDate.replaceAll("-", "")+".xls");
+						path + "export/"+dateTime+"-"+lineName+"-发车准点率.xls");
 			} catch (Exception e) {
 				// TODO: handle exception
 				e.printStackTrace();
@@ -233,6 +233,7 @@
 	    var endDate = $("#endDate").val();
 	    var code = $("#code").val();
 	    var changType=$("#changType").val();
+		var lineName = $('#line option:selected').text();
 		$("#query").on("click",function(){
 		    line = $("#line").val();
 		    date = $("#date").val();
@@ -240,6 +241,9 @@
 		    code = $("#code").val();
 		    endDate = $("#endDate").val();
 		    changType=$("#changType").val();
+			lineName = $('#line option:selected').text();
+			if(lineName == "全部线路")
+				lineName = $('#subCompany option:selected').text();
 		    var type = "query";
 		    $get("/realSchedule/correctForm",{line:line,date:date,endDate:endDate,lpName:lpName,code:code,type:type,changType:changType},function(result){
 		        var list_correctForm = template('list_correctForm',{list:result});
@@ -260,7 +264,15 @@
 		$("#export").on("click",function(){
 			var type = "export";
 			$get('/realSchedule/correctForm',{line:line,date:date,endDate:endDate,lpName:lpName,code:code,type:type,changType:changType},function(result){
-				window.open("/downloadFile/download?fileName=修正报表"+date);
+				var dateTime = "";
+				if(date == endDate){
+					dateTime = moment(date).format("YYYYMMDD");
+				} else {
+					dateTime = moment(date).format("YYYYMMDD")+"-"+
+							moment(endDate).format("YYYYMMDD");
+				}
+				window.open("/downloadFile/download?fileName="
+						+dateTime+"-"+lineName+"-修正报表");
 			});
 		});
@@ -150,7 +150,7 @@
 			$('.menu-toggler.sidebar-toggler').click();
 		var d = new Date();
-		d.setTime(d.getTime() - 1*1000*60*60*24);
+		d.setTime(d.getTime() - 4*1000*60*60*24);
 		var year = d.getFullYear();
 		var month = d.getMonth() + 1;
 		var day = d.getDate();
@@ -150,7 +150,7 @@
 			$('.menu-toggler.sidebar-toggler').click();
 		var d = new Date();
-		d.setTime(d.getTime() - 1*1000*60*60*24);
+		d.setTime(d.getTime() - 4*1000*60*60*24);
 		var year = d.getFullYear();
 		var month = d.getMonth() + 1;
 		var day = d.getDate();
@@ -485,7 +485,7 @@
 			}else{
 				$get('/report/exportQueryListZdxx',{clzbh:nbbm,date:rq,line:line,fcsj:fcsj,ddsj:ddsj},function(result){
 					window.open("/downloadFile/download?fileName="
-							+moment(date).format("YYYYMMDD")
+							+moment(rq).format("YYYYMMDD")
 							+"-"+pzh+"-班次到离站");
 				});
 			}
@@ -312,9 +312,20 @@
 			var endDate = $("#endDate").val();
 			var fgs=$('#fgsdm').val();
 			var gs=$('#gsdm').val();
+			var lineName = $('#line option:selected').text();
+			if(lineName == "全部线路")
+				lineName = $('#fgsdm option:selected').text();
 			var i = layer.load(2);
-			$get('/sheet/countList',{line:line,date:date,endDate:endDate,gs:gs,fgs:fgs,type:"export"},function(result){
-				window.open("/downloadFile/download?fileName=发车准点率"+moment(date).format("YYYYMMDD")+"-"+moment(endDate).format("YYYYMMDD"));
+			$get('/sheet/countList',{line:line,date:date,endDate:endDate,gs:gs,fgs:fgs,type:"export",lineName:lineName},function(result){
+				var dateTime = "";
+				if(date == endDate){
+					dateTime = moment(date).format("YYYYMMDD");
+				} else {
+					dateTime = moment(date).format("YYYYMMDD")+"-"+
+							moment(endDate).format("YYYYMMDD");
+				}
+				window.open("/downloadFile/download?fileName="
+						+dateTime+"-"+lineName+"-发车准点率");
 				layer.close(i);
 			});
 // 		$("#forms_h").table2excel({