月度数据单位BUG修改

@@ -95,20 +95,22 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
 				" ifnull(v7.qntqsfsl,0) as qntqsfsl,  " +
 				" v6.ysfsl,v6.sfsldbbhl,  " +
 				" rtc.target_water as ndslmb,  " +
-				" v6.yslwcbl,  " +
+				" round(100*(sum(v1.CSL)/10000)/rtc.target_water,2) yslwcbl,  " +
 				" v6.sldyyqyy,  " +
-				" v4.dlhj as ydh,ifnull(v5.dlhj,0) qntqdh,  " +
+				" 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,  " +
 				" v6.dhgyqntqyy,  " +
-				" v4.yjhl as yyh,  " +
-				" v6.yyf,ifnull(v5.yjhl,0) qntqyh,  " +
+				" round(v4.yjhl/sum(v1.CSL),2) as yyh,  " +
+				" v6.yyf," +
+				" round(ifnull(v5.yjhl/tb.clsl_tb,0),2) qntqyh,  " +
 				" round(100*(v4.yjhl-ifnull(v5.yjhl,0))/ifnull(v5.yjhl,v4.yjhl),2) as yhdbbhl,  " +
 				" v6.yhgyqntqyy,  " +
 				" rtc.target_power as bndhmb,  " +
-				" y.dlhj_year as bnsjdh,  " +
+				" round(y.dlhj_year/sum(v1.CSL),2) as bnsjdh,  " +
 				" v6.dhcmbzyy,  " +
 				" rtc.target_drug as bnyhmb,  " +
-				" y.yjhl_year as bnsjyh,  " +
+				" round(y.yjhl_year/sum(v1.CSL),2) as bnsjyh,  " +
 				" v6.yhcyqyy  " +
 				" from "+dataViewName2119+" v1  " +
 				" left join (  " +

@@ -147,7 +147,6 @@ public class MybatisInterceptor implements Interceptor {
                     || "com.skua.modules.erp.mapper.PurchasePlanItemMapper.queryListByPlanId".equals(sqlId) //采购计划
                     || "com.skua.modules.erp.mapper.PurchaseMaterialMapper.queryListByContractId".equals(sqlId) //采购合同
                     || "com.skua.modules.erp.mapper.DistributMaterialMapper.queryListByContractId".equals(sqlId) //采购-分销合同
-                    || "com.skua.modules.erp.mapper.ERPPurchaseContractMapper.selectList".equals(sqlId) //采购合同
                     || "com.skua.modules.supplies.mapper.EquipmentSparepartSuppliesMapper.selectList".equals(sqlId) //物料
                     || "com.skua.modules.erp.mapper.ERPPurchaseContractMapper.selectList".equals(sqlId)  //采购合同列表
                     || "com.skua.modules.erp.mapper.DistributContractMapper.selectList".equals(sqlId)  //分销合同列表