fix(module-datafill): 修正报表数据比较计算逻辑
- 更新了多个字段的计算公式,确保数据比较准确 - 优化了百分比计算逻辑,提高了数据的可读性和准确性 - 调整了部分字段的计算顺序,使报表数据更加合理
正在显示
1 个修改的文件
包含
4 行增加
和
4 行删除
... | @@ -102,24 +102,24 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa | ... | @@ -102,24 +102,24 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa |
102 | " round(100*(sum(v1.CSL)/10000-ifnull(tb.clsl_tb,0))/ifnull(tb.clsl_tb,sum(v1.CSL)/10000),2) as sjsldbbhl, " + | 102 | " round(100*(sum(v1.CSL)/10000-ifnull(tb.clsl_tb,0))/ifnull(tb.clsl_tb,sum(v1.CSL)/10000),2) as sjsldbbhl, " + |
103 | " v6.ysjsldyqntqyy, " + | 103 | " v6.ysjsldyqntqyy, " + |
104 | " ifnull(v7.ysfsl,0) as qntqsfsl, " + | 104 | " ifnull(v7.ysfsl,0) as qntqsfsl, " + |
105 | " v6.ysfsl,v6.sfsldbbhl, " + | 105 | " v6.ysfsl," + |
106 | " round(100*((v6.ysfsl-ifnull(v7.ysfsl,0))/ifnull(v7.ysfsl,0)),2) sfsldbbhl, " + | ||
106 | " rtc.target_water as ndslmb, " + | 107 | " rtc.target_water as ndslmb, " + |
107 | " round(100*(sum(v1.CSL)/10000)/rtc.target_water,2) yslwcbl, " + | 108 | " round(100*(sum(v1.CSL)/10000)/rtc.target_water,2) yslwcbl, " + |
108 | " v6.sldyyqyy, " + | 109 | " v6.sldyyqyy, " + |
109 | " round(v4.dlhj/sum(v1.CSL),2) as ydh," + | 110 | " round(v4.dlhj/sum(v1.CSL),2) as ydh," + |
110 | " round(ifnull(v5.dlhj/tb.clsl_tb,0)/10000,2) qntqdh, " + | 111 | " round(ifnull(v5.dlhj/tb.clsl_tb,0)/10000,2) qntqdh, " + |
111 | " round(100*(v4.dlhj-ifnull(v5.dlhj,0))/ifnull(v5.dlhj,v4.dlhj),2) as dhdbbhl, " + | 112 | " round(100*((v4.dlhj/sum(v1.CSL))-(ifnull(v5.dlhj/tb.clsl_tb,0)/10000))/(ifnull(v5.dlhj/tb.clsl_tb,0)/10000),2) as dhdbbhl, " + |
112 | " v6.dhgyqntqyy, " + | 113 | " v6.dhgyqntqyy, " + |
113 | " round(v6.yyf/sum(v1.CSL),2) as yyh, " + | 114 | " round(v6.yyf/sum(v1.CSL),2) as yyh, " + |
114 | " v6.yyf," + | 115 | " v6.yyf," + |
115 | " round(ifnull(v5.yjhl/tb.clsl_tb/10000,0),2) qntqyh, " + | 116 | " round(ifnull(v5.yjhl/tb.clsl_tb/10000,0),2) qntqyh, " + |
116 | " round(100*(v4.yjhl-ifnull(v5.yjhl,0))/ifnull(v5.yjhl,v4.yjhl),2) as yhdbbhl, " + | 117 | " round(100*(v6.yyf/sum(v1.CSL)-ifnull(v5.yjhl/tb.clsl_tb/10000,0))/ifnull(v5.yjhl/tb.clsl_tb/10000,1),2) as yhdbbhl, " + |
117 | " v6.yhgyqntqyy, " + | 118 | " v6.yhgyqntqyy, " + |
118 | " rtc.target_power as bndhmb, " + | 119 | " rtc.target_power as bndhmb, " + |
119 | " round(y.dlhj_year/sum(v1.CSL),2) as bnsjdh, " + | 120 | " round(y.dlhj_year/sum(v1.CSL),2) as bnsjdh, " + |
120 | " v6.dhcmbzyy,v6.df,v6.sbwhf, " + | 121 | " v6.dhcmbzyy,v6.df,v6.sbwhf, " + |
121 | " rtc.target_drug as bnyhmb, " + | 122 | " rtc.target_drug as bnyhmb, " + |
122 | // " round(y.yjhl_year/sum(v1.CSL),2) as bnsjyh, " + | ||
123 | " round(v4.yjhl/sum(v1.CSL),2) as bnsjyh, " + | 123 | " round(v4.yjhl/sum(v1.CSL),2) as bnsjyh, " + |
124 | " v6.yhcyqyy " + | 124 | " v6.yhcyqyy " + |
125 | " from "+dataViewName2119+" v1 " + | 125 | " from "+dataViewName2119+" v1 " + | ... | ... |
-
请 注册 或 登录 后发表评论