公积金分摊表取值调整

hr/hr/src/client/nc/ui/hr/baod_orders/view/AccumulationFundAllocationUI.java

@@ -702,12 +702,12 @@ public class AccumulationFundAllocationUI extends ToftPanel {
 		StringBuffer sql = new StringBuffer();
 		sql.append("SELECT clerkcode,clerkname,endowment_base AS basicssum,sum_per_cost AS orgsum,mark");
 		sql.append(" FROM");
-		sql.append(" (SELECT ROWNUM AS seq, t.CLERKCODE,T1.CLERKNAME,t.ym,sum( nvl( t.VALUE, 0 ) ) AS sum_per_cost,t1.ENDOWMENT_BASE,t1.mark");
+		sql.append(" (SELECT ROWNUM AS seq,t.CLERKCODE,T1.CLERKNAME,t.ym,sum( nvl( t.VALUE, 0 ) ) AS sum_per_cost,t1.housing_fund_base as endowment_base,t1.mark");
 		sql.append(" from NC6337.v_data_xz_gjjshare t");
-		sql.append(" left join NC6337.V_SUM_TB_HR_SOCIAL_SECURITY t1 on t1.CLERKCODE=t.CLERKCODE and t1.PAY_MONTH||'-01'=t.ym");
-		sql.append(" where");
-		sql.append(" t.key = '社保公司税后扣款' and t.VALUE <> 0 and t.ym='" + period + "'||'-01' and t1.ORGCODE='" + orgCode + "' and t1.ENDOWMENT_BASE is not null");
-		sql.append(" group by ROWNUM,t.CLERKCODE, T1.CLERKNAME,t.ym,t1.ENDOWMENT_BASE,t1.mark)");
+		sql.append(" LEFT JOIN NC6337.V_SUM_TB_HR_SOCIAL_SECURITY t1 ON t1.CLERKCODE = t.CLERKCODE AND t1.PAY_MONTH || '-01' = t.ym");
+		sql.append(" WHERE");
+		sql.append(" t.key = '公积金公司税后扣款' and t.VALUE <> 0 and t.ym='"+period+"'||'-01' and t1.ORGCODE_HOUSE='"+orgCode+"' and t1.ENDOWMENT_BASE is not null");
+		sql.append(" GROUP BY ROWNUM,t.CLERKCODE,T1.CLERKNAME,t.ym,t1.housing_fund_base,t1.mark ORDER BY ROWNUM)");
 		return (List<Map<String, String>>) iuap.executeQuery(sql.toString(), new MapListProcessor());
 	}
 
@@ -726,13 +726,13 @@ public class AccumulationFundAllocationUI extends ToftPanel {
 		sql.append(" (SELECT ROWNUM,t.*");
 		sql.append(" FROM nc6337.V_SUM_TB_HR_SOCIAL_SECURITY t");
 		sql.append(" WHERE");
-		sql.append(" t.out_org IS NOT NULL AND t.PAY_MONTH = '" + period + "' AND t.ORGCODE = '" + orgCode + "'");
+		sql.append(" t.out_org IS NOT NULL AND t.PAY_MONTH = '"+period+"' AND t.ORGCODE = '"+orgCode+"'");
 		sql.append(" ORDER BY ROWNUM)");
 		return (List<Map<String, String>>) iuap.executeQuery(sql.toString(), new MapListProcessor());
 	}
 
 	/**
-	 * 查询由部门承担或全额公司承担
+	 * 由部门承担或全额公司承担
 	 * 
 	 * @param period
 	 * @param orgcode
@@ -741,25 +741,25 @@ public class AccumulationFundAllocationUI extends ToftPanel {
 	 */
 	private List<Map<String, String>> queryTableThree(String orgCode, String period) throws Exception {
 		StringBuffer sql = new StringBuffer();
-		sql.append("SELECT clerkcode,clerkname,endowment_base AS basicssum,so_staff_sum AS staffsum,so_org_sum AS orgsum");
+		sql.append(" SELECT clerkcode,clerkname,housing_fund_base AS basicssum,HOUSING_FUND_STAFF AS staffsum,HOUSING_FUND_ORG AS orgsum");
 		sql.append(" FROM");
-		sql.append(" (SELECT ROWNUM,t2.clerkcode,t2.clerkname,t2.endowment_base,t2.so_staff_sum,t2.so_org_sum");
+		sql.append(" (SELECT ROWNUM,t2.*");
 		sql.append(" FROM");
 		sql.append(" (SELECT");
-		sql.append(" T.Endowment_Base,T.CLERKCODE,T.CLERKNAME,T.so_org_sum,T.so_staff_sum,T.ORGCODE,T.PAY_MONTH");
+		sql.append(" T.housing_fund_base,T.CLERKCODE,T.CLERKNAME,T.HOUSING_FUND_ORG,T.HOUSING_FUND_STAFF,T.ORGCODE_HOUSE,T.PAY_MONTH,T.MARK");
 		sql.append(" FROM");
 		sql.append(" NC6337.V_SUM_TB_HR_SOCIAL_SECURITY T");
 		sql.append(" WHERE");
-		sql.append(" T.PK_POST IN ( SELECT T3.PK_POST FROM NC6337.om_post t3 WHERE T3.postname = '残保金人员' )");
-		sql.append(" UNION ALL SELECT");
-		sql.append(" t1.Endowment_Base,t1.CLERKCODE,t1.CLERKNAME,t1.so_org_sum,t1.so_staff_sum,T1.ORGCODE,t1.PAY_MONTH ");
+		sql.append(" T.PK_POST IN ( SELECT T3.PK_POST FROM NC6337.om_post t3 WHERE T3.postname = '残保金人员' ) AND T.HOUSING_FUND_ORG <> 0");
+		sql.append(" UNION ALL");
+		sql.append(" SELECT");
+		sql.append(" t1.housing_fund_base,t1.CLERKCODE,t1.CLERKNAME,t1.HOUSING_FUND_ORG,t1.HOUSING_FUND_STAFF,T1.ORGCODE_HOUSE,t1.PAY_MONTH,T1.MARK");
 		sql.append(" FROM");
-		sql.append(" NC6337.V_SUM_TB_HR_SOCIAL_SECURITY_D t1");
+		sql.append(" NC6337.V_SUM_TB_HR_SOCIAL_SECURITY_D t1 ");
 		sql.append(" WHERE");
-		sql.append(" t1.MARK LIKE '%表三%'");
-		sql.append(" ) t2");
+		sql.append(" t1.MARK = '表三') t2");
 		sql.append(" WHERE");
-		sql.append(" t2.PAY_MONTH = '" + period + "' AND t2.ORGCODE = '" + orgCode + "'");
+		sql.append(" t2.PAY_MONTH = '"+period+"' AND t2.ORGCODE_HOUSE = '"+orgCode+"'");
 		sql.append(" ORDER BY ROWNUM)");
 		return (List<Map<String, String>>) iuap.executeQuery(sql.toString(), new MapListProcessor());
 	}
@@ -774,21 +774,20 @@ public class AccumulationFundAllocationUI extends ToftPanel {
 	 */
 	private List<Map<String, String>> queryTableFour(String orgCode, String period) throws Exception {
 		StringBuffer sql = new StringBuffer();
-		sql.append("SELECT salocation as orgname,clerkcode,clerkname,endowment_base AS basicssum,so_staff_sum AS staffsum,so_org_sum AS orgsum,mark");
+		sql.append(" SELECT salocation as orgname,clerkcode,clerkname,housing_fund_base AS basicssum,HOUSING_FUND_STAFF AS staffsum,HOUSING_FUND_ORG AS orgsum,mark");
 		sql.append(" FROM");
 		sql.append(" (SELECT ROWNUM AS seq,t11.*");
 		sql.append(" FROM");
 		sql.append(" (SELECT");
-		sql.append(" t.CLERKCODE,T1.CLERKNAME,t.ym,decode( t.c_23, '青岛天华易境建筑设计有限公司', 0, sum( nvl( t.VALUE, 0 ) ) ) AS sum_per_cost,");
-		sql.append(" t.c_23 AS salocation,decode( t.c_23, '青岛天华易境建筑设计有限公司', t1.so_org_sum + t1.so_staff_sum, t1.so_org_sum ) AS so_org_sum,");
-		sql.append(" t1.so_staff_sum,t1.ENDOWMENT_BASE,T1.MARK");
+		sql.append(" t.CLERKCODE,T1.CLERKNAME,t.ym,sum( nvl( t.VALUE, 0 ) ) AS sum_per_cost,t.c_23 AS salocation,t1.HOUSING_FUND_ORG,t1.HOUSING_FUND_STAFF,t1.housing_fund_base,t1.mark");
 		sql.append(" FROM");
 		sql.append(" NC6337.v_data_xz_gjjshare t");
-		sql.append(" LEFT JOIN NC6337.V_SUM_TB_HR_SOCIAL_SECURITY t1 ON t1.CLERKCODE = t.CLERKCODE AND t1.PAY_MONTH || '-01' = t.ym");
-		sql.append(" WHERE t.key = '社保个人合计'  AND t.VALUE <> 0 AND t.ym = '" + period + "' || '-01' AND t1.ORGCODE = '" + orgCode + "' AND t1.PAY_SOS_ORG <> t.c_23");
-		sql.append(" GROUP BY ROWNUM,t.CLERKCODE,T1.CLERKNAME,t.ym,t1.ENDOWMENT_BASE,t1.so_org_sum,t1.so_staff_sum,t.c_23,T1.MARK");
-		sql.append(" ORDER BY t.c_23");
-		sql.append(" ) t11");
+		sql.append(" LEFT JOIN NC6337.V_SUM_TB_HR_SOCIAL_SECURITY t1 ON t1.CLERKCODE = t.CLERKCODE");
+		sql.append(" AND t1.PAY_MONTH || '-01' = t.ym");
+		sql.append(" WHERE");
+		sql.append(" t.key = '社保个人合计' AND t.VALUE <> 0 AND t.ym = '"+period+"' || '-01' AND t1.ORGCODE_HOUSE = '"+orgCode+"' AND t1.HOUSING_FUND_PAY_ORG <> t.c_23");
+		sql.append(" GROUP BY ROWNUM,t.CLERKCODE,T1.CLERKNAME,t.ym,t1.housing_fund_base,t1.HOUSING_FUND_ORG,t1.HOUSING_FUND_STAFF,t.c_23,t1.mark");
+		sql.append(" ORDER BY t.c_23) t11");
 		sql.append(" ORDER BY ROWNUM)");
 		return (List<Map<String, String>>) iuap.executeQuery(sql.toString(), new MapListProcessor());
 	}
@@ -803,43 +802,48 @@ public class AccumulationFundAllocationUI extends ToftPanel {
 	 */
 	private List<Map<String, String>> queryTableFive(String orgCode, String period) throws Exception {
 		StringBuffer sql = new StringBuffer();
-		sql.append("select costorgname as orgname,clerkcode,clerkname,endowment_base AS basicssum, so_staff_sum as staffsum,so_org_sum AS orgsum,mark ");
+		sql.append(" SELECT");
+		sql.append(" costorgname AS orgname,clerkcode,clerkname,housing_fund_base AS basicssum,HOUSING_FUND_STAFF AS staffsum,HOUSING_FUND_ORG AS orgsum,mark");
 		sql.append(" FROM");
-		sql.append(" ( SELECT t.CLERKCODE,T1.CLERKNAME,t.ym,sum( nvl( t.VALUE, 0 ) ) AS sum_per_cost,T13.Name AS costorgname,t.c_23 AS salocation,");
-		sql.append(" t1.so_org_sum - nvl( t15.sum_per_cost, 0 ) - nvl( t16.SO_ORG_SUM, 0 ) AS so_org_sum,t1.ENDOWMENT_BASE,t1.so_staff_sum,t1.mark");
+		sql.append(" (SELECT");
+		sql.append(" t.CLERKCODE,T1.CLERKNAME,t.ym,sum( nvl( t.VALUE, 0 ) ) AS sum_per_cost,T13.Name AS costorgname,t.c_23 AS salocation,t1.HOUSING_FUND_ORG - nvl( t15.sum_per_cost, 0 ) - nvl( t16.HOUSING_FUND_ORG, 0 ) AS HOUSING_FUND_ORG,t1.HOUSING_FUND_STAFF,t1.housing_fund_base,t1.mark ");
 		sql.append(" FROM");
 		sql.append(" NC6337.v_data_xz_gjjshare t");
-		sql.append(" LEFT JOIN NC6337.V_SUM_TB_HR_SOCIAL_SECURITY t1 ON t1.CLERKCODE = t.CLERKCODE AND t1.PAY_MONTH || '-01' = t.ym");
-		sql.append(" LEFT JOIN ( SELECT t12.CLERK_CODE, t12.NC_PK_POST FROM nc6337.monthly_position_gjj t12 WHERE t12.month = to_char( last_day( to_date( '" + period
-				+ "', 'yyyy-mm' ) ), 'yyyy-mm-dd' )");
+		sql.append(" LEFT JOIN NC6337.V_SUM_TB_HR_SOCIAL_SECURITY t1 ON t1.CLERKCODE = t.CLERKCODE");
+		sql.append(" AND t1.PAY_MONTH || '-01' = t.ym");
+		sql.append(" LEFT JOIN (");
+		sql.append(" SELECT");
+		sql.append(" t12.CLERK_CODE,");
+		sql.append(" t12.NC_PK_POST");
+		sql.append(" FROM");
+		sql.append(" nc6337.monthly_position_gjj t12");
+		sql.append(" WHERE");
+		sql.append(" t12.month = to_char( last_day( to_date( '"+period+"', 'yyyy-mm' ) ), 'yyyy-mm-dd' )");
 		sql.append(" ) T12 ON t12.CLERK_CODE = t.CLERKCODE");
 		sql.append(" LEFT JOIN nc6337.om_post t14 ON t14.pk_post = t12.NC_PK_POST");
 		sql.append(" LEFT JOIN nc6337.org_corp T13 ON T13.Pk_Corp = t14.pk_org");
-		sql.append(" LEFT JOIN nc6337.person_afford_sbgjj t15 ON t15.CLERKCODE = t.CLERKCODE AND t.YM = t15.ym");
-		sql.append(" LEFT JOIN nc6337.DEPT_AFFORD_SBGJJ t16 ON t16.CLERKCODE = t.CLERKCODE AND t.YM = t16.PAY_MONTH WHERE");
-		sql.append(" t.key IN ( '社保个人合计', '费用调整社保', '社保个人扣款', '费用调整社保T' ) ");
-		sql.append(" AND t.VALUE <> 0 AND t.ym = '" + period + "' || '-01' AND t1.ORGCODE = '" + orgCode + "' AND t1.PAY_SOS_ORG = t.c_23");
-		sql.append(" AND t.CLERKCODE NOT IN ( SELECT t11.WORKERCODE FROM nc6337.v_hr_allocationratio_gjjshareF t11 WHERE t11.WA_PERIOD = '" + period + "' || '-01' ) ");
-		sql.append(" GROUP BY t.CLERKCODE,T1.CLERKNAME,t.ym,t1.ENDOWMENT_BASE,t1.so_org_sum - nvl( t15.sum_per_cost, 0 ) - nvl( t16.SO_ORG_SUM, 0 ),");
-		sql.append(" t1.so_staff_sum,T13.Name,t.c_23,t1.mark");
-		sql.append(" UNION ALL SELECT");
-		sql.append(" t.WORKERCODE AS CLERKCODE,t1.CLERKNAME,t.WA_PERIOD AS ym,0 AS sum_per_cost,T6.NAME AS costorgname,'上海天华' AS salocation,");
-		sql.append(" round( nvl( t1.so_org_sum, 0 ) * nvl( t.perc, 0 ), 3 ) AS so_org_sum,");
-		sql.append(" round( nvl( t1.so_staff_sum, 0 ) * nvl( t.perc, 0 ), 3 ) AS so_staff_sum,t1.Endowment_Base,t1.mark");
+		sql.append(" LEFT JOIN nc6337.person_afford_sbgjj_g t15 ON t15.CLERKCODE = t.CLERKCODE AND t.YM = t15.ym");
+		sql.append(" LEFT JOIN nc6337.DEPT_AFFORD_SBGJJ t16 ON t16.CLERKCODE = t.CLERKCODE AND t.YM = t16.PAY_MONTH");
+		sql.append(" WHERE");
+		sql.append(" t.key IN ( '公积金个人合计', '费用调整公积金', '公积金个人扣款', '费用调整公积金t' )AND t.VALUE <> 0 AND t.ym = '"+period+"' || '-01' AND t1.ORGCODE_HOUSE = '"+orgCode+"' AND t1.Housing_Fund_Pay_Org = t.c_23");
+		sql.append(" AND t.CLERKCODE NOT IN ( SELECT t11.WORKERCODE FROM nc6337.v_hr_allocationratio_gjjshareF t11 WHERE t11.WA_PERIOD = '"+period+"' || '-01' )");
+		sql.append(" GROUP BY t.CLERKCODE,t.CLERKCODE,T1.CLERKNAME,t.ym,t1.housing_fund_base,t1.HOUSING_FUND_ORG - nvl( t15.sum_per_cost, 0 ) - nvl( t16.HOUSING_FUND_ORG, 0 ),t1.HOUSING_FUND_STAFF,T13.Name,t.c_23,t1.mark");
+		sql.append(" UNION ALL");
+		sql.append(" SELECT");
+		sql.append(" t.WORKERCODE AS CLERKCODE,t1.CLERKNAME,t.WA_PERIOD AS ym,0 AS sum_per_cost,T6.NAME AS costorgname,'上海天华' AS salocation,round( nvl( t1.HOUSING_FUND_ORG, 0 ) * nvl( t.perc, 0 ), 2 ) AS HOUSING_FUND_ORG,");
+		sql.append(" round( nvl( t1.HOUSING_FUND_STAFF, 0 ) * nvl( t.perc, 0 ), 2 ) AS HOUSING_FUND_STAFF,t1.housing_fund_base,t1.mark");
 		sql.append(" FROM");
 		sql.append(" nc6337.v_hr_allocationratio_gjjshareF t");
 		sql.append(" LEFT JOIN nc6337.V_SUM_TB_HR_SOCIAL_SECURITY t1 ON t1.CLERKCODE = t.WORKERCODE AND t1.PAY_MONTH || '-01' = t.WA_PERIOD");
 		sql.append(" LEFT JOIN ( SELECT DISTINCT T5.CODE, T5.NAME, t5.pk_corp FROM nc6337.ORG_CORP T5 ) T6 ON T6.pk_corp = T.COST_ORG");
 		sql.append(" WHERE");
-		sql.append(" t.WA_PERIOD = '" + period + "' || '-01' AND t1.CLERKNAME IS NOT NULL AND t1.ORGCODE = '" + orgCode + "'");
-		sql.append(" UNION ALL SELECT");
-		sql.append(" t1.CLERKCODE,t1.CLERKNAME,t1.PAY_MONTH || '-01' AS ym,0 AS sum_per_cost,T1.PAY_SOS_ORG AS costorgname,'上海天华' AS salocation,");
-		sql.append(" decode( t1.mark, '资质人员', t1.so_org_sum + t1.so_staff_sum, t1.so_org_sum ) AS so_org_sum,0 AS so_staff_sum,");
-		sql.append(" t1.Endowment_Base,t1.mark");
+		sql.append(" t.WA_PERIOD = '"+period+"' || '-01'AND t1.CLERKNAME IS NOT NULL AND t1.ORGCODE_HOUSE = '"+orgCode+"' UNION ALL");
+		sql.append(" SELECT");
+		sql.append(" t1.CLERKCODE,t1.CLERKNAME,t1.PAY_MONTH || '-01' AS ym,0 AS sum_per_cost,T1.Housing_Fund_Pay_Org AS costorgname,'上海天华' AS salocation,t1.HOUSING_FUND_ORG,0 AS HOUSING_FUND_STAFF,t1.housing_fund_base,t1.mark");
 		sql.append(" FROM");
 		sql.append(" NC6337.V_SUM_TB_HR_SOCIAL_SECURITY_D t1");
 		sql.append(" WHERE");
-		sql.append(" t1.MARK IN ( '资质人员', '上海公司承担' ) AND t1.PAY_MONTH = '" + period + "'AND t1.ORGCODE = '" + orgCode + "'");
+		sql.append(" t1.MARK IN ( '资质人员', '上海公司承担' )AND t1.PAY_MONTH = '"+period+"'AND t1.ORGCODE_HOUSE = '"+orgCode+"'");
 		sql.append(" )ORDER BY costorgname");
 		return (List<Map<String, String>>) iuap.executeQuery(sql.toString(), new MapListProcessor());
 	}
@@ -854,35 +858,39 @@ public class AccumulationFundAllocationUI extends ToftPanel {
 	 */
 	private List<Map<String, String>> queryTableSix(String orgCode, String period) throws Exception {
 		StringBuffer sql = new StringBuffer();
-		sql.append("SELECT orgname,clerkcode,clerkname,endowment_base AS basicssum,so_staff_sum as staffsum,so_org_sum AS orgsum,mark");
+		sql.append(" SELECT");
+		sql.append(" orgname,clerkcode,clerkname,endowment_base AS basicssum,housing_fund_staff AS staffsum,housing_fund_org AS orgsum,mark ");
 		sql.append(" FROM");
-		sql.append(" (SELECT t1.CLERKCODE,t1.CLERKNAME,t1.Endowment_Base,t1.so_org_sum,t1.so_staff_sum,t1.mark,T13.Name AS orgname");
+		sql.append(" (SELECT t1.*,T13.Name AS orgname");
 		sql.append(" FROM");
 		sql.append(" nc6337.V_SUM_TB_HR_SOCIAL_SECURITY t1");
-		sql.append(" LEFT JOIN (SELECT t12.CLERK_CODE,t12.NC_PK_POST FROM nc6337.monthly_position_gjj t12 WHERE");
-		sql.append(" t12.month = to_char( last_day( to_date( '" + period + "', 'yyyy-mm' ) ), 'yyyy-mm-dd' )");
-		sql.append(" ) T12 ON t12.CLERK_CODE = t1.CLERKCODE");
-		sql.append(" LEFT JOIN nc6337.om_post t14 ON t14.pk_post = t12.NC_PK_POST");
-		sql.append(" LEFT JOIN nc6337.org_corp T13 ON T13.Pk_Corp = t14.pk_org");
-		sql.append(" WHERE");
-		sql.append(" t1.CLERKCODE NOT IN (SELECT t2.CLERKCODE FROM(SELECT t.CLERKCODE,sum( nvl( t.VALUE, 0 ) ) AS sumVALUE");
-		sql.append(" FROM NC6337.v_data_xz_gjjshare t WHERE t.key IN ( '社保个人合计', '社保个人扣款' ) AND t.ym = '" + period + "' || '-01'");
-		sql.append(" GROUP BY t.CLERKCODE ");
-		sql.append(" ) t2 WHERE t2.sumVALUE > 0)");
-		sql.append(" AND T1.PK_POST NOT IN ( SELECT T3.PK_POST FROM NC6337.om_post t3 WHERE T3.postname IN ( '残保金人员', '资质人员' ) )");
-		sql.append(" AND t1.out_org IS NULL AND t1.Endowment_Base <> 0 AND t1.PAY_MONTH = '" + period + "' AND t1.ORGCODE = '" + orgCode + "'");
-		sql.append(" UNION ALL SELECT");
-		sql.append(" t1.CLERKCODE,t1.CLERKNAME,t1.Endowment_Base,t1.so_org_sum,t1.so_staff_sum,t1.mark,T13.Name AS orgname");
-		sql.append(" FROM nc6337.V_SUM_TB_HR_SOCIAL_SECURITY_D t1 LEFT JOIN (SELECT t12.CLERK_CODE,t12.NC_PK_POST FROM");
+		sql.append(" LEFT JOIN (");
+		sql.append(" SELECT");
+		sql.append(" t12.CLERK_CODE,");
+		sql.append(" t12.NC_PK_POST");
+		sql.append(" FROM");
 		sql.append(" nc6337.monthly_position_gjj t12");
 		sql.append(" WHERE");
-		sql.append(" t12.month = to_char( last_day( to_date( '" + period + "', 'yyyy-mm' ) ), 'yyyy-mm-dd' ) ");
+		sql.append(" t12.month = to_char( last_day( to_date( '"+period+"', 'yyyy-mm' ) ), 'yyyy-mm-dd' )");
 		sql.append(" ) T12 ON t12.CLERK_CODE = t1.CLERKCODE");
 		sql.append(" LEFT JOIN nc6337.om_post t14 ON t14.pk_post = t12.NC_PK_POST");
 		sql.append(" LEFT JOIN nc6337.org_corp T13 ON T13.Pk_Corp = t14.pk_org");
 		sql.append(" WHERE");
-		sql.append(" t1.mark LIKE '%表六%' ");
-		sql.append(" AND t1.PAY_MONTH = '" + period + "' AND t1.ORGCODE = '" + orgCode + "'");
+		sql.append(" t1.CLERKCODE NOT IN (");
+		sql.append(" SELECT");
+		sql.append(" t2.CLERKCODE");
+		sql.append(" FROM");
+		sql.append(" (SELECT");
+		sql.append(" t.CLERKCODE,sum( nvl( t.VALUE, 0 ) ) AS sumVALUE");
+		sql.append(" FROM");
+		sql.append(" NC6337.v_data_xz_gjjshare t");
+		sql.append(" WHERE");
+		sql.append(" t.key IN ( '公积金个人合计', '公积金个人扣款' )AND t.ym = '"+period+"' || '-01'");
+		sql.append(" GROUP BY t.CLERKCODE) t2");
+		sql.append(" WHERE");
+		sql.append(" t2.sumVALUE > 0)");
+		sql.append(" AND T1.PK_POST NOT IN ( SELECT T3.PK_POST FROM NC6337.om_post t3 WHERE T3.postname IN ( '残保金人员', '资质人员' ) ) AND t1.out_org IS NULL");
+		sql.append(" AND t1.housing_fund_base <> 0 AND t1.PAY_MONTH = '"+period+"'AND t1.ORGCODE_HOUSE = '"+orgCode+"'");
 		sql.append(" )ORDER BY orgname");
 		return (List<Map<String, String>>) iuap.executeQuery(sql.toString(), new MapListProcessor());
 	}
@@ -897,38 +905,59 @@ public class AccumulationFundAllocationUI extends ToftPanel {
 	 */
 	private List<Map<String, String>> queryTableSeven(String orgCode, String period) throws Exception {
 		StringBuffer sql = new StringBuffer();
-		sql.append("SELECT orgname,clerkcode,clerkname,endowment_base AS basicssum,so_staff_sum as staffsum,so_org_sum AS orgsum,mark");
+		sql.append(" SELECT");
+		sql.append(" orgname,clerkcode,clerkname,housing_fund_base AS basicssum,housing_fund_staff as staffsum,so_org_sum AS orgsum,mark");
 		sql.append(" FROM");
-		sql.append(" (SELECT t1.CLERKCODE,t1.CLERKNAME,t1.Endowment_Base,( t16.sumvalue - t1.so_staff_sum ) AS so_staff_sum,");
-		sql.append(" 0 AS so_org_sum,T13.Name AS orgname,t1.mark");
+		sql.append(" (SELECT");
+		sql.append(" t1.CLERKCODE,t1.CLERKNAME,t1.housing_fund_base,( t16.sumvalue - t1.HOUSING_FUND_STAFF ) AS HOUSING_FUND_STAFF,0 AS so_org_sum,T13.Name AS orgname,t1.mark ");
 		sql.append(" FROM");
 		sql.append(" nc6337.V_SUM_TB_HR_SOCIAL_SECURITY t1");
-		sql.append(" LEFT JOIN (SELECT t12.CLERK_CODE,t12.NC_PK_POST FROM nc6337.monthly_position_gjj t12 WHERE");
-		sql.append(" t12.month = to_char( last_day( to_date( '" + period + "', 'yyyy-mm' ) ), 'yyyy-mm-dd' )");
+		sql.append(" LEFT JOIN (");
+		sql.append(" SELECT");
+		sql.append(" t12.CLERK_CODE,t12.NC_PK_POST");
+		sql.append(" FROM");
+		sql.append(" nc6337.monthly_position_gjj t12 ");
+		sql.append(" WHERE");
+		sql.append(" t12.month = to_char( last_day( to_date( '"+period+"', 'yyyy-mm' ) ), 'yyyy-mm-dd' )");
 		sql.append(" ) T12 ON t12.CLERK_CODE = t1.CLERKCODE");
 		sql.append(" LEFT JOIN nc6337.om_post t14 ON t14.pk_post = t12.NC_PK_POST");
 		sql.append(" LEFT JOIN nc6337.org_corp T13 ON T13.Pk_Corp = t14.pk_org");
-		sql.append(" LEFT JOIN nc6337.person_deduction_sbgjj t16 ON t16.CLERKCODE = t1.CLERKCODE AND t1.pay_month || '-01' = t16.ym");
+		sql.append(" LEFT JOIN nc6337.person_deduction_sbgjj_g t16 ON t16.CLERKCODE = t1.CLERKCODE ");
+		sql.append(" AND t1.pay_month || '-01' = t16.ym");
+		sql.append(" WHERE");
+		sql.append(" t1.CLERKCODE IN (");
+		sql.append(" SELECT");
+		sql.append(" t2.CLERKCODE");
+		sql.append(" FROM");
+		sql.append(" (SELECT");
+		sql.append(" t.CLERKCODE,sum( nvl( t.VALUE, 0 ) ) AS sumVALUE");
+		sql.append(" FROM");
+		sql.append(" NC6337.v_data_xz_gjjshare t ");
+		sql.append(" WHERE");
+		sql.append(" t.key IN ( '公积金个人合计', '公积金个人扣款' ) AND t.ym = '"+period+"' || '-01'");
+		sql.append(" GROUP BY t.CLERKCODE) t2");
 		sql.append(" WHERE");
-		sql.append(" t1.CLERKCODE IN (SELECT t2.CLERKCODE FROM (SELECT t.CLERKCODE,sum( nvl( t.VALUE, 0 ) ) AS sumVALUE FROM");
-		sql.append(" NC6337.v_data_xz_gjjshare t WHERE t.key IN ( '社保个人扣款', '社保个人合计' ) AND t.ym = '" + period + "' || '-01'");
-		sql.append(" GROUP BY t.CLERKCODE");
-		sql.append(" ) t2 WHERE t2.sumVALUE > 0)");
-		sql.append(" AND T1.PK_POST NOT IN ( SELECT T3.PK_POST FROM NC6337.om_post t3 WHERE T3.postname IN ( '残保金人员', '资质人员' ) )");
-		sql.append(" AND t1.out_org IS NULL AND t1.Endowment_Base <> 0 AND ( t16.sumvalue - t1.so_staff_sum ) > 0");
-		sql.append(" AND t1.PAY_MONTH = '" + period + "' AND t1.ORGCODE = '" + orgCode + "'");
-		sql.append(" UNION ALL SELECT");
-		sql.append(" t1.CLERKCODE,t1.CLERKNAME,t1.Endowment_Base,t1.so_staff_sum,t1.so_org_sum,T13.Name AS orgname,t1.mark");
+		sql.append(" t2.sumVALUE > 0) ");
+		sql.append(" AND T12.NC_PK_POST NOT IN ( SELECT T3.PK_POST FROM NC6337.om_post t3 WHERE T3.postname IN ( '残保金人员', '资质人员' ) )");
+		sql.append(" AND t1.out_org IS NULL AND t1.housing_fund_base <> 0 AND ( t16.sumvalue - t1.HOUSING_FUND_STAFF ) <> 0");
+		sql.append(" AND t1.PAY_MONTH = '"+period+"' AND t1.ORGCODE_HOUSE = '"+orgCode+"'");
+		sql.append(" UNION ALL");
+		sql.append(" SELECT");
+		sql.append(" t1.CLERKCODE,t1.CLERKNAME,t1.housing_fund_base,t1.HOUSING_FUND_STAFF,t1.HOUSING_FUND_ORG,T13.Name AS orgname,t1.mark");
 		sql.append(" FROM");
 		sql.append(" nc6337.V_SUM_TB_HR_SOCIAL_SECURITY_D t1");
-		sql.append(" LEFT JOIN (SELECT t12.CLERK_CODE,t12.NC_PK_POST FROM nc6337.monthly_position_gjj t12 WHERE");
-		sql.append(" t12.month = to_char( last_day( to_date( '" + period + "', 'yyyy-mm' ) ), 'yyyy-mm-dd' ) ");
+		sql.append(" LEFT JOIN (");
+		sql.append(" SELECT");
+		sql.append(" t12.CLERK_CODE,t12.NC_PK_POST");
+		sql.append(" FROM");
+		sql.append(" nc6337.monthly_position_gjj t12");
+		sql.append(" WHERE");
+		sql.append(" t12.month = to_char( last_day( to_date( '"+period+"', 'yyyy-mm' ) ), 'yyyy-mm-dd' )");
 		sql.append(" ) T12 ON t12.CLERK_CODE = t1.CLERKCODE");
 		sql.append(" LEFT JOIN nc6337.om_post t14 ON t14.pk_post = t12.NC_PK_POST");
 		sql.append(" LEFT JOIN nc6337.org_corp T13 ON T13.Pk_Corp = t14.pk_org");
 		sql.append(" WHERE");
-		sql.append(" t1.mark LIKE '%表七%'");
-		sql.append(" AND t1.PAY_MONTH = '" + period + "' AND t1.ORGCODE = '" + orgCode + "'");
+		sql.append(" t1.mark LIKE '%表七%' AND t1.PAY_MONTH = '"+period+"'AND t1.ORGCODE_HOUSE = '"+orgCode+"'");
 		sql.append(" )ORDER BY orgname");
 		return (List<Map<String, String>>) iuap.executeQuery(sql.toString(), new MapListProcessor());
 	}
@@ -969,8 +998,8 @@ public class AccumulationFundAllocationUI extends ToftPanel {
 		sql.append(" FROM");
 		sql.append(" NC6337.v_data_xz_gjjshare t");
 		sql.append(" WHERE");
-		sql.append(" t.key IN ( '社保个人合计', '费用调整社保', '社保个人扣款', '费用调整社保T' ) AND t.ym = '" + period + "' || '-01'");
-		sql.append(" AND t.c_23 = ( SELECT t1.name FROM nc6337.org_corp t1 WHERE t1.code = '" + orgCode + "' )");
+		sql.append(" t.key IN ( '公积金个人合计', '费用调整公积金', '公积金个人扣款', '费用调整公积金t' )");
+		sql.append(" AND t.ym = '"+period+"' || '-01'AND t.c_23 = ( SELECT t1.name FROM nc6337.org_corp t1 WHERE t1.code = '"+orgCode+"' )");
 		return (Object) iuap.executeQuery(sql.toString(), new ColumnProcessor());
 	}
 
@@ -984,12 +1013,10 @@ public class AccumulationFundAllocationUI extends ToftPanel {
 	 */
 	private Map<String, String> queryTableTen(String orgCode, String period) throws Exception {
 		StringBuffer sql = new StringBuffer();
-		sql.append("SELECT");
-		sql.append(" *");
-		sql.append(" FROM");
-		sql.append(" NC6337.V_SUM_TB_HR_SOCIAL_SECURITY_D T");
-		sql.append(" WHERE");
-		sql.append(" T.CLERKNAME = '总数' AND T.PAY_MONTH = '" + period + "' AND T.ORGCODE = '" + orgCode + "'");
+		sql.append(" SELECT * FROM NC6337.V_SUM_TB_HR_SOCIAL_SECURITY_D T");
+		sql.append(" WHERE T.CLERKNAME='总数'");
+		sql.append(" AND T.PAY_MONTH='"+period+"'");
+		sql.append(" AND T.ORGCODE='"+orgCode+"'");
 		Map<String, String> map = (Map<String, String>) iuap.executeQuery(sql.toString(), new MapProcessor());
 		if (map == null) {
 			map = new HashMap<String, String>();
@@ -1010,7 +1037,7 @@ public class AccumulationFundAllocationUI extends ToftPanel {
 		sql.append("SELECT");
 		sql.append(" combined_field,basicssum,staffsum,orgsum,mark from accumulation_fund");
 		sql.append(" WHERE ");
-		sql.append(" tablename = '社保分摊表' AND combined_field NOT LIKE '表八：实际集团内其他公司已缴当月工资个人部分已扣%'");
+		sql.append(" tablename = '公积金分摊表' AND combined_field NOT LIKE '表八：实际集团内其他公司已缴当月工资个人部分已扣%'");
 		sql.append(" AND orgcode = '" + orgCode + "' AND period = '" + period + "'");
 		List<Map<String, String>> listMap = (List<Map<String, String>>) iuap.executeQuery(sql.toString(), new MapListProcessor());
 		for (int i = 0; i < listMap.size(); i++) {
@@ -1068,7 +1095,7 @@ public class AccumulationFundAllocationUI extends ToftPanel {
 				}
 			}
 			// 0表示有实际修改，而不是点击弹框后关闭了
-			if (new SocialInsuranceAllUpdateDialog(selectedData, orgCode, period).showModal() == 0) {
+			if (new AccumulationFundAllUpdateDialog(selectedData, orgCode, period).showModal() == 0) {
 				// 调用报表查询刷新数据
 				tableProcessing();
 				MessageDialog.showHintDlg(this, "提示", "修改成功！");