feat(datafill): 优化数据填报页面展示指标

- 在数据填报页面添加新的展示指标：预算水量、实际水量、水量完成比例- 更新 SQL 查询以包含新的指标数据
- 调整数据视图和报表配置以支持新指标

@@ -864,6 +864,9 @@
 			v4.qntqsfsl,
 			v4.qntqsfsl,
 			v4.ysfsl,
 			v4.ysfsl,
 			v4.sfsldbbhl,
 			v4.sfsldbbhl,
+			v4.ysfmb,
+			v4.ysjsf,
+			v4.ysfwcbl,
 			v4.ndslmb,
 			v4.ndslmb,
 			v4.yslwcbl,
 			v4.yslwcbl,
 			v4.sldyyqyy,
 			v4.sldyyqyy,

@@ -90,7 +90,7 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
 		String dataViewName3a24 = ReportViewUtil.buildViewLike(ReportConstant.view3a24,field3a24, departId, dataTime);
 		String dataViewName3a24 = ReportViewUtil.buildViewLike(ReportConstant.view3a24,field3a24, departId, dataTime);
 		String dataViewName3a24tb = ReportViewUtil.buildViewLike(ReportConstant.view3a24,field3a24, departId, tbYear);
 		String dataViewName3a24tb = ReportViewUtil.buildViewLike(ReportConstant.view3a24,field3a24, departId, tbYear);
 
 
-		String field4411 = "yslwcbl,ysjsldyqntqyy,qntqsfsl,ysfsl,sfsldbbhl,sldyyqyy,dhgyqntqyy,yyf,yhgyqntqyy,dhcmbzyy,yhcyqyy,df,sbwhf";
+		String field4411 = "yslwcbl,ysjsldyqntqyy,qntqsfsl,ysfsl,sfsldbbhl,sldyyqyy,dhgyqntqyy,yyf,yhgyqntqyy,dhcmbzyy,yhcyqyy,df,sbwhf,ysjsf";
 		String dataViewName4411 = ReportViewUtil.buildViewLike(ReportConstant.view4411,field4411, departId, dataTime);
 		String dataViewName4411 = ReportViewUtil.buildViewLike(ReportConstant.view4411,field4411, departId, dataTime);
 		String dataViewName4411tb = ReportViewUtil.buildViewLike(ReportConstant.view4411,"ysfsl", departId, tbYear);
 		String dataViewName4411tb = ReportViewUtil.buildViewLike(ReportConstant.view4411,"ysfsl", departId, tbYear);
 		//主库数据源
 		//主库数据源
@@ -104,8 +104,11 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
 				" ifnull(v7.ysfsl,0) as qntqsfsl,  " +
 				" ifnull(v7.ysfsl,0) as qntqsfsl,  " +
 				" v6.ysfsl," +
 				" v6.ysfsl," +
 				" round(100*((v6.ysfsl-ifnull(v7.ysfsl,0))/ifnull(v7.ysfsl,0)),2) sfsldbbhl,  " +
 				" 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,  " +
+				" fy.target_value AS ysfmb," +
+				" v6.ysjsf," +
+				" round(100*v6.ysjsf/ifnull(fy.target_value,1),2) AS ysfwcbl," +
+				" sl.target_value as ndslmb,  " +
+				" round(100*(sum(v1.CSL)/10000)/sl.target_value,2) yslwcbl,  " +
 				" v6.sldyyqyy,  " +
 				" v6.sldyyqyy,  " +
 				" round(v4.dlhj/sum(v1.CSL),2) as ydh," +
 				" round(v4.dlhj/sum(v1.CSL),2) as ydh," +
 				" round(ifnull(v5.dlhj/tb.clsl_tb,0)/10000,2) qntqdh,  " +
 				" round(ifnull(v5.dlhj/tb.clsl_tb,0)/10000,2) qntqdh,  " +
@@ -123,6 +126,8 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
 				" round(v4.yjhl/sum(v1.CSL),2) as bnsjyh,  " +
 				" round(v4.yjhl/sum(v1.CSL),2) as bnsjyh,  " +
 				" v6.yhcyqyy  " +
 				" v6.yhcyqyy  " +
 				" from "+dataViewName2119+" v1 " +
 				" from "+dataViewName2119+" v1 " +
+				" LEFT JOIN ( SELECT * FROM report_target_config_sub WHERE depart_id IN ( '"+departId+"' ) AND target_time LIKE '"+dataTime+"%' AND target_type = 'sl' ) sl ON LEFT ( v1.time, 7 ) = sl.target_time " +
+				" LEFT JOIN ( SELECT * FROM report_target_config_sub WHERE depart_id IN ( '"+departId+"' ) AND target_time LIKE '"+dataTime+"%' AND target_type = 'fy' ) fy ON LEFT ( v1.time, 7 ) = fy.target_time " +
 				" left join (  " +
 				" left join (  " +
 				" select right(left(v2119.time,7),2) month_tb,sum(v2119.CSL)/10000 clsl_tb  " +
 				" select right(left(v2119.time,7),2) month_tb,sum(v2119.CSL)/10000 clsl_tb  " +
 				" from "+dataViewName2119tb+" v2119 " +
 				" from "+dataViewName2119tb+" v2119 " +
@@ -153,7 +158,7 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
 				" ) v5 on v5.month_tb = right(left(v1.time,7),2)  " +
 				" ) v5 on v5.month_tb = right(left(v1.time,7),2)  " +
 				" left join (  " +
 				" left join (  " +
 				" select v4411.time,v4411.yslwcbl,v4411.ysjsldyqntqyy,v4411.qntqsfsl,v4411.ysfsl,v4411.sfsldbbhl,v4411.sldyyqyy," +
 				" select v4411.time,v4411.yslwcbl,v4411.ysjsldyqntqyy,v4411.qntqsfsl,v4411.ysfsl,v4411.sfsldbbhl,v4411.sldyyqyy," +
-				" v4411.dhgyqntqyy,v4411.yyf,v4411.yhgyqntqyy,v4411.dhcmbzyy,v4411.yhcyqyy,v4411.df,v4411.sbwhf  " +
+				" v4411.dhgyqntqyy,v4411.yyf,v4411.yhgyqntqyy,v4411.dhcmbzyy,v4411.yhcyqyy,v4411.df,v4411.sbwhf,v4411.ysjsf  " +
 				" from "+dataViewName4411+" v4411 " +
 				" from "+dataViewName4411+" v4411 " +
 				" where v4411.depart_id = '"+departId+"' and v4411.time like CONCAT('"+dataTime+"','%')) v6 on right(left(v6.time,7),2)=right(left(v1.time,7),2)  " +
 				" where v4411.depart_id = '"+departId+"' and v4411.time like CONCAT('"+dataTime+"','%')) v6 on right(left(v6.time,7),2)=right(left(v1.time,7),2)  " +
 				" left join (  " +
 				" left join (  " +