5bfa3e0b 张雷

fix(module-datafill): 修正报表数据比较计算逻辑

- 更新了多个字段的计算公式,确保数据比较准确
- 优化了百分比计算逻辑,提高了数据的可读性和准确性
- 调整了部分字段的计算顺序,使报表数据更加合理
1 个父辈 2669ddd0
......@@ -102,24 +102,24 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
" round(100*(sum(v1.CSL)/10000-ifnull(tb.clsl_tb,0))/ifnull(tb.clsl_tb,sum(v1.CSL)/10000),2) as sjsldbbhl, " +
" v6.ysjsldyqntqyy, " +
" ifnull(v7.ysfsl,0) as qntqsfsl, " +
" v6.ysfsl,v6.sfsldbbhl, " +
" v6.ysfsl," +
" round(100*((v6.ysfsl-ifnull(v7.ysfsl,0))/ifnull(v7.ysfsl,0)),2) sfsldbbhl, " +
" rtc.target_water as ndslmb, " +
" round(100*(sum(v1.CSL)/10000)/rtc.target_water,2) yslwcbl, " +
" v6.sldyyqyy, " +
" round(v4.dlhj/sum(v1.CSL),2) as ydh," +
" round(ifnull(v5.dlhj/tb.clsl_tb,0)/10000,2) qntqdh, " +
" round(100*(v4.dlhj-ifnull(v5.dlhj,0))/ifnull(v5.dlhj,v4.dlhj),2) as dhdbbhl, " +
" 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, " +
" v6.dhgyqntqyy, " +
" round(v6.yyf/sum(v1.CSL),2) as yyh, " +
" v6.yyf," +
" round(ifnull(v5.yjhl/tb.clsl_tb/10000,0),2) qntqyh, " +
" round(100*(v4.yjhl-ifnull(v5.yjhl,0))/ifnull(v5.yjhl,v4.yjhl),2) as yhdbbhl, " +
" 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, " +
" v6.yhgyqntqyy, " +
" rtc.target_power as bndhmb, " +
" round(y.dlhj_year/sum(v1.CSL),2) as bnsjdh, " +
" v6.dhcmbzyy,v6.df,v6.sbwhf, " +
" rtc.target_drug as bnyhmb, " +
// " round(y.yjhl_year/sum(v1.CSL),2) as bnsjyh, " +
" round(v4.yjhl/sum(v1.CSL),2) as bnsjyh, " +
" v6.yhcyqyy " +
" from "+dataViewName2119+" v1 " +
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!