运营问题修改

@@ -261,15 +261,20 @@
 		SELECT
 			d.id AS depart_id,
 			d.depart_name AS depart_name,
+			v3.ysl AS xssyl,
 			ROUND(f.pro_scale * v2.day_num,2) AS wsclgm,
+			v3.gffdl,
 			v2.clsl AS wssjcll,
 			round( 100 * ( v2.clsl / ( f.pro_scale * v2.day_num ) ), 2 ) AS wsfhl,
 			v3.dh,
 			v3.qy,
-			v3.ysl AS xssyl,
 			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( v3.dh / v2.clsl, 2 ) AS dsdh,
+			v2.codxjl AS codxjl,
+			v2.adxjl AS adxjl,
+			v2.zlxjl AS tpxjl,
+			v2.zdxjl AS tnxjl,
 			v3.wnl AS ybgfcsl,
 			v3.ybgfczl AS ybgfczl,
 			ROUND(v3.wnl*(1-v3.wnhsl/100),2) AS jgwnl,
@@ -282,6 +287,10 @@
 		SELECT
 			v.depart_id,
 			ROUND( SUM( v.CSL ) / 10000, 2 ) AS clsl,
+			ROUND(SUM(IFNULL(JSZL,0) - IFNULL(CSZL,0)),2) AS zlxjl,
+			ROUND(SUM(IFNULL(JSCOD,0) - IFNULL(CSCOD,0)),2) AS codxjl,
+			ROUND(SUM(IFNULL(JSAD,0) - IFNULL(CSAD,0)),2) AS adxjl,
+			ROUND(SUM(IFNULL(JSZD,0) - IFNULL(CSTN,0)),2) AS zdxjl,
 			#{dayCount} AS day_num
 		FROM
 			${dataViewName2} v

@@ -222,7 +222,7 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
 		String end = month + "-31";
 		int dayCount = (int)DateUtils.differenceDay(start,end);
 		String departIds = mapper.getChildDepartId(departId);
-		String dataViewName2 = ReportViewUtil.buildView(ReportConstant.view2119,"CSL", departIds, start, end);
+		String dataViewName2 = ReportViewUtil.buildView(ReportConstant.view2119,"CSL,JSZL,CSZL,JSCOD,CSCOD,JSAD,CSAD,JSZD,CSTN", departIds, start, end);
 		String dataViewName3 = ReportViewUtil.buildView(ReportConstant.view3a24,"DLHJ,GFFDL,QY,YSL,WNL,WNHSL,GFCZL,WFCSL,WFCZL", departIds, start, end);
 		List<JnhbReportData> list = mapper.getJnhbReport(dataViewName2, dataViewName3, start, end, departIds, dayCount);
 		return list;
@@ -235,7 +235,7 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
 		List<JnhbReportDetailsJs> jsList = new ArrayList<>();
 		List<JnhbReportDetailsHj> hjList = new ArrayList<>();
 		String year = month.substring(0,4);
-		String dataViewName2 = ReportViewUtil.buildViewLike(ReportConstant.view2119,"CSL", departId, year);
+		String dataViewName2 = ReportViewUtil.buildViewLike(ReportConstant.view2119,"CSL,JSZL,CSZL,JSCOD,CSCOD,JSAD,CSAD,JSZD,CSTN", departId, year);
 		String dataViewName3 = ReportViewUtil.buildViewLike(ReportConstant.view3a24,"", departId, year);
 		dyList = mapper.getDyList(dataViewName2, dataViewName3, departId, year);
 		jsList = mapper.getJsList(dataViewName2, dataViewName3, departId, year);
@@ -249,7 +249,7 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
 	//节能环保报表数据-部门+月数据
 	private List<JnhbReportData> jnhbReportShowDepaetMonthDate(String departIds, String startTime, String endTime){
 		int dayCount = (int)DateUtils.differenceDay(startTime,endTime);
-		String dataViewName2 = ReportViewUtil.buildView(ReportConstant.view2119,"CSL", departIds, startTime, endTime);
+		String dataViewName2 = ReportViewUtil.buildView(ReportConstant.view2119,"CSL,JSZL,CSZL,JSCOD,CSCOD,JSAD,CSAD,JSZD,CSTN", departIds, startTime, endTime);
 		String dataViewName3 = ReportViewUtil.buildView(ReportConstant.view3a24,"DLHJ,GFFDL,QY,YSL,WNL,WNHSL,GFCZL,WFCSL,WFCZL", departIds, startTime, endTime);
 		List<JnhbReportData> list = mapper.getJnhbReport(dataViewName2, dataViewName3, startTime, endTime, departIds, dayCount);
 		return list;
@@ -373,7 +373,7 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
 
 	private JnhbReportData  getJnhbReportSumData(String departIds, String startTime ,String endTime){
 		//头部统计数据
-		String dataViewName2 = ReportViewUtil.buildView(ReportConstant.view2119,"CSL", departIds, startTime, endTime);
+		String dataViewName2 = ReportViewUtil.buildView(ReportConstant.view2119,"CSL,JSZL,CSZL,JSCOD,CSCOD,JSAD,CSAD,JSZD,CSTN", departIds, startTime, endTime);
 		String dataViewName3 = ReportViewUtil.buildViewLike(ReportConstant.view3a24,"DLHJ,QY,YSL,WNL,WNHSL,GFCZL,WFCSL,WFCZL", departIds, startTime, endTime);
 		System.out.println("dataViewName3 = "+dataViewName3);
 		if(StringUtils.isNotEmpty(departIds)){