Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
27f89834 由 张雷
选项

Merge remote-tracking branch 'origin/master' into master

2 个父辈 52eae2eb 7ceeebd1
内嵌 并排
正在显示 1 个修改的文件 包含 6 行增加 和 6 行删除
sk-module-biz/src/main/java/com/skua/modules/algorithm/service/impl/ReportItemvService.java
...@@ -82,7 +82,7 @@ public class ReportItemvService { ...@@ -82,7 +82,7 @@ public class ReportItemvService {
82 */ 82 */
83 public List<FRportlCommandCenterVO> statisticsByElectricity(String departId, String startTime, String endTime) { 83 public List<FRportlCommandCenterVO> statisticsByElectricity(String departId, String startTime, String endTime) {
84 List<FRportlCommandCenterVO> fRportlCommandCenterVOList = new ArrayList<>(); 84 List<FRportlCommandCenterVO> fRportlCommandCenterVOList = new ArrayList<>();
85 // DateVO dateVO = new DateVO(startTime); 85 DateVO dateVO = new DateVO(startTime);
86 // String dataViewName3a24 = ReportViewUtil.buildViewLike(ReportConstant.view3a24,"DLHJ", departId, startTime,endTime); 86 // String dataViewName3a24 = ReportViewUtil.buildViewLike(ReportConstant.view3a24,"DLHJ", departId, startTime,endTime);
87 // String sql = "select ROUND( SUM( IFNULL(aaa.DLHJ,0) ), 2 ) AS DLHJ from " + dataViewName3a24+ "aaa"; 87 // String sql = "select ROUND( SUM( IFNULL(aaa.DLHJ,0) ), 2 ) AS DLHJ from " + dataViewName3a24+ "aaa";
88 88
...@@ -90,16 +90,16 @@ public class ReportItemvService { ...@@ -90,16 +90,16 @@ public class ReportItemvService {
90 90
91 91
92 String dlhj_avg_value = getAvgDLHJ(departId,startTime, endTime); 92 String dlhj_avg_value = getAvgDLHJ(departId,startTime, endTime);
93 String dlhj_avg_valueHB = getAvgDLHJ(departId, DateUtils.getHbDate(startTime),DateUtils.getHbDate(endTime)); 93 String dlhj_avg_valueHB = getAvgDLHJ(departId, dateVO.getLastMonthStartTime(),dateVO.getLastMonthEndTime());
94 String dlhj_avg_valueTB = getAvgDLHJ(departId, DateUtils.getTbDate(startTime),DateUtils.getTbDate(endTime)); 94 String dlhj_avg_valueTB = getAvgDLHJ(departId, dateVO.getLastYearMonthStartTime(),dateVO.getLastYearMonthEndTime());
95 95
96 /* String csl_avg_value = getSumCSL(departId,dateVO.getNowMonthStartDate(),dateVO.getNowMonthEndDate()); 96 /* String csl_avg_value = getSumCSL(departId,dateVO.getNowMonthStartDate(),dateVO.getNowMonthEndDate());
97 String csl_avg_valueHB = getSumCSL(departId, dateVO.getLastMonthStartTime(),dateVO.getLastMonthEndTime()); 97 String csl_avg_valueHB = getSumCSL(departId, dateVO.getLastMonthStartTime(),dateVO.getLastMonthEndTime());
98 String csl_avg_valueTB = getSumCSL(departId, dateVO.getLastYearMonthStartTime(),dateVO.getLastYearMonthEndTime());*/ 98 String csl_avg_valueTB = getSumCSL(departId, dateVO.getLastYearMonthStartTime(),dateVO.getLastYearMonthEndTime());*/
99 99
100 String dsdh_value = ReportViewUtil.getValueByDSDH(departId,startTime, endTime) ; 100 String dsdh_value = ReportViewUtil.getValueByDSDH(departId,startTime, endTime) ;
101 String dsdh_value_Hb = ReportViewUtil.getValueByDSDH(departId,DateUtils.getHbDate(startTime),DateUtils.getHbDate(endTime)) ; 101 String dsdh_value_Hb = ReportViewUtil.getValueByDSDH(departId,dateVO.getLastMonthStartTime(),dateVO.getLastMonthEndTime()) ;
102 String dsdh_value_Tb = ReportViewUtil.getValueByDSDH(departId,DateUtils.getTbDate(startTime),DateUtils.getTbDate(endTime)) ; 102 String dsdh_value_Tb = ReportViewUtil.getValueByDSDH(departId,dateVO.getLastYearMonthStartTime(),dateVO.getLastYearMonthEndTime()) ;
103 // long nowDifferDay = DateUtils.differenceDay(dateVO.getNowMonthStartDate(),dateVO.getNowMonthEndDate()); 103 // long nowDifferDay = DateUtils.differenceDay(dateVO.getNowMonthStartDate(),dateVO.getNowMonthEndDate());
104 // long lastMonthDifferDay = DateUtils.differenceDay(dateVO.getLastMonthStartTime(),dateVO.getLastMonthEndTime()); 104 // long lastMonthDifferDay = DateUtils.differenceDay(dateVO.getLastMonthStartTime(),dateVO.getLastMonthEndTime());
105 // long lastYearDifferDay = DateUtils.differenceDay(dateVO.getLastYearMonthStartTime(),dateVO.getLastYearMonthEndTime()); 105 // long lastYearDifferDay = DateUtils.differenceDay(dateVO.getLastYearMonthStartTime(),dateVO.getLastYearMonthEndTime());
...@@ -107,7 +107,7 @@ public class ReportItemvService { ...@@ -107,7 +107,7 @@ public class ReportItemvService {
107 //当月数据/环比、同比 107 //当月数据/环比、同比
108 FRportlCommandCenterVO nowMonthVO = new FRportlCommandCenterVO("月总电耗(", JSUtils.divide(dlhjData.getValue(),10000), JSUtils.divide(dlhjData.getValueTb(),10000), JSUtils.divide(dlhjData.getValueHb(),10000)); 108 FRportlCommandCenterVO nowMonthVO = new FRportlCommandCenterVO("月总电耗(", JSUtils.divide(dlhjData.getValue(),10000), JSUtils.divide(dlhjData.getValueTb(),10000), JSUtils.divide(dlhjData.getValueHb(),10000));
109 //日均数据：/环比/同比 109 //日均数据：/环比/同比
110 FRportlCommandCenterVO lastMonthVO = new FRportlCommandCenterVO("日均电耗",dlhj_avg_value ,JSUtils.divide(dlhj_avg_valueTB,10000) ,JSUtils.divide(dlhj_avg_valueHB,10000)); 110 FRportlCommandCenterVO lastMonthVO = new FRportlCommandCenterVO("日均电耗",JSUtils.divide(dlhj_avg_value,10000) ,JSUtils.divide(dlhj_avg_valueTB,10000) ,JSUtils.divide(dlhj_avg_valueHB,10000));
111 //吨水消耗 111 //吨水消耗
112 FRportlCommandCenterVO lastYearVo = new FRportlCommandCenterVO("吨水电耗",dsdh_value ,dsdh_value_Tb,dsdh_value_Hb ); 112 FRportlCommandCenterVO lastYearVo = new FRportlCommandCenterVO("吨水电耗",dsdh_value ,dsdh_value_Tb,dsdh_value_Hb );
113 fRportlCommandCenterVOList.add( nowMonthVO) ; 113 fRportlCommandCenterVOList.add( nowMonthVO) ;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!