Skip to content

张雷 / skboot-zhongye

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

替换积木报表

1 个父辈 5df0433f
内嵌 并排
正在显示 5 个修改的文件 包含 91 行增加 和 79 行删除
sk-base-common/src/main/java/com/skua/common/constant/ReportConstant.java
......@@ -30,11 +30,18 @@ public interface ReportConstant {
//水量字段
public static final String fieldClsl = "CSL,JSL";
public static final String field_CSL= "CSL";
//电字段
public static final String fieldDl = "DLHJ";
//污泥字段
public static final String fieldWnl = "WNL";
public static final String fieldWnl = "WNL,WNHSL";
//污泥字段
public static final String fieldWf = "WFCSL,WFCZL";
//化验水质字段
public static final String fieldHySz = "JSCODHY,CSCODHY,JSADHY,CSADHY,CSTNHY,JSZDHY,JSZLHY,CSZLHY,CSBODHY,JSBODHY,JSPHHY,CSPHHY";
//水质字段
public static final String fieldSz = "JSZL,CSZL,JSCOD,CSCOD,JSAD,CSAD,JSZD,CSTN,JSPH,JSSS,CSPH,CSSS";
......
sk-module-datafill/src/main/java/com/skua/modules/custom/handle/impl/HjtjReportHandle.java
......@@ -55,9 +55,10 @@ public class HjtjReportHandle implements ICustomHandle{
dataFieldDict.put("WNHSL", "污泥含水率");
dataFieldDict.put("WNCLL", "污泥处理量");
dataFieldDict.put("WNZCL", "污泥贮存量");
String dataViewName9bff = ReportViewUtil.buildView(ReportConstant.view9bff,"", departId, startTime, endTime);
String dataViewName3a24 = ReportViewUtil.buildView(ReportConstant.view3a24,"", departId, startTime, endTime);
String dataViewName2119 = ReportViewUtil.buildView(ReportConstant.view2119,"", departId, startTime, endTime);
String dataViewName9bff = ReportViewUtil.buildView(ReportConstant.view9bff, ReportConstant.fieldHySz, departId, startTime, endTime);
String fields = ReportConstant.fieldDl + "," + ReportConstant.fieldWnl + "," + ReportConstant.fieldWf;
String dataViewName3a24 = ReportViewUtil.buildView(ReportConstant.view3a24, fields, departId, startTime, endTime);
String dataViewName2119 = ReportViewUtil.buildView(ReportConstant.view2119, ReportConstant.fieldClsl, departId, startTime, endTime);
//结果集
List<Map<String, Object>> szMapList = fCustomReportDatasetService.queryHjtjReport(dataViewName9bff, dataViewName3a24, dataViewName2119,
startTime, endTime, departId);
......
sk-module-datafill/src/main/java/com/skua/modules/custom/handle/impl/PwxknbReportHandle.java
......@@ -59,7 +59,8 @@ public class PwxknbReportHandle implements ICustomHandle{
dataFieldDict.put("tp_sum", "总磷SUM");
dataFieldDict.put("ss_avg", "SSAVG");
dataFieldDict.put("ss_sum", "SSSUM");
String dataViewName = ReportViewUtil.buildView(ReportConstant.view2119,"", departIds, startTime, endTime);
String fields = ReportConstant.fieldClsl + "," + ReportConstant.fieldSz;
String dataViewName = ReportViewUtil.buildView(ReportConstant.view2119, fields, departIds, startTime, endTime);
//结果集
List<Map<String, Object>> szMapList = fCustomReportDatasetService.queryPwxknbReport(dataViewName, startTime, endTime, departIds);
list = changeDataList(szMapList,list,startTime,dataFieldDict);
......
sk-module-datafill/src/main/java/com/skua/modules/custom/handle/impl/PwxkybReportHandle.java
......@@ -56,7 +56,8 @@ public class PwxkybReportHandle implements ICustomHandle{
dataFieldDict.put("tp_sum", "总磷SUM");
dataFieldDict.put("ss_avg", "SSAVG");
dataFieldDict.put("ss_sum", "SSSUM");
String dataViewName = ReportViewUtil.buildView(ReportConstant.view2119,"", departIds, startTime, endTime);
String fields = ReportConstant.fieldClsl + "," + ReportConstant.fieldSz;
String dataViewName = ReportViewUtil.buildView(ReportConstant.view2119, fields, departIds, startTime, endTime);
//结果集
List<Map<String, Object>> szMapList = fCustomReportDatasetService.queryPwxkybReport(dataViewName, startTime, endTime, departIds);
list = changeDataList(szMapList,list,startTime,dataFieldDict);
......
sk-module-datafill/src/main/java/com/skua/modules/custom/mapper/xml/FCustomReportDatasetMapper.xml
......@@ -515,20 +515,20 @@
<select id="querySzYynbReport" resultType="java.util.HashMap">
SELECT
ROUND( SUM( v.JSL )/10000, 2 ) AS `JSL`,
ROUND( SUM( v.CSL )/10000, 2 ) AS `CSL`,
ROUND( AVG( v.JSPH ), 2 ) AS `JSPH`,
ROUND( AVG( v.CSPH ), 2 ) AS `CSPH`,
ROUND( AVG( v.JSCOD ), 2 ) AS `JSCOD`,
ROUND( AVG( v.CSCOD ), 2 ) AS `CSCOD`,
ROUND( AVG( v.CSTN ), 2 ) AS `CSTN`,
ROUND( AVG( v.JSZD ), 2 ) AS `JSZD`,
ROUND( AVG( v.JSZL ), 2 ) AS `JSZL`,
ROUND( AVG( v.CSZL ), 2 ) AS `CSZL`,
ROUND( AVG( v.JSAD ), 2 ) AS `JSAD`,
ROUND( AVG( v.CSAD ), 2 ) AS `CSAD`,
ROUND( AVG( v.JSSS ), 2 ) AS `JSSS`,
ROUND( AVG( v.CSSS ), 2 ) AS `CSSS`,
ROUND( SUM( v.JSL )/10000, 2 ) AS JSL,
ROUND( SUM( v.CSL )/10000, 2 ) AS CSL,
ROUND( AVG( v.JSPH ), 2 ) AS JSPH,
ROUND( AVG( v.CSPH ), 2 ) AS CSPH,
ROUND( AVG( v.JSCOD ), 2 ) AS JSCOD,
ROUND( AVG( v.CSCOD ), 2 ) AS CSCOD,
ROUND( AVG( v.CSTN ), 2 ) AS CSTN,
ROUND( AVG( v.JSZD ), 2 ) AS JSZD,
ROUND( AVG( v.JSZL ), 2 ) AS JSZL,
ROUND( AVG( v.CSZL ), 2 ) AS CSZL,
ROUND( AVG( v.JSAD ), 2 ) AS JSAD,
ROUND( AVG( v.CSAD ), 2 ) AS CSAD,
ROUND( AVG( v.JSSS ), 2 ) AS JSSS,
ROUND( AVG( v.CSSS ), 2 ) AS CSSS,
v.BZ,
v.depart_id,
LEFT ( v.time, 7 ) AS time
......@@ -598,20 +598,20 @@
<select id="querySzYyybReport" resultType="java.util.HashMap">
SELECT
ROUND( SUM( v.JSL )/10000, 2 ) AS `JSL`,
ROUND( SUM( v.CSL )/10000, 2 ) AS `CSL`,
ROUND( AVG( v.JSPH ), 2 ) AS `JSPH`,
ROUND( AVG( v.CSPH ), 2 ) AS `CSPH`,
ROUND( AVG( v.JSCOD ), 2 ) AS `JSCOD`,
ROUND( AVG( v.CSCOD ), 2 ) AS `CSCOD`,
ROUND( AVG( v.CSTN ), 2 ) AS `CSTN`,
ROUND( AVG( v.JSZD ), 2 ) AS `JSZD`,
ROUND( AVG( v.JSZL ), 2 ) AS `JSZL`,
ROUND( AVG( v.CSZL ), 2 ) AS `CSZL`,
ROUND( AVG( v.JSAD ), 2 ) AS `JSAD`,
ROUND( AVG( v.CSAD ), 2 ) AS `CSAD`,
ROUND( AVG( v.JSSS ), 2 ) AS `JSSS`,
ROUND( AVG( v.CSSS ), 2 ) AS `CSSS`,
ROUND( SUM( v.JSL )/10000, 2 ) AS JSL,
ROUND( SUM( v.CSL )/10000, 2 ) AS CSL,
ROUND( AVG( v.JSPH ), 2 ) AS JSPH,
ROUND( AVG( v.CSPH ), 2 ) AS CSPH,
ROUND( AVG( v.JSCOD ), 2 ) AS JSCOD,
ROUND( AVG( v.CSCOD ), 2 ) AS CSCOD,
ROUND( AVG( v.CSTN ), 2 ) AS CSTN,
ROUND( AVG( v.JSZD ), 2 ) AS JSZD,
ROUND( AVG( v.JSZL ), 2 ) AS JSZL,
ROUND( AVG( v.CSZL ), 2 ) AS CSZL,
ROUND( AVG( v.JSAD ), 2 ) AS JSAD,
ROUND( AVG( v.CSAD ), 2 ) AS CSAD,
ROUND( AVG( v.JSSS ), 2 ) AS JSSS,
ROUND( AVG( v.CSSS ), 2 ) AS CSSS,
v.BZ,
v.depart_id,
v.time
......@@ -680,20 +680,20 @@
<select id="querySzYyrbReport" resultType="java.util.HashMap">
SELECT
ROUND( SUM( v.JSL )/10000, 2 ) AS `JSL`,
ROUND( SUM( v.CSL )/10000, 2 ) AS `CSL`,
ROUND( AVG( v.JSPH ), 2 ) AS `JSPH`,
ROUND( AVG( v.CSPH ), 2 ) AS `CSPH`,
ROUND( AVG( v.JSCOD ), 2 ) AS `JSCOD`,
ROUND( AVG( v.CSCOD ), 2 ) AS `CSCOD`,
ROUND( AVG( v.CSTN ), 2 ) AS `CSTN`,
ROUND( AVG( v.JSZD ), 2 ) AS `JSZD`,
ROUND( AVG( v.JSZL ), 2 ) AS `JSZL`,
ROUND( AVG( v.CSZL ), 2 ) AS `CSZL`,
ROUND( AVG( v.JSAD ), 2 ) AS `JSAD`,
ROUND( AVG( v.CSAD ), 2 ) AS `CSAD`,
ROUND( AVG( v.JSSS ), 2 ) AS `JSSS`,
ROUND( AVG( v.CSSS ), 2 ) AS `CSSS`,
ROUND( SUM( v.JSL )/10000, 2 ) AS JSL,
ROUND( SUM( v.CSL )/10000, 2 ) AS CSL,
ROUND( AVG( v.JSPH ), 2 ) AS JSPH,
ROUND( AVG( v.CSPH ), 2 ) AS CSPH,
ROUND( AVG( v.JSCOD ), 2 ) AS JSCOD,
ROUND( AVG( v.CSCOD ), 2 ) AS CSCOD,
ROUND( AVG( v.CSTN ), 2 ) AS CSTN,
ROUND( AVG( v.JSZD ), 2 ) AS JSZD,
ROUND( AVG( v.JSZL ), 2 ) AS JSZL,
ROUND( AVG( v.CSZL ), 2 ) AS CSZL,
ROUND( AVG( v.JSAD ), 2 ) AS JSAD,
ROUND( AVG( v.CSAD ), 2 ) AS CSAD,
ROUND( AVG( v.JSSS ), 2 ) AS JSSS,
ROUND( AVG( v.CSSS ), 2 ) AS CSSS,
v.BZ,
v.depart_id,
d.depart_name as depart_name,
......@@ -766,33 +766,33 @@
<select id="queryHyReport" resultType="java.util.HashMap">
SELECT
ROUND( AVG( v.SW ), 2 ) AS `SW`,
ROUND( AVG( v.FYHGMLSS ), 2 ) AS `FYHGMLSS`,
ROUND( AVG( v.EYHGMLSS ), 2 ) AS `EYHGMLSS`,
ROUND( AVG( v.DYHGMLSS ), 2 ) AS `DYHGMLSS`,
ROUND( AVG( v.BYHGMLSS ), 2 ) AS `BYHGMLSS`,
ROUND( AVG( v.CYHGMLSS ), 2 ) AS `CYHGMLSS`,
ROUND( AVG( v.AYHGMLSS ), 2 ) AS `AYHGMLSS`,
ROUND( AVG( v.FYHGCJB ), 2 ) AS `FYHGCJB`,
ROUND( AVG( v.EYHGCJB ), 2 ) AS `EYHGCJB`,
ROUND( AVG( v.DYHGCJB ), 2 ) AS `DYHGCJB`,
ROUND( AVG( v.BYHGCJB ), 2 ) AS `BYHGCJB`,
ROUND( AVG( v.CYHGCJB ), 2 ) AS `CYHGCJB`,
ROUND( AVG( v.AYHGCJB ), 2 ) AS `AYHGCJB`,
ROUND( AVG( v.JSCODHY ), 2 ) AS `JSCODHY`,
ROUND( AVG( v.CSCODHY ), 2 ) AS `CSCODHY`,
ROUND( AVG( v.JSADHY ), 2 ) AS `JSADHY`,
ROUND( AVG( v.CSADHY ), 2 ) AS `CSADHY`,
ROUND( AVG( v.CSTNHY ), 2 ) AS `CSTNHY`,
ROUND( AVG( v.JSZDHY ), 2 ) AS `JSZDHY`,
ROUND( AVG( v.JSZLHY ), 2 ) AS `JSZLHY`,
ROUND( AVG( v.CSZLHY ), 2 ) AS `CSZLHY`,
ROUND( AVG( v.JSSSHY ), 2 ) AS `JSSSHY`,
ROUND( AVG( v.CSSSHY ), 2 ) AS `CSSSHY`,
ROUND( AVG( v.JSPHHY ), 2 ) AS `JSPHHY`,
ROUND( AVG( v.CSPHHY ), 2 ) AS `CSPHHY`,
ROUND( AVG( v.CSBODHY ), 2 ) AS `CSBODHY`,
ROUND( AVG( v.JSBODHY ), 2 ) AS `JSBODHY`,
ROUND( AVG( v.SW ), 2 ) AS SW,
ROUND( AVG( v.FYHGMLSS ), 2 ) AS FYHGMLSS,
ROUND( AVG( v.EYHGMLSS ), 2 ) AS EYHGMLSS,
ROUND( AVG( v.DYHGMLSS ), 2 ) AS DYHGMLSS,
ROUND( AVG( v.BYHGMLSS ), 2 ) AS BYHGMLSS,
ROUND( AVG( v.CYHGMLSS ), 2 ) AS CYHGMLSS,
ROUND( AVG( v.AYHGMLSS ), 2 ) AS AYHGMLSS,
ROUND( AVG( v.FYHGCJB ), 2 ) AS FYHGCJB,
ROUND( AVG( v.EYHGCJB ), 2 ) AS EYHGCJB,
ROUND( AVG( v.DYHGCJB ), 2 ) AS DYHGCJB,
ROUND( AVG( v.BYHGCJB ), 2 ) AS BYHGCJB,
ROUND( AVG( v.CYHGCJB ), 2 ) AS CYHGCJB,
ROUND( AVG( v.AYHGCJB ), 2 ) AS AYHGCJB,
ROUND( AVG( v.JSCODHY ), 2 ) AS JSCODHY,
ROUND( AVG( v.CSCODHY ), 2 ) AS CSCODHY,
ROUND( AVG( v.JSADHY ), 2 ) AS JSADHY,
ROUND( AVG( v.CSADHY ), 2 ) AS CSADHY,
ROUND( AVG( v.CSTNHY ), 2 ) AS CSTNHY,
ROUND( AVG( v.JSZDHY ), 2 ) AS JSZDHY,
ROUND( AVG( v.JSZLHY ), 2 ) AS JSZLHY,
ROUND( AVG( v.CSZLHY ), 2 ) AS CSZLHY,
ROUND( AVG( v.JSSSHY ), 2 ) AS JSSSHY,
ROUND( AVG( v.CSSSHY ), 2 ) AS CSSSHY,
ROUND( AVG( v.JSPHHY ), 2 ) AS JSPHHY,
ROUND( AVG( v.CSPHHY ), 2 ) AS CSPHHY,
ROUND( AVG( v.CSBODHY ), 2 ) AS CSBODHY,
ROUND( AVG( v.JSBODHY ), 2 ) AS JSBODHY,
v.depart_id,
d.depart_name as depart_name,
v.time
......@@ -876,7 +876,8 @@
FROM
${dataViewName} v
WHERE
v.time LIKE '2024%'
v.time &gt;= #{startTime}
AND v.time &lt;= #{endTime}
AND v.depart_id IN
<foreach item="item" index="index" collection="departId.split(',')" open="(" separator="," close=")">
'${item}'
......@@ -913,7 +914,8 @@
FROM
${dataViewName} v
WHERE
v.time LIKE '2024-12%'
v.time &gt;= #{startTime}
AND v.time &lt;= #{endTime}
AND v.depart_id IN
<foreach item="item" index="index" collection="departId.split(',')" open="(" separator="," close=")">
'${item}'
......@@ -925,8 +927,8 @@
<select id="queryHjtjReport" resultType="java.util.HashMap">
SELECT
f.pro_scale*v2.DAY_COUNT AS WSCLNL,
v2.CSL AS WSSJCLNL,
ROUND(f.pro_scale*v2.DAY_COUNT/10000,2) AS WSCLNL,
ROUND(v2.CSL/10000,2) AS WSSJCLNL,
v2.DAY_COUNT AS YXTS,
v2.DAY_COUNT*24 AS YXSJ,
ROUND(v2.CSL/10000,2) CSL,
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!