|
|
@@ -288,7 +288,7 @@ public class AccumulationFundAllocationUI extends ToftPanel {
|
|
|
Vector v = (Vector) periodData.get(0);
|
|
|
period = v.get(0).toString();
|
|
|
}
|
|
|
- if (!"bt_insert".equals(bt.getCode()) && (orgCode == null || period == null)) {
|
|
|
+ if(orgCode == null || period == null) {
|
|
|
ExceptionUtils.wrappBusinessException("财务组织、年月必须选择，请选择后再操作！");
|
|
|
}
|
|
|
if ("bt_query".equals(bt.getCode())) {
|
|
|
@@ -426,10 +426,12 @@ public class AccumulationFundAllocationUI extends ToftPanel {
|
|
|
UFDouble tableSixOrg = tableMap.get("tableSix").get("org");// 实际已缴当月工资个人部分未扣公司部分
|
|
|
UFDouble tableSevenStaff = tableMap.get("tableSeven").get("staff");// 实际未缴当月工资个人部分已扣个人部分
|
|
|
UFDouble tableSevenOrg = tableMap.get("tableSeven").get("org");// 实际未缴当月工资个人部分已扣公司部分
|
|
|
+ UFDouble tableEightStaff = tableMap.get("TableEight").get("staff");// 实际集团内其他公司已缴当月工资个人部分已扣个人部分
|
|
|
+ UFDouble tableEightOrg = tableMap.get("TableEight").get("org");// 实际集团内其他公司已缴当月工资个人部分已扣公司部分
|
|
|
UFDouble queryTableNine = nvl(queryTableNine(orgCode, period), 2);// 个人工资表扣缴数
|
|
|
Map<String, String> TableTenMap = queryTableTen(orgCode, period);
|
|
|
- UFDouble TableTenStaff = nvl(TableTenMap.get("so_staff_sum"), 2);// 个人实际缴纳数
|
|
|
- UFDouble TableTenOrg = nvl(TableTenMap.get("so_org_sum"), 2);// 公司实际缴纳数
|
|
|
+ UFDouble TableTenStaff = nvl(TableTenMap.get("housing_fund_staff"), 2);// 个人实际缴纳数
|
|
|
+ UFDouble TableTenOrg = nvl(TableTenMap.get("housing_fund_org"), 2);// 公司实际缴纳数
|
|
|
// 社保账单实际交纳数 = 个人实际缴纳数+公司实际缴纳数
|
|
|
UFDouble actualSum = TableTenStaff.add(TableTenOrg);
|
|
|
// 社保分摊表金额 = 个人承担个人、公司部分+外部公司承担个人、公司部分+部门承担或全额公司承担个人、公司部分+
|
|
|
@@ -437,21 +439,21 @@ public class AccumulationFundAllocationUI extends ToftPanel {
|
|
|
UFDouble specialfillSum = tableOneStaff.add(tableOneOrg).add(tableTwoStaff).add(tableTwoOrg).add(tableThreeStaff).add(tableThreeOrg).add(tableFourStaff).add(tableFourOrg).add(tableFiveStaff)
|
|
|
.add(tableFiveOrg).add(tableSixStaff).add(tableSixOrg);
|
|
|
// 个人工资表扣缴数分摊表金额 = 月薪工资表中当月扣当月缴纳个人部分 +实际未缴当月工资个人部分已扣个人部分 + 实际集团内其他公司已缴当月工资个人部分已扣个人部分
|
|
|
- UFDouble staffPaymentSum = tableFiveStaff.add(tableSevenStaff);
|
|
|
+ UFDouble staffPaymentSum = tableFiveStaff.add(tableSevenStaff).add(tableEightStaff);
|
|
|
// 个人实际缴纳数分摊表金额 = 个人承担个人部分 + 外部公司承担个人部分 +部门承担或全额公司承担个人部分 + 个人部分已在集团内其他公司扣除个人部分
|
|
|
// +月薪工资表中当月扣当月缴纳个人部分 + 实际已缴当月工资个人部分未扣个人部分
|
|
|
UFDouble staffActualSum = tableOneStaff.add(tableTwoStaff).add(tableThreeStaff).add(tableFourStaff).add(tableFiveStaff).add(tableSixStaff);
|
|
|
// 公司实际缴纳数分摊表金额 = 个人承担公司部分 + 外部公司承担公司部分 + 部门承担或全额公司承担公司部分 + 个人部分已在集团内其他公司扣除公司部分 +
|
|
|
- // 月薪工资表中当月扣当月缴纳公司部分 + 实际已缴当月工资个人部分未扣公司部分 + 实际未缴当月工资个人部分已扣公司部分
|
|
|
- UFDouble orgActualSum = tableOneOrg.add(tableTwoOrg).add(tableThreeOrg).add(tableFourOrg).add(tableFiveOrg).add(tableSixOrg).add(tableSevenOrg);
|
|
|
+ // 月薪工资表中当月扣当月缴纳公司部分 + 实际已缴当月工资个人部分未扣公司部分
|
|
|
+ UFDouble orgActualSum = tableOneOrg.add(tableTwoOrg).add(tableThreeOrg).add(tableFourOrg).add(tableFiveOrg).add(tableSixOrg);
|
|
|
dataList.set(0, new Object[] { "汇总信息" });
|
|
|
dataList.set(1, new Object[] { "公积金汇缴单实际缴纳数", actualSum, "公积金分摊表金额", specialfillSum });
|
|
|
dataList.set(2, new Object[] { "个人承担", "公司部分", tableOneOrg, "外部公司承担", "公司部分", tableTwoOrg, "部门承担或全额公司承担", "公司部分", tableThreeOrg });
|
|
|
dataList.set(3, new Object[] { "个人承担", "个人部分", tableOneStaff, "外部公司承担", "个人部分", tableTwoStaff, "部门承担或全额公司承担", "个人部分", tableThreeStaff });
|
|
|
dataList.set(4, new Object[] { "个人部分已在集团内其他公司扣除 ", "公司部分", tableFourOrg, "月薪工资表中当月扣当月缴纳", "公司部分", tableFiveOrg, "实际已缴当月工资个人部分未扣", "公司部分", tableSixOrg });
|
|
|
dataList.set(5, new Object[] { "个人部分已在集团内其他公司扣除 ", "个人部分", tableFourStaff, "月薪工资表中当月扣当月缴纳", "个人部分", tableFiveStaff, "实际已缴当月工资个人部分未扣", "个人部分", tableSixStaff });
|
|
|
- dataList.set(6, new Object[] { "实际未缴当月工资个人部分已扣 ", "公司部分", tableSevenOrg, "实际集团内其他公司已缴当月工资个人部分已扣", "公司部分", null });
|
|
|
- dataList.set(7, new Object[] { "实际未缴当月工资个人部分已扣 ", "个人部分", tableSevenStaff, "实际集团内其他公司已缴当月工资个人部分已扣", "个人部分", null });
|
|
|
+ dataList.set(6, new Object[] { "实际未缴当月工资个人部分已扣 ", "公司部分", tableSevenOrg, "实际集团内其他公司已缴当月工资个人部分已扣", "公司部分", tableEightOrg});
|
|
|
+ dataList.set(7, new Object[] { "实际未缴当月工资个人部分已扣 ", "个人部分", tableSevenStaff, "实际集团内其他公司已缴当月工资个人部分已扣", "个人部分", tableEightStaff});
|
|
|
dataList.set(8, new Object[] { "个人", "工资表扣缴数", queryTableNine, "分摊表金额", staffPaymentSum, "差异", queryTableNine.sub(staffPaymentSum) });
|
|
|
dataList.set(9, new Object[] { "个人", "实际缴纳数", TableTenStaff, "分摊表金额", staffActualSum, "差异", TableTenStaff.sub(staffActualSum) });
|
|
|
dataList.set(10, new Object[] { "公司", "实际缴纳数", TableTenOrg, "分摊表金额", orgActualSum, "差异", TableTenOrg.sub(orgActualSum) });
|
|
|
@@ -746,9 +748,9 @@ public class AccumulationFundAllocationUI extends ToftPanel {
|
|
|
sql.append(" NULL AS orgname,");
|
|
|
sql.append(" clerkcode as clerkcode,");
|
|
|
sql.append(" clerkname as clerkname,");
|
|
|
- sql.append(" CAST(endowment_base AS VARCHAR2 ( 50 ) ) AS basicssum,");
|
|
|
- sql.append(" CAST(so_staff_sum AS VARCHAR2 ( 50 ) ) AS staffsum,");
|
|
|
- sql.append(" CAST(so_org_sum AS VARCHAR2 ( 50 ) ) AS orgsum,");
|
|
|
+ sql.append(" CAST(housing_fund_base AS VARCHAR2 ( 50 ) ) AS basicssum,");
|
|
|
+ sql.append(" CAST(housing_fund_staff AS VARCHAR2 ( 50 ) ) AS staffsum,");
|
|
|
+ sql.append(" CAST(housing_fund_org AS VARCHAR2 ( 50 ) ) AS orgsum,");
|
|
|
sql.append(" mark AS mark");
|
|
|
sql.append(" FROM nc6337.V_SUM_TB_HR_SOCIAL_SECURITY t");
|
|
|
sql.append(" WHERE");
|
|
|
@@ -921,7 +923,7 @@ public class AccumulationFundAllocationUI extends ToftPanel {
|
|
|
sql.append(" T13.Name AS orgname,");
|
|
|
sql.append(" clerkcode,");
|
|
|
sql.append(" clerkname,");
|
|
|
- sql.append(" CAST(endowment_base AS VARCHAR2 ( 50 ) ) AS basicssum,");
|
|
|
+ sql.append(" CAST(housing_fund_base AS VARCHAR2 ( 50 ) ) AS basicssum,");
|
|
|
sql.append(" CAST(housing_fund_staff AS VARCHAR2 ( 50 ) ) AS staffsum,");
|
|
|
sql.append(" CAST(housing_fund_org AS VARCHAR2 ( 50 ) ) AS orgsum,");
|
|
|
sql.append(" mark");
|
|
|
@@ -952,7 +954,7 @@ public class AccumulationFundAllocationUI extends ToftPanel {
|
|
|
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 T12.NC_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(jointSql(title, orgCode, period));
|
|
|
sql.append(" )GROUP BY orgname,clerkcode,clerkname ORDER BY orgname,clerkcode");
|
|
|
@@ -1095,8 +1097,8 @@ public class AccumulationFundAllocationUI extends ToftPanel {
|
|
|
Map<String, String> map = (Map<String, String>) iuap.executeQuery(sql.toString(), new MapProcessor());
|
|
|
if (map == null) {
|
|
|
map = new HashMap<String, String>();
|
|
|
- map.put("so_staff_sum", null);
|
|
|
- map.put("so_org_sum", null);
|
|
|
+ map.put("housing_fund_staff", null);
|
|
|
+ map.put("housing_fund_org", null);
|
|
|
}
|
|
|
return map;
|
|
|
}
|
|
|
@@ -1209,8 +1211,9 @@ public class AccumulationFundAllocationUI extends ToftPanel {
|
|
|
*/
|
|
|
private void insert() {
|
|
|
try {
|
|
|
+ String orgName = getOrgPanel().getRefModel().getRefNameValue();
|
|
|
// 0表示有实际新增，而不是点击弹框后关闭了
|
|
|
- if (new AccumulationFundAllInsertDiaLog().showModal() == 0) {
|
|
|
+ if (new AccumulationFundAllInsertDiaLog(orgCode, orgName, period).showModal() == 0) {
|
|
|
MessageDialog.showHintDlg(this, "提示", "新增成功！");
|
|
|
}
|
|
|
} catch (Exception e) {
|
