kangwei：

康伟
sk-module-datafill/src/main/java/com/skua/modules/custom/service/impl/FCustomReportDatasetServiceImpl.java
--- a/sk-module-datafill/src/main/java/com/skua/modules/custom/service/impl/FCustomReportDatasetServiceImpl.java
查看文件 @cd72eac
+++ b/sk-module-datafill/src/main/java/com/skua/modules/custom/service/impl/FCustomReportDatasetServiceImpl.java
查看文件 @cd72eac
@@ -380,7 +380,7 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
 			departIds = JSUtils.quoteEach(departIds,",");
 		}
 		String sql = " select   ROUND(sum(ddd.wssjcll),2) wssjcll,ROUND(avg(ddd.wsfhl),2) wsfhl,ROUND(sum(ddd.dh),2) dh,  ROUND(sum(ddd.qy),2) qy,ROUND(sum(ddd.xssyl),2) xssyl,ROUND(sum(ddd.zhnyxhl),2) zhnyxhl,";
-		sql += " ROUND(sum(ddd.eyhtpfl),2) eyhtpfl,ROUND(avg(ddd.dsdh),2) dsdh  from  ";
+		sql += " ROUND(sum(ddd.eyhtpfl),2) eyhtpfl,ROUND(avg(ddd.dsdh),2) dsdh  from ( ";
 		sql += " select  d.depart_name , aaa.CSL ,f.pro_scale ,ROUND( aaa.CSL / 10000, 2 ) AS wssjcll,ROUND( 100 * ( aaa.CSL  / ( f.pro_scale * 31*10000 ) ), 2 ) AS wsfhl,";
 		sql += "   ROUND( v3.DLHJ / 10000, 2 ) AS dh,v3.qy,v3.ysl AS xssyl,ROUND(0.123*v3.DLHJ/10000 +1.4286*v3.qy,4) AS zhnyxhl ,ROUND(3*v3.qy+0.703*10*v3.DLHJ/1000,4) AS eyhtpfl,ROUND( v3.DLHJ  / aaa.CSL, 2 ) AS dsdh";
 		sql += " FROM sys_depart d  ";