kangwei: bug修复-能耗分析A2O工艺吨水电耗、一级A标准平均数据没计算出来

@@ -435,7 +435,7 @@
 			</foreach>
 			</foreach>
 			order by ifnull(p1.ydl/p.clsl,0) desc
 			order by ifnull(p1.ydl/p.clsl,0) desc
     </select>
     </select>
-
+	<!-- 工艺分布-->
 	<select id="queryCraftDSDH" resultType="java.util.Map">
 	<select id="queryCraftDSDH" resultType="java.util.Map">
         SELECT
         SELECT
 			p1.item_text `name`,
 			p1.item_text `name`,
@@ -445,7 +445,7 @@
 			(
 			(
 			SELECT
 			SELECT
 				sfi.pro_craft,
 				sfi.pro_craft,
-				ROUND(p1.ydl/p.clsl,2) AS dsdh
+				ROUND( avg(p1.ydl/p.clsl) ,2) AS dsdh
 			FROM
 			FROM
 				sys_factory_info sfi
 				sys_factory_info sfi
 			LEFT JOIN (
 			LEFT JOIN (
@@ -488,7 +488,7 @@
 			SELECT
 			SELECT
 				sfi.pro_craft,
 				sfi.pro_craft,
 				sfi.out_level,
 				sfi.out_level,
-				ROUND(p1.ydl/p.clsl,2) AS dsdh
+				ROUND(avg(p1.ydl/p.clsl),2) AS dsdh
 			FROM
 			FROM
 				sys_factory_info sfi
 				sys_factory_info sfi
 				LEFT JOIN (
 				LEFT JOIN (
@@ -525,7 +525,7 @@
 	<select id="queryScaleDSDH" resultType="java.util.Map">
 	<select id="queryScaleDSDH" resultType="java.util.Map">
 		SELECT
 		SELECT
 			sfi.*,
 			sfi.*,
-			ROUND(p1.ydl/p.clsl,2) AS dsdh
+			ROUND(ifnull(avg(p1.ydl/p.clsl),0),2) AS dsdh
 		FROM
 		FROM
 			sys_factory_info sfi
 			sys_factory_info sfi
 			LEFT JOIN (
 			LEFT JOIN (

@@ -18,7 +18,7 @@ public interface IPowerAnalysisNewService {
      * 功能描述: <br>电耗分布情况
      * 功能描述: <br>电耗分布情况
      */
      */
     Map<String, Object> powerConsumptionDistribution(OperationMonthVO operationMonthVO);
     Map<String, Object> powerConsumptionDistribution(OperationMonthVO operationMonthVO);
-
+    //电耗分析关联分析
     Map<String, Object> powerAssociation(OperationMonthVO operationMonthVO);
     Map<String, Object> powerAssociation(OperationMonthVO operationMonthVO);
 
 
     Map<String, Object> powerDSDHCurve(String id, String type, String time);
     Map<String, Object> powerDSDHCurve(String id, String type, String time);

@@ -171,7 +171,7 @@ public class PowerAnalysisNewServiceImpl implements IPowerAnalysisNewService {
         result.put("factoryDistributionList", distributionList);
         result.put("factoryDistributionList", distributionList);
         return result;
         return result;
     }
     }
-
+    //电耗分析关联分析
     @Override
     @Override
     public Map<String, Object> powerAssociation(OperationMonthVO operationMonthVO) {
     public Map<String, Object> powerAssociation(OperationMonthVO operationMonthVO) {
         String time = operationMonthVO.getTime();
         String time = operationMonthVO.getTime();