Skip to content

张雷 / skboot-zhongye

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

环保能耗报表

1 个父辈 53f2e2fa
内嵌 并排
正在显示 2 个修改的文件 包含 82 行增加 和 20 行删除
sk-module-datafill/src/main/java/com/skua/modules/custom/mapper/xml/FCustomReportDatasetMapper.xml
...@@ -431,7 +431,11 @@ ...@@ -431,7 +431,11 @@
431 ROUND( SUM( v.GFCZL ), 2 ) AS ybagfczl, 431 ROUND( SUM( v.GFCZL ), 2 ) AS ybagfczl,
432 ROUND( SUM( v.WNL )*(1-AVG( v.WNHSL ))) AS jgnl, 432 ROUND( SUM( v.WNL )*(1-AVG( v.WNHSL ))) AS jgnl,
433 ROUND( SUM( v.WFCSL ), 2 ) AS wxfwcsl, 433 ROUND( SUM( v.WFCSL ), 2 ) AS wxfwcsl,
434 ROUND( SUM( v.WFCZL ), 2 ) AS wxfwczl 434 ROUND( SUM( v.WFCZL ), 2 ) AS wxfwczl,
435 IFNULL(v2.jscodl-v2.cscodl,0) AS codxjl,
436 IFNULL(v2.jsadl-v2.csadl,0) AS adxjl,
437 IFNULL(v2.jstpl-v2.cstpl,0) AS tpxjl,
438 IFNULL(v2.jstnl-v2.cstnl,0) AS tnxjl
435 FROM 439 FROM
436 ${dataViewName3} v 440 ${dataViewName3} v
437 LEFT JOIN ( 441 LEFT JOIN (
...@@ -439,6 +443,14 @@ ...@@ -439,6 +443,14 @@
439 LEFT ( v.time, 7 ) AS time, 443 LEFT ( v.time, 7 ) AS time,
440 ROUND( SUM( v.CSL )/10000, 2 ) AS sjwscll, 444 ROUND( SUM( v.CSL )/10000, 2 ) AS sjwscll,
441 ROUND( AVG( v.CSL )/10000, 2 ) AS rwscll, 445 ROUND( AVG( v.CSL )/10000, 2 ) AS rwscll,
446 ROUND( SUM( IFNULL(v.JSCOD*v.JSL,0)/1000000 ), 2 ) AS jscodl,
447 ROUND( SUM( IFNULL(v.CSCOD*v.CSL,0)/1000000 ), 2 ) AS cscodl,
448 ROUND( SUM( IFNULL(v.CSTN*v.CSL,0)/1000000 ), 2 ) AS cstnl,
449 ROUND( SUM( IFNULL(v.JSZD*v.JSL,0)/1000000 ), 2 ) AS jstnl,
450 ROUND( SUM( IFNULL(v.JSZL*v.JSL,0)/1000000 ), 2 ) AS jstpl,
451 ROUND( SUM( IFNULL(v.CSZL*v.CSL,0)/1000000 ), 2 ) AS cstpl,
452 ROUND( SUM( IFNULL(v.JSAD*v.JSL,0)/1000000 ), 2 ) AS jsadl,
453 ROUND( SUM( IFNULL(v.CSAD*v.CSL,0)/1000000 ), 2 ) AS csadl,
442 count( v.id ) AS scsj 454 count( v.id ) AS scsj
443 FROM 455 FROM
444 ${dataViewName2} v 456 ${dataViewName2} v
...@@ -458,25 +470,34 @@ ...@@ -458,25 +470,34 @@
458 <select id="getHjList" resultType="com.skua.modules.report.vo.JnhbReportDetailsHj"> 470 <select id="getHjList" resultType="com.skua.modules.report.vo.JnhbReportDetailsHj">
459 SELECT 471 SELECT
460 RIGHT(LEFT( v.time, 7 ),2) AS time, 472 RIGHT(LEFT( v.time, 7 ),2) AS time,
461 v2.sjwscll, 473 IFNULL(v2.sjwscll,0) AS sjwscll,
462 v2.rwscll, 474 IFNULL(v2.rwscll,0) AS rwscll,
463 v2.scsj, 475 IFNULL(v2.scsj,0) AS scsj,
464 ROUND(v2.scsj*f.pro_scale,2) AS wsclnl, 476 IFNULL(ROUND(v2.scsj*f.pro_scale,2),0) AS wsclnl,
465 ROUND( SUM( v.DLHJ ) / 10000, 2 ) AS dl, 477 IFNULL(ROUND( SUM( v.DLHJ ) / 10000, 2 ),0) AS dl,
466 ROUND( SUM( v.GFFDL ), 2 ) AS gffdl, 478 IFNULL(ROUND( SUM( v.GFFDL ), 2 ),0) AS gffdl,
467 ROUND( SUM( v.QY ), 2 ) AS qy, 479 IFNULL(ROUND( SUM( v.QY ), 2 ),0) AS qy,
468 ROUND( SUM( v.HXT ), 2 ) AS hxtsyl, 480 IFNULL(ROUND( SUM( v.HXT ), 2 ),0) AS hxtsyl,
469 ROUND( SUM( v.SH ), 2 ) AS shsyl, 481 IFNULL(ROUND( SUM( v.SH ), 2 ),0) AS shsyl,
470 ROUND( SUM( v.PAMRJ ), 2 ) AS xnjpam, 482 IFNULL(ROUND( SUM( v.PAMRJ ), 2 ),0) AS xnjpam,
471 ROUND( SUM( v.PACGT ), 2 ) AS xnjpac, 483 IFNULL(ROUND( SUM( v.PACGT ), 2 ),0) AS xnjpac,
472 ROUND( SUM( v.SCLPAMF+v.SCLPAMZ+v.PAMF+v.PAMZ ), 2 ) AS xnjqt, 484 IFNULL(ROUND( SUM( v.SCLPAMF+v.SCLPAMZ+v.PAMF+v.PAMZ ), 2 ),0) AS xnjqt,
473 ROUND( SUM( v.YSL ), 2 ) AS xssyl, 485 IFNULL(ROUND( SUM( v.YSL ), 2 ),0) AS xssyl,
474 ROUND( SUM( v.WNL ), 2 ) AS ybgfcsl, 486 IFNULL(ROUND( SUM( v.WNL ), 2 ),0) AS ybgfcsl,
475 ROUND( AVG( v.WNHSL ), 2 ) AS wnhsl, 487 IFNULL(ROUND( AVG( v.WNHSL ), 2 ),0) AS wnhsl,
476 ROUND( SUM( v.GFCZL ), 2 ) AS ybagfczl, 488 IFNULL(ROUND( SUM( v.GFCZL ), 2 ),0) AS ybagfczl,
477 ROUND( SUM( v.WNL )*(1-AVG( v.WNHSL ))) AS jgnl, 489 IFNULL(ROUND( SUM( v.WNL )*(1-AVG( v.WNHSL ))),0) AS jgnl,
478 ROUND( SUM( v.WFCSL ), 2 ) AS wxfwcsl, 490 IFNULL(ROUND( SUM( v.WFCSL ), 2 ),0) AS wxfwcsl,
479 ROUND( SUM( v.WFCZL ), 2 ) AS wxfwczl 491 IFNULL(ROUND( SUM( v.WFCZL ), 2 ),0) AS wxfwczl,
492 '0' wsclsjnl,
493 '0' xnjhj,
494 '0' zhnyxfl,
495 '0' eyhtpfl,
496 '0' ybgfczl,
497 IFNULL(v2.jscodl-v2.cscodl,0) AS codxjl,
498 IFNULL(v2.jsadl-v2.csadl,0) AS adxjl,
499 IFNULL(v2.jstpl-v2.cstpl,0) AS tpxjl,
500 IFNULL(v2.jstnl-v2.cstnl,0) AS tnxjl
480 FROM 501 FROM
481 ${dataViewName3} v 502 ${dataViewName3} v
482 LEFT JOIN ( 503 LEFT JOIN (
...@@ -484,6 +505,14 @@ ...@@ -484,6 +505,14 @@
484 LEFT ( v.time, 7 ) AS time, 505 LEFT ( v.time, 7 ) AS time,
485 ROUND( SUM( v.CSL )/10000, 2 ) AS sjwscll, 506 ROUND( SUM( v.CSL )/10000, 2 ) AS sjwscll,
486 ROUND( AVG( v.CSL )/10000, 2 ) AS rwscll, 507 ROUND( AVG( v.CSL )/10000, 2 ) AS rwscll,
508 ROUND( SUM( IFNULL(v.JSCOD*v.JSL,0)/1000000 ), 2 ) AS jscodl,
509 ROUND( SUM( IFNULL(v.CSCOD*v.CSL,0)/1000000 ), 2 ) AS cscodl,
510 ROUND( SUM( IFNULL(v.CSTN*v.CSL,0)/1000000 ), 2 ) AS cstnl,
511 ROUND( SUM( IFNULL(v.JSZD*v.JSL,0)/1000000 ), 2 ) AS jstnl,
512 ROUND( SUM( IFNULL(v.JSZL*v.JSL,0)/1000000 ), 2 ) AS jstpl,
513 ROUND( SUM( IFNULL(v.CSZL*v.CSL,0)/1000000 ), 2 ) AS cstpl,
514 ROUND( SUM( IFNULL(v.JSAD*v.JSL,0)/1000000 ), 2 ) AS jsadl,
515 ROUND( SUM( IFNULL(v.CSAD*v.CSL,0)/1000000 ), 2 ) AS csadl,
487 count( v.id ) AS scsj 516 count( v.id ) AS scsj
488 FROM 517 FROM
489 ${dataViewName2} v 518 ${dataViewName2} v
......
sk-module-datafill/src/main/java/com/skua/modules/custom/service/impl/FCustomReportDatasetServiceImpl.java
...@@ -10,6 +10,8 @@ import com.skua.modules.custom.mapper.FCustomReportDatasetMapper; ...@@ -10,6 +10,8 @@ import com.skua.modules.custom.mapper.FCustomReportDatasetMapper;
10 import com.skua.modules.custom.service.IFCustomReportDatasetService; 10 import com.skua.modules.custom.service.IFCustomReportDatasetService;
11 import com.skua.modules.custom.vo.DepartWeekReportVO; 11 import com.skua.modules.custom.vo.DepartWeekReportVO;
12 import com.skua.modules.custom.vo.FCustomReportDatasetVO; 12 import com.skua.modules.custom.vo.FCustomReportDatasetVO;
13
14 import java.text.DecimalFormat;
13 import java.time.LocalDate; 15 import java.time.LocalDate;
14 import java.time.format.DateTimeFormatter; 16 import java.time.format.DateTimeFormatter;
15 import java.time.temporal.TemporalAdjusters; 17 import java.time.temporal.TemporalAdjusters;
...@@ -19,6 +21,7 @@ import com.skua.modules.report.vo.*; ...@@ -19,6 +21,7 @@ import com.skua.modules.report.vo.*;
19 import com.skua.modules.report.vo.largeScreen.*; 21 import com.skua.modules.report.vo.largeScreen.*;
20 import com.skua.tool.util.DateUtils; 22 import com.skua.tool.util.DateUtils;
21 import com.skua.tool.util.JSUtils; 23 import com.skua.tool.util.JSUtils;
24 import io.swagger.annotations.ApiModelProperty;
22 import org.apache.commons.lang.StringUtils; 25 import org.apache.commons.lang.StringUtils;
23 import org.springframework.beans.factory.annotation.Autowired; 26 import org.springframework.beans.factory.annotation.Autowired;
24 import org.springframework.jdbc.core.BeanPropertyRowMapper; 27 import org.springframework.jdbc.core.BeanPropertyRowMapper;
...@@ -230,6 +233,7 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa ...@@ -230,6 +233,7 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
230 233
231 @Override 234 @Override
232 public Map<String, Object> jnhbReportDetails(String departId, String month) { 235 public Map<String, Object> jnhbReportDetails(String departId, String month) {
236 DecimalFormat df = new DecimalFormat("#.##");
233 Map<String, Object> map = new HashMap<>(); 237 Map<String, Object> map = new HashMap<>();
234 List<JnhbReportDetailsDy> dyList = new ArrayList<>(); 238 List<JnhbReportDetailsDy> dyList = new ArrayList<>();
235 List<JnhbReportDetailsJs> jsList = new ArrayList<>(); 239 List<JnhbReportDetailsJs> jsList = new ArrayList<>();
...@@ -240,6 +244,35 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa ...@@ -240,6 +244,35 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
240 dyList = mapper.getDyList(dataViewName2, dataViewName3, departId, year); 244 dyList = mapper.getDyList(dataViewName2, dataViewName3, departId, year);
241 jsList = mapper.getJsList(dataViewName2, dataViewName3, departId, year); 245 jsList = mapper.getJsList(dataViewName2, dataViewName3, departId, year);
242 hjList = mapper.getHjList(dataViewName2, dataViewName3, departId, year); 246 hjList = mapper.getHjList(dataViewName2, dataViewName3, departId, year);
247 for (int i = 0; i < hjList.size(); i++) {
248 if(i > 0){
249 JnhbReportDetailsHj jnhbHj1 = hjList.get(i);
250 JnhbReportDetailsHj jnhbHj0 = hjList.get(i-1);
251 jnhbHj1.setWsclsjnl(df.format(Double.parseDouble(jnhbHj0.getWsclsjnl())+Double.parseDouble(jnhbHj1.getWsclsjnl())));
252 jnhbHj1.setScsj(df.format(Double.parseDouble(jnhbHj0.getScsj())+Double.parseDouble(jnhbHj1.getScsj())));
253 jnhbHj1.setDl(df.format(Double.parseDouble(jnhbHj0.getDl())+Double.parseDouble(jnhbHj1.getDl())));
254 jnhbHj1.setGffdl(df.format(Double.parseDouble(jnhbHj0.getGffdl())+Double.parseDouble(jnhbHj1.getGffdl())));
255 jnhbHj1.setQy(df.format(Double.parseDouble(jnhbHj0.getQy())+Double.parseDouble(jnhbHj1.getQy())));
256 jnhbHj1.setHxtsyl(df.format(Double.parseDouble(jnhbHj0.getHxtsyl())+Double.parseDouble(jnhbHj1.getHxtsyl())));
257 jnhbHj1.setShsyl(df.format(Double.parseDouble(jnhbHj0.getShsyl())+Double.parseDouble(jnhbHj1.getShsyl())));
258 jnhbHj1.setXnjpam(df.format(Double.parseDouble(jnhbHj0.getXnjpam())+Double.parseDouble(jnhbHj1.getXnjpam())));
259 jnhbHj1.setXnjpac(df.format(Double.parseDouble(jnhbHj0.getXnjpac())+Double.parseDouble(jnhbHj1.getXnjpac())));
260 jnhbHj1.setXnjqt(df.format(Double.parseDouble(jnhbHj0.getXnjqt())+Double.parseDouble(jnhbHj1.getXnjqt())));
261 jnhbHj1.setXnjhj(df.format(Double.parseDouble(jnhbHj0.getXnjhj())+Double.parseDouble(jnhbHj1.getXnjhj())));
262 jnhbHj1.setXssyl(df.format(Double.parseDouble(jnhbHj0.getXssyl())+Double.parseDouble(jnhbHj1.getXssyl())));
263 jnhbHj1.setJgnl(df.format(Double.parseDouble(jnhbHj0.getJgnl())+Double.parseDouble(jnhbHj1.getJgnl())));
264 jnhbHj1.setWxfwcsl(df.format(Double.parseDouble(jnhbHj0.getWxfwcsl())+Double.parseDouble(jnhbHj1.getWxfwcsl())));
265 jnhbHj1.setWxfwczl(df.format(Double.parseDouble(jnhbHj0.getWxfwczl())+Double.parseDouble(jnhbHj1.getWxfwczl())));
266 jnhbHj1.setZhnyxfl(df.format(Double.parseDouble(jnhbHj0.getZhnyxfl())+Double.parseDouble(jnhbHj1.getZhnyxfl())));
267 jnhbHj1.setEyhtpfl(df.format(Double.parseDouble(jnhbHj0.getEyhtpfl())+Double.parseDouble(jnhbHj1.getEyhtpfl())));
268 jnhbHj1.setYbgfcsl(df.format(Double.parseDouble(jnhbHj0.getYbgfcsl())+Double.parseDouble(jnhbHj1.getYbgfcsl())));
269 jnhbHj1.setYbgfczl(df.format(Double.parseDouble(jnhbHj0.getYbgfczl())+Double.parseDouble(jnhbHj1.getYbgfczl())));
270 jnhbHj1.setCodxjl(df.format(Double.parseDouble(jnhbHj0.getCodxjl())+Double.parseDouble(jnhbHj1.getCodxjl())));
271 jnhbHj1.setAdxjl(df.format(Double.parseDouble(jnhbHj0.getAdxjl())+Double.parseDouble(jnhbHj1.getAdxjl())));
272 jnhbHj1.setTpxjl(df.format(Double.parseDouble(jnhbHj0.getTpxjl())+Double.parseDouble(jnhbHj1.getTpxjl())));
273 jnhbHj1.setTnxjl(df.format(Double.parseDouble(jnhbHj0.getTnxjl())+Double.parseDouble(jnhbHj1.getTnxjl())));
274 }
275 }
243 map.put("zbtj",dyList); 276 map.put("zbtj",dyList);
244 map.put("zbfx",jsList); 277 map.put("zbfx",jsList);
245 map.put("zblj",hjList); 278 map.put("zblj",hjList);
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!