修复修正报表选择区间日期后导出报错的问题

娄高锋
1 parent 3a8d00c6
Showing 2 changed files with 8 additions and 5 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/forms/statement/correctForm.html
@@ -2234,6 +2234,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             }
             try {
                 String dateTime = sdfSimple.format(sdfMonth.parse(date));
+                if(!endDate.equals(date)){
+                	dateTime += "-" + sdfSimple.format(sdfMonth.parse(endDate));
+                }
                 String lineName = BasicData.lineCode2NameMap.get(line);
                 listI.add(tempList.iterator());
                 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
@@ -265,12 +265,12 @@
 			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){
+				if(date == endDate){
 					dateTime = moment(date).format("YYYYMMDD");
-// 				} else {
-// 					dateTime = moment(date).format("YYYYMMDD")+"-"+
-// 							moment(endDate).format("YYYYMMDD");
-// 				}
+				} else {
+					dateTime = moment(date).format("YYYYMMDD")+"-"+
+							moment(endDate).format("YYYYMMDD");
+				}
 				window.open("/downloadFile/download?fileName="
 						+dateTime+"-"+lineName+"-修正报表");
 			});