kangwei: 修改bug

 周报数据：（电耗）本周实际、对比目标值、
            （药耗）本周实际、对比目标值、
  能耗分析：处理水量单位改为万吨

@@ -199,11 +199,11 @@
 			v8.dlhj,v8.yjhl,v8.wnl,
 			v8.dlhj,v8.yjhl,v8.wnl,
 			v2.zclsl,v2.rjclsl,
 			v2.zclsl,v2.rjclsl,
 			t.target_power as dsdhnmb,
 			t.target_power as dsdhnmb,
-			round(v8.dlhj/(v2.zclsl*10000),2) as dsdhzsj,
-			'' as dsdhdb,
+			round(IFNULL(v8.dlhj,0)/(v2.zclsl),2) as dsdhzsj,
+			round((IFNULL(v8.dlhj,0)/(v2.zclsl) - t.target_power)*100/t.target_power,2) as dsdhdb,
 			t.target_drug as yjnmb,
 			t.target_drug as yjnmb,
-			round(v8.yjhl/(v2.zclsl*10000),2) as yjzsj,
-			'' as yjdb,
+			round(IFNULL(v8.yjhl,0)/(v2.zclsl),2) as yjzsj,
+			round((IFNULL(v8.yjhl,0)/(v2.zclsl) - t.target_drug)*100/t.target_drug ,2) as yjdb,
 			f.pro_scale as sjgm
 			f.pro_scale as sjgm
 		FROM
 		FROM
 			sys_depart d
 			sys_depart d

@@ -195,6 +195,7 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
 			valueMap.put("startdate", startDate);
 			valueMap.put("startdate", startDate);
 			valueMap.put("enddate", endDate);
 			valueMap.put("enddate", endDate);
 		}
 		}
+		//
 		return valueMap;
 		return valueMap;
 	}
 	}
 
 

@@ -375,8 +375,8 @@
     </select>
     </select>
 	<select id="querySixMonthPowerConsumption" resultType="map">
 	<select id="querySixMonthPowerConsumption" resultType="map">
 		SELECT
 		SELECT
-			ROUND(SUM(v2.CSL),2) AS totalBYCLSL,
-			IFNULL(v3.DLHJ,0) AS totalBYYDL,
+			ROUND(SUM(IFNULL(v2.CSL,0))/10000,2) AS totalBYCLSL,
+			ROUND(IFNULL(v3.DLHJ,0),2) AS totalBYYDL,
 			ROUND(IFNULL(v3.DLHJ,0)/SUM(v2.CSL),2) AS dsdh,
 			ROUND(IFNULL(v3.DLHJ,0)/SUM(v2.CSL),2) AS dsdh,
 			LEFT(v2.time,7) AS time
 			LEFT(v2.time,7) AS time
 		from ${dataViewName2119} v2
 		from ${dataViewName2119} v2

@@ -59,6 +59,8 @@ public class PowerAnalysisNewServiceImpl implements IPowerAnalysisNewService {
         String dataViewName3a24 = ReportViewUtil.buildView(ReportConstant.view3a24,"DLHJ", departIds, start, end);
         String dataViewName3a24 = ReportViewUtil.buildView(ReportConstant.view3a24,"DLHJ", departIds, start, end);
         String dataViewName2119 = ReportViewUtil.buildView(ReportConstant.view2119,"CSL", departIds, start, end);
         String dataViewName2119 = ReportViewUtil.buildView(ReportConstant.view2119,"CSL", departIds, start, end);
         List<Map> SixMonthPowerConsumption = powerAnalysisNewMapper.querySixMonthPowerConsumption(dataViewName3a24, dataViewName2119, start, end, departIds);
         List<Map> SixMonthPowerConsumption = powerAnalysisNewMapper.querySixMonthPowerConsumption(dataViewName3a24, dataViewName2119, start, end, departIds);
+
+
         resultMap.put("totalResult", result);
         resultMap.put("totalResult", result);
         resultMap.put("dataList", SixMonthPowerConsumption);
         resultMap.put("dataList", SixMonthPowerConsumption);