update

娄高锋
1 parent 5e75991d
Showing 2 changed files with 35 additions and 8 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/forms/statement/correctForm.html
@@ -2846,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");
@@ -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,10 +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){
-				
+				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="
-						+moment(date).format("YYYYMMDD")
-						+"-"+date+"-修正报表");
+						+dateTime+"-"+lineName+"-修正报表");
 			});
 		});