kangwei：指挥中心，费用公式修改

@@ -258,25 +258,26 @@ public class ReportItemvService {
 
 
     public List<ReportDateTrendVO> getDateFieldList(String reportId, String field, String departId , String startTime , String endTime){
     public List<ReportDateTrendVO> getDateFieldList(String reportId, String field, String departId , String startTime , String endTime){
         String  dataViewName2119 = ReportViewUtil.buildView(reportId,field, departId, startTime,endTime);
         String  dataViewName2119 = ReportViewUtil.buildView(reportId,field, departId, startTime,endTime);
-        String sql  = "select  aaa.time, sum(aaa."+field+") 'value'  from "  + dataViewName2119+ "aaa  group by aaa.time";
+
+        String sql  = "select  DATE_FORMAT( aaa.time, '%Y-%m' ) time ,  ROUND(SUM(IFNULL(aaa."+field+",0)),2) AS 'value'  from "  + dataViewName2119+ "aaa  group by DATE_FORMAT( aaa.time, '%Y-%m' ) ";
         return getJdbcTemplate().query(sql,new BeanPropertyRowMapper<ReportDateTrendVO>(ReportDateTrendVO.class));
         return getJdbcTemplate().query(sql,new BeanPropertyRowMapper<ReportDateTrendVO>(ReportDateTrendVO.class));
     }
     }
     public String getSumCSL(String departId ,String startTime ,String endTime){
     public String getSumCSL(String departId ,String startTime ,String endTime){
         String  dataViewName2119 = ReportViewUtil.buildViewLike(ReportConstant.view2119,"CSL", departId, startTime,endTime);
         String  dataViewName2119 = ReportViewUtil.buildViewLike(ReportConstant.view2119,"CSL", departId, startTime,endTime);
-        String sql  = "select sum(aaa.CSL)  from "  + dataViewName2119+ "aaa";
+        String sql  = "select ROUND( sum( IFNULL( aaa.CSL,0) ),2)  from "  + dataViewName2119+ "aaa";
         String  csl  =   getJdbcTemplate().queryForObject(sql,String.class);
         String  csl  =   getJdbcTemplate().queryForObject(sql,String.class);
         return ConvertUtils.getString(csl,"0.00");
         return ConvertUtils.getString(csl,"0.00");
     }
     }
 
 
     public String getSumDLHJ(String departId ,String startTime ,String endTime){
     public String getSumDLHJ(String departId ,String startTime ,String endTime){
         String dataViewName3a24 = ReportViewUtil.buildViewLike(ReportConstant.view3a24,"DLHJ", departId, startTime,endTime);
         String dataViewName3a24 = ReportViewUtil.buildViewLike(ReportConstant.view3a24,"DLHJ", departId, startTime,endTime);
-        String sql  = "select sum(aaa.DLHJ)  from "  + dataViewName3a24+ "aaa";
+        String sql  = "select ROUND( sum( IFNULL( aaa.DLHJ,0) ),2)  from "  + dataViewName3a24+ "aaa";
         String  dlhj  =   getJdbcTemplate().queryForObject(sql,String.class);
         String  dlhj  =   getJdbcTemplate().queryForObject(sql,String.class);
         return ConvertUtils.getString(dlhj,"0.00");
         return ConvertUtils.getString(dlhj,"0.00");
     }
     }
     public String getSumValue(String viewName,String fileds,String departId ,String startTime ,String endTime){
     public String getSumValue(String viewName,String fileds,String departId ,String startTime ,String endTime){
         String dataViewName3a24 = ReportViewUtil.buildViewLike(viewName,fileds, departId, startTime,endTime);
         String dataViewName3a24 = ReportViewUtil.buildViewLike(viewName,fileds, departId, startTime,endTime);
-        String sql  = "select sum(aaa."+fileds+")  from "  + dataViewName3a24+ "aaa";
+        String sql  = "select ROUND(sum( IFNULL( aaa."+fileds+",0)),2)  from "  + dataViewName3a24+ "aaa";
         String  dlhj  =   getJdbcTemplate().queryForObject(sql,String.class);
         String  dlhj  =   getJdbcTemplate().queryForObject(sql,String.class);
         return ConvertUtils.getString(dlhj,"0.00");
         return ConvertUtils.getString(dlhj,"0.00");
     }
     }

@@ -143,7 +143,7 @@
             report_electric_cost t
             report_electric_cost t
         WHERE
         WHERE
           t.depart_id in(${departIds})
           t.depart_id in(${departIds})
-           and  t.month BETWEEN #{startDate} AND ${endDate}
+           and  t.month >= #{startDate} AND  t.month <= #{endDate}
         GROUP BY t.month
         GROUP BY t.month
     </select>
     </select>