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 @@
ROUND( SUM( v.GFCZL ), 2 ) AS ybagfczl,
ROUND( SUM( v.WNL )*(1-AVG( v.WNHSL ))) AS jgnl,
ROUND( SUM( v.WFCSL ), 2 ) AS wxfwcsl,
ROUND( SUM( v.WFCZL ), 2 ) AS wxfwczl
ROUND( SUM( v.WFCZL ), 2 ) AS wxfwczl,
IFNULL(v2.jscodl-v2.cscodl,0) AS codxjl,
IFNULL(v2.jsadl-v2.csadl,0) AS adxjl,
IFNULL(v2.jstpl-v2.cstpl,0) AS tpxjl,
IFNULL(v2.jstnl-v2.cstnl,0) AS tnxjl
FROM
${dataViewName3} v
LEFT JOIN (
......@@ -439,6 +443,14 @@
LEFT ( v.time, 7 ) AS time,
ROUND( SUM( v.CSL )/10000, 2 ) AS sjwscll,
ROUND( AVG( v.CSL )/10000, 2 ) AS rwscll,
ROUND( SUM( IFNULL(v.JSCOD*v.JSL,0)/1000000 ), 2 ) AS jscodl,
ROUND( SUM( IFNULL(v.CSCOD*v.CSL,0)/1000000 ), 2 ) AS cscodl,
ROUND( SUM( IFNULL(v.CSTN*v.CSL,0)/1000000 ), 2 ) AS cstnl,
ROUND( SUM( IFNULL(v.JSZD*v.JSL,0)/1000000 ), 2 ) AS jstnl,
ROUND( SUM( IFNULL(v.JSZL*v.JSL,0)/1000000 ), 2 ) AS jstpl,
ROUND( SUM( IFNULL(v.CSZL*v.CSL,0)/1000000 ), 2 ) AS cstpl,
ROUND( SUM( IFNULL(v.JSAD*v.JSL,0)/1000000 ), 2 ) AS jsadl,
ROUND( SUM( IFNULL(v.CSAD*v.CSL,0)/1000000 ), 2 ) AS csadl,
count( v.id ) AS scsj
FROM
${dataViewName2} v
......@@ -458,25 +470,34 @@
<select id="getHjList" resultType="com.skua.modules.report.vo.JnhbReportDetailsHj">
SELECT
RIGHT(LEFT( v.time, 7 ),2) AS time,
v2.sjwscll,
v2.rwscll,
v2.scsj,
ROUND(v2.scsj*f.pro_scale,2) AS wsclnl,
ROUND( SUM( v.DLHJ ) / 10000, 2 ) AS dl,
ROUND( SUM( v.GFFDL ), 2 ) AS gffdl,
ROUND( SUM( v.QY ), 2 ) AS qy,
ROUND( SUM( v.HXT ), 2 ) AS hxtsyl,
ROUND( SUM( v.SH ), 2 ) AS shsyl,
ROUND( SUM( v.PAMRJ ), 2 ) AS xnjpam,
ROUND( SUM( v.PACGT ), 2 ) AS xnjpac,
ROUND( SUM( v.SCLPAMF+v.SCLPAMZ+v.PAMF+v.PAMZ ), 2 ) AS xnjqt,
ROUND( SUM( v.YSL ), 2 ) AS xssyl,
ROUND( SUM( v.WNL ), 2 ) AS ybgfcsl,
ROUND( AVG( v.WNHSL ), 2 ) AS wnhsl,
ROUND( SUM( v.GFCZL ), 2 ) AS ybagfczl,
ROUND( SUM( v.WNL )*(1-AVG( v.WNHSL ))) AS jgnl,
ROUND( SUM( v.WFCSL ), 2 ) AS wxfwcsl,
ROUND( SUM( v.WFCZL ), 2 ) AS wxfwczl
IFNULL(v2.sjwscll,0) AS sjwscll,
IFNULL(v2.rwscll,0) AS rwscll,
IFNULL(v2.scsj,0) AS scsj,
IFNULL(ROUND(v2.scsj*f.pro_scale,2),0) AS wsclnl,
IFNULL(ROUND( SUM( v.DLHJ ) / 10000, 2 ),0) AS dl,
IFNULL(ROUND( SUM( v.GFFDL ), 2 ),0) AS gffdl,
IFNULL(ROUND( SUM( v.QY ), 2 ),0) AS qy,
IFNULL(ROUND( SUM( v.HXT ), 2 ),0) AS hxtsyl,
IFNULL(ROUND( SUM( v.SH ), 2 ),0) AS shsyl,
IFNULL(ROUND( SUM( v.PAMRJ ), 2 ),0) AS xnjpam,
IFNULL(ROUND( SUM( v.PACGT ), 2 ),0) AS xnjpac,
IFNULL(ROUND( SUM( v.SCLPAMF+v.SCLPAMZ+v.PAMF+v.PAMZ ), 2 ),0) AS xnjqt,
IFNULL(ROUND( SUM( v.YSL ), 2 ),0) AS xssyl,
IFNULL(ROUND( SUM( v.WNL ), 2 ),0) AS ybgfcsl,
IFNULL(ROUND( AVG( v.WNHSL ), 2 ),0) AS wnhsl,
IFNULL(ROUND( SUM( v.GFCZL ), 2 ),0) AS ybagfczl,
IFNULL(ROUND( SUM( v.WNL )*(1-AVG( v.WNHSL ))),0) AS jgnl,
IFNULL(ROUND( SUM( v.WFCSL ), 2 ),0) AS wxfwcsl,
IFNULL(ROUND( SUM( v.WFCZL ), 2 ),0) AS wxfwczl,
'0' wsclsjnl,
'0' xnjhj,
'0' zhnyxfl,
'0' eyhtpfl,
'0' ybgfczl,
IFNULL(v2.jscodl-v2.cscodl,0) AS codxjl,
IFNULL(v2.jsadl-v2.csadl,0) AS adxjl,
IFNULL(v2.jstpl-v2.cstpl,0) AS tpxjl,
IFNULL(v2.jstnl-v2.cstnl,0) AS tnxjl
FROM
${dataViewName3} v
LEFT JOIN (
......@@ -484,6 +505,14 @@
LEFT ( v.time, 7 ) AS time,
ROUND( SUM( v.CSL )/10000, 2 ) AS sjwscll,
ROUND( AVG( v.CSL )/10000, 2 ) AS rwscll,
ROUND( SUM( IFNULL(v.JSCOD*v.JSL,0)/1000000 ), 2 ) AS jscodl,
ROUND( SUM( IFNULL(v.CSCOD*v.CSL,0)/1000000 ), 2 ) AS cscodl,
ROUND( SUM( IFNULL(v.CSTN*v.CSL,0)/1000000 ), 2 ) AS cstnl,
ROUND( SUM( IFNULL(v.JSZD*v.JSL,0)/1000000 ), 2 ) AS jstnl,
ROUND( SUM( IFNULL(v.JSZL*v.JSL,0)/1000000 ), 2 ) AS jstpl,
ROUND( SUM( IFNULL(v.CSZL*v.CSL,0)/1000000 ), 2 ) AS cstpl,
ROUND( SUM( IFNULL(v.JSAD*v.JSL,0)/1000000 ), 2 ) AS jsadl,
ROUND( SUM( IFNULL(v.CSAD*v.CSL,0)/1000000 ), 2 ) AS csadl,
count( v.id ) AS scsj
FROM
${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;
import com.skua.modules.custom.service.IFCustomReportDatasetService;
import com.skua.modules.custom.vo.DepartWeekReportVO;
import com.skua.modules.custom.vo.FCustomReportDatasetVO;
import java.text.DecimalFormat;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAdjusters;
......@@ -19,6 +21,7 @@ import com.skua.modules.report.vo.*;
import com.skua.modules.report.vo.largeScreen.*;
import com.skua.tool.util.DateUtils;
import com.skua.tool.util.JSUtils;
import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
......@@ -230,6 +233,7 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
@Override
public Map<String, Object> jnhbReportDetails(String departId, String month) {
DecimalFormat df = new DecimalFormat("#.##");
Map<String, Object> map = new HashMap<>();
List<JnhbReportDetailsDy> dyList = new ArrayList<>();
List<JnhbReportDetailsJs> jsList = new ArrayList<>();
......@@ -240,6 +244,35 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
dyList = mapper.getDyList(dataViewName2, dataViewName3, departId, year);
jsList = mapper.getJsList(dataViewName2, dataViewName3, departId, year);
hjList = mapper.getHjList(dataViewName2, dataViewName3, departId, year);
for (int i = 0; i < hjList.size(); i++) {
if(i > 0){
JnhbReportDetailsHj jnhbHj1 = hjList.get(i);
JnhbReportDetailsHj jnhbHj0 = hjList.get(i-1);
jnhbHj1.setWsclsjnl(df.format(Double.parseDouble(jnhbHj0.getWsclsjnl())+Double.parseDouble(jnhbHj1.getWsclsjnl())));
jnhbHj1.setScsj(df.format(Double.parseDouble(jnhbHj0.getScsj())+Double.parseDouble(jnhbHj1.getScsj())));
jnhbHj1.setDl(df.format(Double.parseDouble(jnhbHj0.getDl())+Double.parseDouble(jnhbHj1.getDl())));
jnhbHj1.setGffdl(df.format(Double.parseDouble(jnhbHj0.getGffdl())+Double.parseDouble(jnhbHj1.getGffdl())));
jnhbHj1.setQy(df.format(Double.parseDouble(jnhbHj0.getQy())+Double.parseDouble(jnhbHj1.getQy())));
jnhbHj1.setHxtsyl(df.format(Double.parseDouble(jnhbHj0.getHxtsyl())+Double.parseDouble(jnhbHj1.getHxtsyl())));
jnhbHj1.setShsyl(df.format(Double.parseDouble(jnhbHj0.getShsyl())+Double.parseDouble(jnhbHj1.getShsyl())));
jnhbHj1.setXnjpam(df.format(Double.parseDouble(jnhbHj0.getXnjpam())+Double.parseDouble(jnhbHj1.getXnjpam())));
jnhbHj1.setXnjpac(df.format(Double.parseDouble(jnhbHj0.getXnjpac())+Double.parseDouble(jnhbHj1.getXnjpac())));
jnhbHj1.setXnjqt(df.format(Double.parseDouble(jnhbHj0.getXnjqt())+Double.parseDouble(jnhbHj1.getXnjqt())));
jnhbHj1.setXnjhj(df.format(Double.parseDouble(jnhbHj0.getXnjhj())+Double.parseDouble(jnhbHj1.getXnjhj())));
jnhbHj1.setXssyl(df.format(Double.parseDouble(jnhbHj0.getXssyl())+Double.parseDouble(jnhbHj1.getXssyl())));
jnhbHj1.setJgnl(df.format(Double.parseDouble(jnhbHj0.getJgnl())+Double.parseDouble(jnhbHj1.getJgnl())));
jnhbHj1.setWxfwcsl(df.format(Double.parseDouble(jnhbHj0.getWxfwcsl())+Double.parseDouble(jnhbHj1.getWxfwcsl())));
jnhbHj1.setWxfwczl(df.format(Double.parseDouble(jnhbHj0.getWxfwczl())+Double.parseDouble(jnhbHj1.getWxfwczl())));
jnhbHj1.setZhnyxfl(df.format(Double.parseDouble(jnhbHj0.getZhnyxfl())+Double.parseDouble(jnhbHj1.getZhnyxfl())));
jnhbHj1.setEyhtpfl(df.format(Double.parseDouble(jnhbHj0.getEyhtpfl())+Double.parseDouble(jnhbHj1.getEyhtpfl())));
jnhbHj1.setYbgfcsl(df.format(Double.parseDouble(jnhbHj0.getYbgfcsl())+Double.parseDouble(jnhbHj1.getYbgfcsl())));
jnhbHj1.setYbgfczl(df.format(Double.parseDouble(jnhbHj0.getYbgfczl())+Double.parseDouble(jnhbHj1.getYbgfczl())));
jnhbHj1.setCodxjl(df.format(Double.parseDouble(jnhbHj0.getCodxjl())+Double.parseDouble(jnhbHj1.getCodxjl())));
jnhbHj1.setAdxjl(df.format(Double.parseDouble(jnhbHj0.getAdxjl())+Double.parseDouble(jnhbHj1.getAdxjl())));
jnhbHj1.setTpxjl(df.format(Double.parseDouble(jnhbHj0.getTpxjl())+Double.parseDouble(jnhbHj1.getTpxjl())));
jnhbHj1.setTnxjl(df.format(Double.parseDouble(jnhbHj0.getTnxjl())+Double.parseDouble(jnhbHj1.getTnxjl())));
}
}
map.put("zbtj",dyList);
map.put("zbfx",jsList);
map.put("zblj",hjList);
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!