kangwei: 解决：吨水药费，吨水电费数据不显示问题

@@ -6,6 +6,7 @@ import java.util.Map;
 
 
 import com.skua.common.constant.ReportConstant;
 import com.skua.common.constant.ReportConstant;
 import com.skua.common.report.vo.ReportItemVO;
 import com.skua.common.report.vo.ReportItemVO;
+import com.skua.modules.common.vo.DateVO;
 import com.skua.tool.util.DateUtils;
 import com.skua.tool.util.DateUtils;
 import com.skua.tool.util.JSUtils;
 import com.skua.tool.util.JSUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
@@ -324,9 +325,10 @@ public class ReportViewUtil {
 
 
 	public  static ReportItemVO getSumValueByTBHB(String reportId, String fields, String departIds , String startTime , String endTime,String operatorSign){
 	public  static ReportItemVO getSumValueByTBHB(String reportId, String fields, String departIds , String startTime , String endTime,String operatorSign){
 		ReportItemVO reportItemVO = null;
 		ReportItemVO reportItemVO = null;
+		DateVO dateVO = new DateVO(startTime);
 		String dataViewName3a24_value = ReportViewUtil.buildViewLike(reportId,fields, departIds, startTime,endTime,operatorSign);
 		String dataViewName3a24_value = ReportViewUtil.buildViewLike(reportId,fields, departIds, startTime,endTime,operatorSign);
-		String dataViewName3a24_valueHB = ReportViewUtil.buildViewLike(reportId,fields, departIds, DateUtils.getHbDate(startTime),DateUtils.getHbMonthDate(endTime)+"-31",operatorSign);
-		String dataViewName3a24_valueTB = ReportViewUtil.buildViewLike(reportId,fields, departIds, DateUtils.getTbDate(startTime),DateUtils.getHbMonthDate(endTime)+"-31",operatorSign);
+		String dataViewName3a24_valueHB = ReportViewUtil.buildViewLike(reportId,fields, departIds, dateVO.getLastMonthStartTime(),dateVO.getLastMonthEndTime(),operatorSign);
+		String dataViewName3a24_valueTB = ReportViewUtil.buildViewLike(reportId,fields, departIds, dateVO.getLastYearMonthStartTime(),dateVO.getLastYearMonthEndTime(),operatorSign);
 
 
 		String fieldsSql = "";
 		String fieldsSql = "";
 		if(StringUtils.isNotEmpty(fields)) {
 		if(StringUtils.isNotEmpty(fields)) {
@@ -338,18 +340,25 @@ public class ReportViewUtil {
 		}
 		}
 		String sql = "select ";
 		String sql = "select ";
 		sql += "(select ROUND("+fieldsSql+",2) 'value'  from "  + dataViewName3a24_value+ "aaa) 'value',";
 		sql += "(select ROUND("+fieldsSql+",2) 'value'  from "  + dataViewName3a24_value+ "aaa) 'value',";
-		sql += "(select ROUND("+fieldsSql+",2) 'value'  from "  + dataViewName3a24_valueHB+ "aaa) 'valueHB',";
-		sql += "(select ROUND("+fieldsSql+",2) 'value'  from "  + dataViewName3a24_valueTB+ "aaa) 'valueTB' ";
+		sql += "(select ROUND("+fieldsSql+",2) 'value'  from "  + dataViewName3a24_valueHB+ "aaa) 'valueHb',";
+		sql += "(select ROUND("+fieldsSql+",2) 'value'  from "  + dataViewName3a24_valueTB+ "aaa) 'valueTb' ";
 
 
 		sql += " from dual";
 		sql += " from dual";
 		JdbcTemplate masterDB = (JdbcTemplate)SpringContextUtils.getBean("master");
 		JdbcTemplate masterDB = (JdbcTemplate)SpringContextUtils.getBean("master");
+		/*
+		Map<String, Object> dataMap = masterDB.queryForMap(sql);
+		reportItemVO = new ReportItemVO();
+		reportItemVO.setValue(dataMap.get("value").toString());
+		reportItemVO.setValueHb(dataMap.get("valueHb").toString());
+		reportItemVO.setValueTb(dataMap.get("valueTb").toString());*/
 
 
 		List<ReportItemVO> dataList = masterDB.query(sql,new BeanPropertyRowMapper<ReportItemVO>(ReportItemVO.class));
 		List<ReportItemVO> dataList = masterDB.query(sql,new BeanPropertyRowMapper<ReportItemVO>(ReportItemVO.class));
-		if(dataList != null && !dataList.isEmpty()){
-			reportItemVO  = dataList.get(0);
+		if(	dataList!= null && !dataList.isEmpty()){
+			reportItemVO = dataList.get(0);
 		}else{
 		}else{
 			reportItemVO = new ReportItemVO();
 			reportItemVO = new ReportItemVO();
 		}
 		}
+
 		return reportItemVO;
 		return reportItemVO;
 	}
 	}
 
 

@@ -397,11 +397,11 @@ public class ReportItemvService {
         ReportItemVO csl_reportVO = ReportViewUtil.getSumValueByTBHB(ReportConstant.view2119,ReportConstant.field_CSL, departId, startTime, endTime);
         ReportItemVO csl_reportVO = ReportViewUtil.getSumValueByTBHB(ReportConstant.view2119,ReportConstant.field_CSL, departId, startTime, endTime);
 
 
         //当月数据/环比、同比
         //当月数据/环比、同比
-        FRportlCommandCenterVO  nowMonthVO = new FRportlCommandCenterVO("月总电耗(万kwh)", "万kwh",JSUtils.divide(dlhjData.getValue(),10000), JSUtils.divide(dlhjData.getValueTb(),10000), JSUtils.divide(dlhjData.getValueHb(),10000));
+        FRportlCommandCenterVO  nowMonthVO = new FRportlCommandCenterVO("月总电耗", "万kwh",JSUtils.divide(dlhjData.getValue(),10000), JSUtils.divide(dlhjData.getValueTb(),10000), JSUtils.divide(dlhjData.getValueHb(),10000));
         //日均数据：/环比/同比
         //日均数据：/环比/同比
-        FRportlCommandCenterVO  lastMonthVO = new FRportlCommandCenterVO("吨水电费(元/t)","元/t",JSUtils.divide(dfValue,csl_reportVO.getValue()) ,JSUtils.divide(dfTBValue,csl_reportVO.getValueTb())  ,JSUtils.divide(dfHBValue,csl_reportVO.getValueHb()));
+        FRportlCommandCenterVO  lastMonthVO = new FRportlCommandCenterVO("吨水电费","元/t",JSUtils.divide(dfValue,csl_reportVO.getValue()) ,JSUtils.divide(dfTBValue,csl_reportVO.getValueTb())  ,JSUtils.divide(dfHBValue,csl_reportVO.getValueHb()));
         //吨水消耗
         //吨水消耗
-        FRportlCommandCenterVO  lastYearVo = new FRportlCommandCenterVO("吨水电耗(kwh/t)","kwh/t",dsdh_value ,dsdh_value_Tb,dsdh_value_Hb );
+        FRportlCommandCenterVO  lastYearVo = new FRportlCommandCenterVO("吨水电耗","kwh/t",dsdh_value ,dsdh_value_Tb,dsdh_value_Hb );
         fRportlCommandCenterVOList.add( nowMonthVO) ;
         fRportlCommandCenterVOList.add( nowMonthVO) ;
         fRportlCommandCenterVOList.add( lastMonthVO) ;
         fRportlCommandCenterVOList.add( lastMonthVO) ;
         fRportlCommandCenterVOList.add( lastYearVo) ;
         fRportlCommandCenterVOList.add( lastYearVo) ;