修改年初始化年用水量

src/java/com/bus/dao/impl/BusOrgDaoImpl.java

@@ -68,7 +68,7 @@ public class BusOrgDaoImpl extends GenericDaoImpl<BusOrg, Long>
 		//通过sql查询增长比例
 		String v = " (select 1+(growth_ratio/100) from base_org_type o where o.org_type_id = b.org_type_id) ";
 		String s = " (select count(1) from bus_customer_meter c where c.`org_id` = b.`org_id` and c.`year` = b.`year`) ";
-		String yearSql = "ROUND(ROUND(SUM(bm.`water`)/count(bm.`water`)) * 12 * "+s+" * "+v+")";
+		String yearSql = "ROUND(SUM(bm.`water`)/count(bm.`water`) * 12 * "+s+" * "+v+")";
 		String quarterSql = "ROUND("+yearSql+"/4)";
 		String montherSql = "ROUND("+yearSql+"/12)";
 		String sql = " INSERT INTO `bus_annual_plan_for_water`                                                           "
@@ -204,7 +204,7 @@ public class BusOrgDaoImpl extends GenericDaoImpl<BusOrg, Long>
 		//通过sql查询增长比例
 		String v = " (select 1+(growth_ratio/100) from base_org_type o where o.org_type_id = b.org_type_id) ";
         String s = " (select count(1) from bus_customer_meter c where c.`org_id` = b.`org_id` and c.`year` = b.`year`) ";
-		String yearSql = "ROUND(ROUND(SUM(bm.`water`)/count(bm.`water`)) * 12 * "+s+" * "+v+")";
+		String yearSql = "ROUND(SUM(bm.`water`)/count(bm.`water`) * 12 * "+s+" * "+v+")";
 		String quarterSql = "ROUND("+yearSql+"/4)";
 		String montherSql = "ROUND("+yearSql+"/12)";
 
@@ -248,7 +248,7 @@ public class BusOrgDaoImpl extends GenericDaoImpl<BusOrg, Long>
 		//通过sql查询增长比例
 		String v = " (select 1+(growth_ratio/100) from base_org_type o where o.org_type_id = b.org_type_id ) ";
         String s = " (select count(1) from bus_customer_meter c where c.`org_id` = b.`org_id` and c.`year` = b.`year`) ";
-		String yearSql = "ROUND(ROUND(SUM(bm.`water`)/count(bm.`water`)) * 12 * "+s+" * "+v+")";
+		String yearSql = "ROUND(SUM(bm.`water`)/count(bm.`water`) * 12 * "+s+" * "+v+")";
 		String quarterSql = "ROUND("+yearSql+"/4)";
 		String montherSql = "ROUND("+yearSql+"/12)";
 		String sql =" INSERT INTO `bus_month_assessment`                                                                   "