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 { ...@@ -30,11 +30,18 @@ public interface ReportConstant {
30 //水量字段 30 //水量字段
31 public static final String fieldClsl = "CSL,JSL"; 31 public static final String fieldClsl = "CSL,JSL";
32 public static final String field_CSL= "CSL"; 32 public static final String field_CSL= "CSL";
33
33 //电字段 34 //电字段
34 public static final String fieldDl = "DLHJ"; 35 public static final String fieldDl = "DLHJ";
35 36
36 //污泥字段 37 //污泥字段
37 public static final String fieldWnl = "WNL"; 38 public static final String fieldWnl = "WNL,WNHSL";
39
40 //污泥字段
41 public static final String fieldWf = "WFCSL,WFCZL";
42
43 //化验水质字段
44 public static final String fieldHySz = "JSCODHY,CSCODHY,JSADHY,CSADHY,CSTNHY,JSZDHY,JSZLHY,CSZLHY,CSBODHY,JSBODHY,JSPHHY,CSPHHY";
38 45
39 //水质字段 46 //水质字段
40 public static final String fieldSz = "JSZL,CSZL,JSCOD,CSCOD,JSAD,CSAD,JSZD,CSTN,JSPH,JSSS,CSPH,CSSS"; 47 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{ ...@@ -55,9 +55,10 @@ public class HjtjReportHandle implements ICustomHandle{
55 dataFieldDict.put("WNHSL", "污泥含水率"); 55 dataFieldDict.put("WNHSL", "污泥含水率");
56 dataFieldDict.put("WNCLL", "污泥处理量"); 56 dataFieldDict.put("WNCLL", "污泥处理量");
57 dataFieldDict.put("WNZCL", "污泥贮存量"); 57 dataFieldDict.put("WNZCL", "污泥贮存量");
58 String dataViewName9bff = ReportViewUtil.buildView(ReportConstant.view9bff,"", departId, startTime, endTime); 58 String dataViewName9bff = ReportViewUtil.buildView(ReportConstant.view9bff, ReportConstant.fieldHySz, departId, startTime, endTime);
59 String dataViewName3a24 = ReportViewUtil.buildView(ReportConstant.view3a24,"", departId, startTime, endTime); 59 String fields = ReportConstant.fieldDl + "," + ReportConstant.fieldWnl + "," + ReportConstant.fieldWf;
60 String dataViewName2119 = ReportViewUtil.buildView(ReportConstant.view2119,"", departId, startTime, endTime); 60 String dataViewName3a24 = ReportViewUtil.buildView(ReportConstant.view3a24, fields, departId, startTime, endTime);
61 String dataViewName2119 = ReportViewUtil.buildView(ReportConstant.view2119, ReportConstant.fieldClsl, departId, startTime, endTime);
61 //结果集 62 //结果集
62 List<Map<String, Object>> szMapList = fCustomReportDatasetService.queryHjtjReport(dataViewName9bff, dataViewName3a24, dataViewName2119, 63 List<Map<String, Object>> szMapList = fCustomReportDatasetService.queryHjtjReport(dataViewName9bff, dataViewName3a24, dataViewName2119,
63 startTime, endTime, departId); 64 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{ ...@@ -59,7 +59,8 @@ public class PwxknbReportHandle implements ICustomHandle{
59 dataFieldDict.put("tp_sum", "总磷SUM"); 59 dataFieldDict.put("tp_sum", "总磷SUM");
60 dataFieldDict.put("ss_avg", "SSAVG"); 60 dataFieldDict.put("ss_avg", "SSAVG");
61 dataFieldDict.put("ss_sum", "SSSUM"); 61 dataFieldDict.put("ss_sum", "SSSUM");
62 String dataViewName = ReportViewUtil.buildView(ReportConstant.view2119,"", departIds, startTime, endTime); 62 String fields = ReportConstant.fieldClsl + "," + ReportConstant.fieldSz;
63 String dataViewName = ReportViewUtil.buildView(ReportConstant.view2119, fields, departIds, startTime, endTime);
63 //结果集 64 //结果集
64 List<Map<String, Object>> szMapList = fCustomReportDatasetService.queryPwxknbReport(dataViewName, startTime, endTime, departIds); 65 List<Map<String, Object>> szMapList = fCustomReportDatasetService.queryPwxknbReport(dataViewName, startTime, endTime, departIds);
65 list = changeDataList(szMapList,list,startTime,dataFieldDict); 66 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{ ...@@ -56,7 +56,8 @@ public class PwxkybReportHandle implements ICustomHandle{
56 dataFieldDict.put("tp_sum", "总磷SUM"); 56 dataFieldDict.put("tp_sum", "总磷SUM");
57 dataFieldDict.put("ss_avg", "SSAVG"); 57 dataFieldDict.put("ss_avg", "SSAVG");
58 dataFieldDict.put("ss_sum", "SSSUM"); 58 dataFieldDict.put("ss_sum", "SSSUM");
59 String dataViewName = ReportViewUtil.buildView(ReportConstant.view2119,"", departIds, startTime, endTime); 59 String fields = ReportConstant.fieldClsl + "," + ReportConstant.fieldSz;
60 String dataViewName = ReportViewUtil.buildView(ReportConstant.view2119, fields, departIds, startTime, endTime);
60 //结果集 61 //结果集
61 List<Map<String, Object>> szMapList = fCustomReportDatasetService.queryPwxkybReport(dataViewName, startTime, endTime, departIds); 62 List<Map<String, Object>> szMapList = fCustomReportDatasetService.queryPwxkybReport(dataViewName, startTime, endTime, departIds);
62 list = changeDataList(szMapList,list,startTime,dataFieldDict); 63 list = changeDataList(szMapList,list,startTime,dataFieldDict);
......
sk-module-datafill/src/main/java/com/skua/modules/custom/mapper/xml/FCustomReportDatasetMapper.xml
...@@ -515,20 +515,20 @@ ...@@ -515,20 +515,20 @@
515 515
516 <select id="querySzYynbReport" resultType="java.util.HashMap"> 516 <select id="querySzYynbReport" resultType="java.util.HashMap">
517 SELECT 517 SELECT
518 ROUND( SUM( v.JSL )/10000, 2 ) AS `JSL`, 518 ROUND( SUM( v.JSL )/10000, 2 ) AS JSL,
519 ROUND( SUM( v.CSL )/10000, 2 ) AS `CSL`, 519 ROUND( SUM( v.CSL )/10000, 2 ) AS CSL,
520 ROUND( AVG( v.JSPH ), 2 ) AS `JSPH`, 520 ROUND( AVG( v.JSPH ), 2 ) AS JSPH,
521 ROUND( AVG( v.CSPH ), 2 ) AS `CSPH`, 521 ROUND( AVG( v.CSPH ), 2 ) AS CSPH,
522 ROUND( AVG( v.JSCOD ), 2 ) AS `JSCOD`, 522 ROUND( AVG( v.JSCOD ), 2 ) AS JSCOD,
523 ROUND( AVG( v.CSCOD ), 2 ) AS `CSCOD`, 523 ROUND( AVG( v.CSCOD ), 2 ) AS CSCOD,
524 ROUND( AVG( v.CSTN ), 2 ) AS `CSTN`, 524 ROUND( AVG( v.CSTN ), 2 ) AS CSTN,
525 ROUND( AVG( v.JSZD ), 2 ) AS `JSZD`, 525 ROUND( AVG( v.JSZD ), 2 ) AS JSZD,
526 ROUND( AVG( v.JSZL ), 2 ) AS `JSZL`, 526 ROUND( AVG( v.JSZL ), 2 ) AS JSZL,
527 ROUND( AVG( v.CSZL ), 2 ) AS `CSZL`, 527 ROUND( AVG( v.CSZL ), 2 ) AS CSZL,
528 ROUND( AVG( v.JSAD ), 2 ) AS `JSAD`, 528 ROUND( AVG( v.JSAD ), 2 ) AS JSAD,
529 ROUND( AVG( v.CSAD ), 2 ) AS `CSAD`, 529 ROUND( AVG( v.CSAD ), 2 ) AS CSAD,
530 ROUND( AVG( v.JSSS ), 2 ) AS `JSSS`, 530 ROUND( AVG( v.JSSS ), 2 ) AS JSSS,
531 ROUND( AVG( v.CSSS ), 2 ) AS `CSSS`, 531 ROUND( AVG( v.CSSS ), 2 ) AS CSSS,
532 v.BZ, 532 v.BZ,
533 v.depart_id, 533 v.depart_id,
534 LEFT ( v.time, 7 ) AS time 534 LEFT ( v.time, 7 ) AS time
...@@ -598,20 +598,20 @@ ...@@ -598,20 +598,20 @@
598 598
599 <select id="querySzYyybReport" resultType="java.util.HashMap"> 599 <select id="querySzYyybReport" resultType="java.util.HashMap">
600 SELECT 600 SELECT
601 ROUND( SUM( v.JSL )/10000, 2 ) AS `JSL`, 601 ROUND( SUM( v.JSL )/10000, 2 ) AS JSL,
602 ROUND( SUM( v.CSL )/10000, 2 ) AS `CSL`, 602 ROUND( SUM( v.CSL )/10000, 2 ) AS CSL,
603 ROUND( AVG( v.JSPH ), 2 ) AS `JSPH`, 603 ROUND( AVG( v.JSPH ), 2 ) AS JSPH,
604 ROUND( AVG( v.CSPH ), 2 ) AS `CSPH`, 604 ROUND( AVG( v.CSPH ), 2 ) AS CSPH,
605 ROUND( AVG( v.JSCOD ), 2 ) AS `JSCOD`, 605 ROUND( AVG( v.JSCOD ), 2 ) AS JSCOD,
606 ROUND( AVG( v.CSCOD ), 2 ) AS `CSCOD`, 606 ROUND( AVG( v.CSCOD ), 2 ) AS CSCOD,
607 ROUND( AVG( v.CSTN ), 2 ) AS `CSTN`, 607 ROUND( AVG( v.CSTN ), 2 ) AS CSTN,
608 ROUND( AVG( v.JSZD ), 2 ) AS `JSZD`, 608 ROUND( AVG( v.JSZD ), 2 ) AS JSZD,
609 ROUND( AVG( v.JSZL ), 2 ) AS `JSZL`, 609 ROUND( AVG( v.JSZL ), 2 ) AS JSZL,
610 ROUND( AVG( v.CSZL ), 2 ) AS `CSZL`, 610 ROUND( AVG( v.CSZL ), 2 ) AS CSZL,
611 ROUND( AVG( v.JSAD ), 2 ) AS `JSAD`, 611 ROUND( AVG( v.JSAD ), 2 ) AS JSAD,
612 ROUND( AVG( v.CSAD ), 2 ) AS `CSAD`, 612 ROUND( AVG( v.CSAD ), 2 ) AS CSAD,
613 ROUND( AVG( v.JSSS ), 2 ) AS `JSSS`, 613 ROUND( AVG( v.JSSS ), 2 ) AS JSSS,
614 ROUND( AVG( v.CSSS ), 2 ) AS `CSSS`, 614 ROUND( AVG( v.CSSS ), 2 ) AS CSSS,
615 v.BZ, 615 v.BZ,
616 v.depart_id, 616 v.depart_id,
617 v.time 617 v.time
...@@ -680,20 +680,20 @@ ...@@ -680,20 +680,20 @@
680 680
681 <select id="querySzYyrbReport" resultType="java.util.HashMap"> 681 <select id="querySzYyrbReport" resultType="java.util.HashMap">
682 SELECT 682 SELECT
683 ROUND( SUM( v.JSL )/10000, 2 ) AS `JSL`, 683 ROUND( SUM( v.JSL )/10000, 2 ) AS JSL,
684 ROUND( SUM( v.CSL )/10000, 2 ) AS `CSL`, 684 ROUND( SUM( v.CSL )/10000, 2 ) AS CSL,
685 ROUND( AVG( v.JSPH ), 2 ) AS `JSPH`, 685 ROUND( AVG( v.JSPH ), 2 ) AS JSPH,
686 ROUND( AVG( v.CSPH ), 2 ) AS `CSPH`, 686 ROUND( AVG( v.CSPH ), 2 ) AS CSPH,
687 ROUND( AVG( v.JSCOD ), 2 ) AS `JSCOD`, 687 ROUND( AVG( v.JSCOD ), 2 ) AS JSCOD,
688 ROUND( AVG( v.CSCOD ), 2 ) AS `CSCOD`, 688 ROUND( AVG( v.CSCOD ), 2 ) AS CSCOD,
689 ROUND( AVG( v.CSTN ), 2 ) AS `CSTN`, 689 ROUND( AVG( v.CSTN ), 2 ) AS CSTN,
690 ROUND( AVG( v.JSZD ), 2 ) AS `JSZD`, 690 ROUND( AVG( v.JSZD ), 2 ) AS JSZD,
691 ROUND( AVG( v.JSZL ), 2 ) AS `JSZL`, 691 ROUND( AVG( v.JSZL ), 2 ) AS JSZL,
692 ROUND( AVG( v.CSZL ), 2 ) AS `CSZL`, 692 ROUND( AVG( v.CSZL ), 2 ) AS CSZL,
693 ROUND( AVG( v.JSAD ), 2 ) AS `JSAD`, 693 ROUND( AVG( v.JSAD ), 2 ) AS JSAD,
694 ROUND( AVG( v.CSAD ), 2 ) AS `CSAD`, 694 ROUND( AVG( v.CSAD ), 2 ) AS CSAD,
695 ROUND( AVG( v.JSSS ), 2 ) AS `JSSS`, 695 ROUND( AVG( v.JSSS ), 2 ) AS JSSS,
696 ROUND( AVG( v.CSSS ), 2 ) AS `CSSS`, 696 ROUND( AVG( v.CSSS ), 2 ) AS CSSS,
697 v.BZ, 697 v.BZ,
698 v.depart_id, 698 v.depart_id,
699 d.depart_name as depart_name, 699 d.depart_name as depart_name,
...@@ -766,33 +766,33 @@ ...@@ -766,33 +766,33 @@
766 766
767 <select id="queryHyReport" resultType="java.util.HashMap"> 767 <select id="queryHyReport" resultType="java.util.HashMap">
768 SELECT 768 SELECT
769 ROUND( AVG( v.SW ), 2 ) AS `SW`, 769 ROUND( AVG( v.SW ), 2 ) AS SW,
770 ROUND( AVG( v.FYHGMLSS ), 2 ) AS `FYHGMLSS`, 770 ROUND( AVG( v.FYHGMLSS ), 2 ) AS FYHGMLSS,
771 ROUND( AVG( v.EYHGMLSS ), 2 ) AS `EYHGMLSS`, 771 ROUND( AVG( v.EYHGMLSS ), 2 ) AS EYHGMLSS,
772 ROUND( AVG( v.DYHGMLSS ), 2 ) AS `DYHGMLSS`, 772 ROUND( AVG( v.DYHGMLSS ), 2 ) AS DYHGMLSS,
773 ROUND( AVG( v.BYHGMLSS ), 2 ) AS `BYHGMLSS`, 773 ROUND( AVG( v.BYHGMLSS ), 2 ) AS BYHGMLSS,
774 ROUND( AVG( v.CYHGMLSS ), 2 ) AS `CYHGMLSS`, 774 ROUND( AVG( v.CYHGMLSS ), 2 ) AS CYHGMLSS,
775 ROUND( AVG( v.AYHGMLSS ), 2 ) AS `AYHGMLSS`, 775 ROUND( AVG( v.AYHGMLSS ), 2 ) AS AYHGMLSS,
776 ROUND( AVG( v.FYHGCJB ), 2 ) AS `FYHGCJB`, 776 ROUND( AVG( v.FYHGCJB ), 2 ) AS FYHGCJB,
777 ROUND( AVG( v.EYHGCJB ), 2 ) AS `EYHGCJB`, 777 ROUND( AVG( v.EYHGCJB ), 2 ) AS EYHGCJB,
778 ROUND( AVG( v.DYHGCJB ), 2 ) AS `DYHGCJB`, 778 ROUND( AVG( v.DYHGCJB ), 2 ) AS DYHGCJB,
779 ROUND( AVG( v.BYHGCJB ), 2 ) AS `BYHGCJB`, 779 ROUND( AVG( v.BYHGCJB ), 2 ) AS BYHGCJB,
780 ROUND( AVG( v.CYHGCJB ), 2 ) AS `CYHGCJB`, 780 ROUND( AVG( v.CYHGCJB ), 2 ) AS CYHGCJB,
781 ROUND( AVG( v.AYHGCJB ), 2 ) AS `AYHGCJB`, 781 ROUND( AVG( v.AYHGCJB ), 2 ) AS AYHGCJB,
782 ROUND( AVG( v.JSCODHY ), 2 ) AS `JSCODHY`, 782 ROUND( AVG( v.JSCODHY ), 2 ) AS JSCODHY,
783 ROUND( AVG( v.CSCODHY ), 2 ) AS `CSCODHY`, 783 ROUND( AVG( v.CSCODHY ), 2 ) AS CSCODHY,
784 ROUND( AVG( v.JSADHY ), 2 ) AS `JSADHY`, 784 ROUND( AVG( v.JSADHY ), 2 ) AS JSADHY,
785 ROUND( AVG( v.CSADHY ), 2 ) AS `CSADHY`, 785 ROUND( AVG( v.CSADHY ), 2 ) AS CSADHY,
786 ROUND( AVG( v.CSTNHY ), 2 ) AS `CSTNHY`, 786 ROUND( AVG( v.CSTNHY ), 2 ) AS CSTNHY,
787 ROUND( AVG( v.JSZDHY ), 2 ) AS `JSZDHY`, 787 ROUND( AVG( v.JSZDHY ), 2 ) AS JSZDHY,
788 ROUND( AVG( v.JSZLHY ), 2 ) AS `JSZLHY`, 788 ROUND( AVG( v.JSZLHY ), 2 ) AS JSZLHY,
789 ROUND( AVG( v.CSZLHY ), 2 ) AS `CSZLHY`, 789 ROUND( AVG( v.CSZLHY ), 2 ) AS CSZLHY,
790 ROUND( AVG( v.JSSSHY ), 2 ) AS `JSSSHY`, 790 ROUND( AVG( v.JSSSHY ), 2 ) AS JSSSHY,
791 ROUND( AVG( v.CSSSHY ), 2 ) AS `CSSSHY`, 791 ROUND( AVG( v.CSSSHY ), 2 ) AS CSSSHY,
792 ROUND( AVG( v.JSPHHY ), 2 ) AS `JSPHHY`, 792 ROUND( AVG( v.JSPHHY ), 2 ) AS JSPHHY,
793 ROUND( AVG( v.CSPHHY ), 2 ) AS `CSPHHY`, 793 ROUND( AVG( v.CSPHHY ), 2 ) AS CSPHHY,
794 ROUND( AVG( v.CSBODHY ), 2 ) AS `CSBODHY`, 794 ROUND( AVG( v.CSBODHY ), 2 ) AS CSBODHY,
795 ROUND( AVG( v.JSBODHY ), 2 ) AS `JSBODHY`, 795 ROUND( AVG( v.JSBODHY ), 2 ) AS JSBODHY,
796 v.depart_id, 796 v.depart_id,
797 d.depart_name as depart_name, 797 d.depart_name as depart_name,
798 v.time 798 v.time
...@@ -876,7 +876,8 @@ ...@@ -876,7 +876,8 @@
876 FROM 876 FROM
877 ${dataViewName} v 877 ${dataViewName} v
878 WHERE 878 WHERE
879 v.time LIKE '2024%' 879 v.time &gt;= #{startTime}
880 AND v.time &lt;= #{endTime}
880 AND v.depart_id IN 881 AND v.depart_id IN
881 <foreach item="item" index="index" collection="departId.split(',')" open="(" separator="," close=")"> 882 <foreach item="item" index="index" collection="departId.split(',')" open="(" separator="," close=")">
882 '${item}' 883 '${item}'
...@@ -913,7 +914,8 @@ ...@@ -913,7 +914,8 @@
913 FROM 914 FROM
914 ${dataViewName} v 915 ${dataViewName} v
915 WHERE 916 WHERE
916 v.time LIKE '2024-12%' 917 v.time &gt;= #{startTime}
918 AND v.time &lt;= #{endTime}
917 AND v.depart_id IN 919 AND v.depart_id IN
918 <foreach item="item" index="index" collection="departId.split(',')" open="(" separator="," close=")"> 920 <foreach item="item" index="index" collection="departId.split(',')" open="(" separator="," close=")">
919 '${item}' 921 '${item}'
...@@ -925,8 +927,8 @@ ...@@ -925,8 +927,8 @@
925 927
926 <select id="queryHjtjReport" resultType="java.util.HashMap"> 928 <select id="queryHjtjReport" resultType="java.util.HashMap">
927 SELECT 929 SELECT
928 f.pro_scale*v2.DAY_COUNT AS WSCLNL, 930 ROUND(f.pro_scale*v2.DAY_COUNT/10000,2) AS WSCLNL,
929 v2.CSL AS WSSJCLNL, 931 ROUND(v2.CSL/10000,2) AS WSSJCLNL,
930 v2.DAY_COUNT AS YXTS, 932 v2.DAY_COUNT AS YXTS,
931 v2.DAY_COUNT*24 AS YXSJ, 933 v2.DAY_COUNT*24 AS YXSJ,
932 ROUND(v2.CSL/10000,2) CSL, 934 ROUND(v2.CSL/10000,2) CSL,
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!