kangwei ： 能环保态势大屏-后端

@@ -359,6 +359,8 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
 			energyConsumeChart.setData(reportData);
 			energyConsumeChart.setData(reportData);
 			largeScreenVO.getEsgChartsList().add(energyConsumeChart);
 			largeScreenVO.getEsgChartsList().add(energyConsumeChart);
 			//吨消减能耗
 			//吨消减能耗
+			energyConsumeChart = new ResultChartsVO();
+			energyConsumeChart.setDataByZhnyxhl(reportData);
 			largeScreenVO.getEnergyConsumeChartsList().add(  energyConsumeChart  ) ;
 			largeScreenVO.getEnergyConsumeChartsList().add(  energyConsumeChart  ) ;
 
 
 			//消减量统计
 			//消减量统计

@@ -45,16 +45,4 @@ public class OperationReportController {
         return result;
         return result;
     }
     }
 
 
-
-    @AutoLog(value = "节能环保大屏:头部统计")
-    @ApiOperation(value = "节能环保大屏:头部统计", notes = "节能环保大屏:头部统计")
-    @GetMapping(value = "/jnhbReportShowHead")
-    public Result<List<JnhbReportData>> jnhbReportShow(String departId, String month) {
-        Result<List<JnhbReportData>> result = new Result<>();
-        List<JnhbReportData> list = fCustomReportDatasetService.jnhbReportShow(departId,month);
-        result.setResult(list);
-        return result;
-    }
-
-
 }
 }

@@ -85,7 +85,7 @@ public class JnhbLargeScreenVO {
 	}
 	}
 
 
 	/***
 	/***
-	 * 设置消减统计记录
+	 * 设置：消减统计记录
 	 */
 	 */
 	public void setReduceStatistics(int index , ResultNumberVO  resultNumberVO){
 	public void setReduceStatistics(int index , ResultNumberVO  resultNumberVO){
 		ResultNumberVO  resultNumberVOTemp =  reduceStatisticsList.get( index - 1);
 		ResultNumberVO  resultNumberVOTemp =  reduceStatisticsList.get( index - 1);

 package com.skua.modules.report.vo.largeScreen;
 package com.skua.modules.report.vo.largeScreen;
 
 
 import com.skua.modules.report.vo.JnhbReportData;
 import com.skua.modules.report.vo.JnhbReportData;
+import com.skua.tool.util.DigitalUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
@@ -36,4 +37,11 @@ public class ResultChartsVO {
         this.getTpDataList().add( reportData.getTpxjl() ) ;
         this.getTpDataList().add( reportData.getTpxjl() ) ;
         this.getTnDataList().add( reportData.getTnxjl() ) ;
         this.getTnDataList().add( reportData.getTnxjl() ) ;
     }
     }
+    public void setDataByZhnyxhl(JnhbReportData reportData ){
+        this.getXLine().add(   reportData.getDepartName()  ) ;
+        this.getCodDataList().add( DigitalUtils.division( reportData.getZhnyxhl() ,reportData.getCodxjl()) ) ;
+        this.getNh3DataList().add( DigitalUtils.division( reportData.getZhnyxhl() ,reportData.getTnxjl()) ) ;
+        this.getTpDataList().add( DigitalUtils.division( reportData.getZhnyxhl() ,reportData.getTpxjl()) ) ;
+        this.getTnDataList().add( DigitalUtils.division( reportData.getZhnyxhl() ,reportData.getTnxjl()) ) ;
+    }
 }
 }