环保报表问题修改

@@ -263,6 +263,7 @@
 			round( 100 * ( v2.clsl / ( f.pro_scale * v2.day_num ) ), 2 ) AS wsfhl,
 			round( 100 * ( v2.clsl / ( f.pro_scale * v2.day_num ) ), 2 ) AS wsfhl,
 			v3.dh,
 			v3.dh,
 			v3.qy,
 			v3.qy,
+			v3.ysl AS xssyl,
 			ROUND(0.123*v3.dh+1.4286*v3.qy,4) AS zhnyxhl,
 			ROUND(0.123*v3.dh+1.4286*v3.qy,4) AS zhnyxhl,
 			ROUND(3*v3.qy+0.703*10*v3.dh,4) AS eyhtpfl,
 			ROUND(3*v3.qy+0.703*10*v3.dh,4) AS eyhtpfl,
 			ROUND( v3.dh / v2.clsl, 2 ) AS dsdh,
 			ROUND( v3.dh / v2.clsl, 2 ) AS dsdh,
@@ -293,6 +294,7 @@
 			ROUND( SUM( v.GFFDL ) / 10000, 2 ) AS gffdl,
 			ROUND( SUM( v.GFFDL ) / 10000, 2 ) AS gffdl,
 			ROUND( SUM( v.QY ) / 10000, 2 ) AS qy,
 			ROUND( SUM( v.QY ) / 10000, 2 ) AS qy,
 		  	ROUND( SUM( v.WNL ), 2 ) AS wnl,
 		  	ROUND( SUM( v.WNL ), 2 ) AS wnl,
+		  	ROUND( SUM( v.YSL ), 2 ) AS ysl,
 			ROUND( AVG( v.WNHSL ), 2 ) AS wnhsl,
 			ROUND( AVG( v.WNHSL ), 2 ) AS wnhsl,
 			ROUND( SUM( v.GFCZL ), 2 ) AS ybgfczl,
 			ROUND( SUM( v.GFCZL ), 2 ) AS ybgfczl,
 			ROUND( SUM( v.WFCSL ), 2 ) AS wfcsl,
 			ROUND( SUM( v.WFCSL ), 2 ) AS wfcsl,

@@ -253,7 +253,7 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
 		String end = month + "-31";
 		String end = month + "-31";
 		String departIds = mapper.getChildDepartId(departId);
 		String departIds = mapper.getChildDepartId(departId);
 		String dataViewName2 = ReportViewUtil.buildView("2119ecbf53a1d2d0708258ff67cfd9e1","CSL", departIds, start, end);
 		String dataViewName2 = ReportViewUtil.buildView("2119ecbf53a1d2d0708258ff67cfd9e1","CSL", departIds, start, end);
-		String dataViewName3 = ReportViewUtil.buildView("3a243d5715b9e1a3753c180872ca0df9","DLHJ,GFFDL,QY,WNL,WNHSL,GFCZL,WFCSL,WFCZL", departIds, start, end);
+		String dataViewName3 = ReportViewUtil.buildView("3a243d5715b9e1a3753c180872ca0df9","DLHJ,GFFDL,QY,YSL,WNL,WNHSL,GFCZL,WFCSL,WFCZL", departIds, start, end);
 		List<JnhbReportData> list = mapper.getJnhbReport(dataViewName2, dataViewName3, start, end);
 		List<JnhbReportData> list = mapper.getJnhbReport(dataViewName2, dataViewName3, start, end);
 		return list;
 		return list;
 	}
 	}

@@ -15,7 +15,8 @@ public class JnhbReportData {
 	/**厂区名称*/
 	/**厂区名称*/
 	@ApiModelProperty(value = "厂区名称")
 	@ApiModelProperty(value = "厂区名称")
 	private String departName;
 	private String departName;
-
+	@ApiModelProperty(value = "新水使用量（吨）")
+	private String xssyl;
 
 
 	/**污水处理量规模*/
 	/**污水处理量规模*/
 	@ApiModelProperty(value = "污水处理量规模（万吨）")
 	@ApiModelProperty(value = "污水处理量规模（万吨）")