审计报表修改

统计日报导出加入日期

审计报表修改
统计日报导出加入日期
廖磊
1 parent 5ace7d78
Showing 5 changed files with 52 additions and 22 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/static/pages/forms/mould/statisticsDaily_.xls
src/main/resources/static/pages/forms/statement/scheduleDaily.html
src/main/resources/static/pages/forms/statement/statisticsDaily.html
@@ -2668,6 +2668,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     sdfSimple = new SimpleDateFormat("yyyyMMdd");
             List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
             Map<String, Object> m = new HashMap<String, Object>();
+            m.put("date", date+"至"+date2);
             ReportUtils ee = new ReportUtils();
             try {
                 listI.add(lMap.iterator());
@@ -2687,29 +2687,57 @@ public class ReportServiceImpl implements ReportService{
 			dlbSql += " and xlbm = '"+line+"'";
 		}
 		List<Dlb> dlbList=dlbList(dlbSql);
-		String sql="select r.xl_bm,r.schedule_date_str,r.cl_zbh,r.j_gh,r.s_gh"
-				+ " from bsth_c_s_sp_info_real r where"
-				+ " r.schedule_date_str BETWEEN  '"+date+"' and '"+date2+"'";
-		if(line.equals("")){
-			sql +="and r.gs_bm='"+gsdm+"' "
-					+ " and r.fgs_bm='"+fgsdm+"'";
+		List<Map<String, Object>> listGroupBy =null;
+		String sql="";
+		if(zt.equals("zbh")){
+			sql+="select r.xl_bm,r.schedule_date_str,r.cl_zbh"
+					+ " from bsth_c_s_sp_info_real r where"
+					+ " r.schedule_date_str BETWEEN  '"+date+"' and '"+date2+"'";
+			if(line.equals("")){
+				sql +="and r.gs_bm='"+gsdm+"' "
+						+ " and r.fgs_bm='"+fgsdm+"'";
+			}else{
+				sql += " and r.xl_bm = '"+line+"'";
+			}
+			sql += " group  by  r.xl_bm,r.cl_zbh,r.schedule_date_str";
+			listGroupBy=jdbcTemplate.query(sql, new RowMapper<Map<String, Object>>() {
+				@Override
+				public Map<String, Object> mapRow(ResultSet arg0, int arg1) throws SQLException {
+					Map<String, Object> map=new HashMap<String,Object>();
+					map.put("line",arg0.getString("xl_bm"));
+					map.put("date", arg0.getString("schedule_date_str"));
+					map.put("nbbm", arg0.getString("cl_zbh"));
+					return map;
+				}
+			});
 		}else{
-			sql += " and r.xl_bm = '"+line+"'";
+			sql+="select r.xl_bm,r.schedule_date_str,r.cl_zbh,r.j_gh,r.s_gh"
+					+ " from bsth_c_s_sp_info_real r where"
+					+ " r.schedule_date_str BETWEEN  '"+date+"' and '"+date2+"'";
+			if(line.equals("")){
+				sql +="and r.gs_bm='"+gsdm+"' "
+						+ " and r.fgs_bm='"+fgsdm+"'";
+			}else{
+				sql += " and r.xl_bm = '"+line+"'";
+			}
+			sql += " group  by  r.xl_bm,r.cl_zbh,r.schedule_date_str,r.j_gh,r.s_gh";
+			listGroupBy=jdbcTemplate.query(sql, new RowMapper<Map<String, Object>>() {
+				@Override
+				public Map<String, Object> mapRow(ResultSet arg0, int arg1) throws SQLException {
+					Map<String, Object> map=new HashMap<String,Object>();
+					map.put("line",arg0.getString("xl_bm"));
+					map.put("date", arg0.getString("schedule_date_str"));
+					map.put("nbbm", arg0.getString("cl_zbh"));
+					map.put("jGh", arg0.getString("j_gh"));
+					map.put("sGh", arg0.getString("s_gh"));
+					return map;
+				}
+			});
 		}
-		sql += " group  by  r.xl_bm,r.cl_zbh,r.schedule_date_str,r.j_gh,r.s_gh";
+		
  
-		List<Map<String, Object>> listGroupBy=jdbcTemplate.query(sql, new RowMapper<Map<String, Object>>() {
-			@Override
-			public Map<String, Object> mapRow(ResultSet arg0, int arg1) throws SQLException {
-				Map<String, Object> map=new HashMap<String,Object>();
-				map.put("line",arg0.getString("xl_bm"));
-				map.put("date", arg0.getString("schedule_date_str"));
-				map.put("nbbm", arg0.getString("cl_zbh"));
-				map.put("jGh", arg0.getString("j_gh"));
-				map.put("sGh", arg0.getString("s_gh"));
-				return map;
-			}
-		});
+	
+		
 		for (int i = 0; i < listGroupBy.size(); i++) {
 			Map<String, Object> m=listGroupBy.get(i);
 			String xl_bm=m.get("line")==null?"":m.get("line").toString();
@@ -66,7 +66,7 @@
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr>
-								<th colspan="40"><lable id="xlmc"></lable>线路调度日报</th>
+								<th colspan="40"><label id="xlmc"></label>线路调度日报</th>
 							</tr>
 							<tr>
 								<td rowspan="3"><span>路线</span></td>
@@ -70,7 +70,7 @@
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr>
-								<th colspan="44">线路调度日报</th>
+								<th colspan="44"><label id="tjrq"></label> 线路统计日报</th>
 							</tr>
 							<tr>
 								<td rowspan="3"><span >路线名</span></td>
@@ -275,6 +275,7 @@
 			if(date==null || date =="" ||date2==null || date2 ==""){
 				 layer.msg('请选择时间段.');
 			}else{
+				$("#tjrq").html(date+"至"+date2);
 				 var params = {};
 				 params['gsdm'] = gsdm;
 				 params['fgsdm'] =fgsdm ;