qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

薪酬系统-福利方案、档案、台账，艾志二开-其他福利相关表述更换为劳务固定费

This commit is contained in:
sy 2023-10-10 13:46:06 +08:00
parent b63e4250be
commit 79d28f751c
14 changed files with 118 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resource/sqlupgrade/SQLServer/sql202310100103AZNJHBGJJSGFYXGSJCL.sql Normal file
View File

@ -0,0 +1,4 @@
INSERT INTO hrsa_insurance_category (id, insurance_name, welfare_type, is_use, payment_scope, data_type, create_time, update_time, creator, delete_type, tenant_key) VALUES (9009, 'ÀÍÎñ¹Ì¶¨', 3, 1, '1,2', 1, '2022-02-22 10:46:02.000', '2022-02-22 10:46:02.000', 0, 0, 'all_teams')
GO
UPDATE hrsa_insurance_category SET is_use = 0 WHERE id = 9007
GO

10
src/com/engine/salary/biz/SIArchivesBiz.java
View File

@ -1304,10 +1304,14 @@ public class SIArchivesBiz {
list.add(new WeaTableColumn("150px", "补充公积金账号", "supplementFundAccount"));
list.add(new WeaTableColumn("150px", "公积金起始缴纳月", "fundStartTime"));
list.add(new WeaTableColumn("150px", "公积金最后缴纳月", "fundEndTime"));
list.add(new WeaTableColumn("150px", "其他福利方案名称", "otherName"));
//艾志二开"企业年金及其他福利"改为"劳务固定费"
// list.add(new WeaTableColumn("150px", "其他福利方案名称", "otherName"));
list.add(new WeaTableColumn("150px", "劳务固定费方案名称", "otherName"));
titleMap.get(WelfareTypeEnum.OTHER.getValue()).forEach((k, v) -> list.add(new WeaTableColumn("150px", v, k)));
list.add(new WeaTableColumn("150px", "其他福利起始缴纳月", "otherStartTime"));
list.add(new WeaTableColumn("150px", "其他福利最后缴纳月", "otherEndTime"));
// list.add(new WeaTableColumn("150px", "其他福利起始缴纳月", "otherStartTime"));
// list.add(new WeaTableColumn("150px", "其他福利最后缴纳月", "otherEndTime"));
list.add(new WeaTableColumn("150px", "劳务固定费起始缴纳月", "otherStartTime"));
list.add(new WeaTableColumn("150px", "劳务固定费最后缴纳月", "otherEndTime"));
return list;
}

4
src/com/engine/salary/cmd/sicategory/SICategoryGetFormCmd.java
View File

@ -55,7 +55,9 @@ public class SICategoryGetFormCmd extends AbstractCommonCommand<Map<String, Obje
List<SearchConditionOption> radioOptions = new ArrayList <>();
radioOptions.add(new SearchConditionOption("SOCIAL_SECURITY","社保",true));
radioOptions.add(new SearchConditionOption("ACCUMULATION_FUND","公积金"));
radioOptions.add(new SearchConditionOption("OTHER","企业年金及其他福利"));
//艾志二开"企业年金及其他福利"改为"劳务固定费"
// radioOptions.add(new SearchConditionOption("OTHER","企业年金及其他福利"));
radioOptions.add(new SearchConditionOption("OTHER","劳务固定费"));
radio.setColSpan(2);
radio.setFieldcol(12);
radio.setLabelcol(6);

15
src/com/engine/salary/entity/siaccount/bo/InsuranceComparisonResultBO.java
View File

@ -77,7 +77,9 @@ public class InsuranceComparisonResultBO {
columns.add(new Column(po.getInsuranceName() + "申报基数", po.getId() + "fundBase", po.getId() + "fundBase"));
}
columns.add(new Column("补充公积金账号", "supplementFundAccount", "supplementFundAccount"));
columns.add(new Column("其他福利方案名称", "otherSchemeName", "otherSchemeName"));
//艾志二开"企业年金及其他福利"改为"劳务固定费"
// columns.add(new Column("其他福利方案名称", "otherSchemeName", "otherSchemeName"));
columns.add(new Column("劳务固定费方案名称", "otherSchemeName", "otherSchemeName"));
//组装其他福利基数
for (ICategoryPO po : otherWelfareList) {
columns.add(new Column(po.getInsuranceName() + "申报基数", po.getId() + "otherBase", po.getId() + "otherBase"));
@ -97,7 +99,9 @@ public class InsuranceComparisonResultBO {
for (ICategoryPO po : otherWelPerList) {
columns.add(new Column(po.getInsuranceName() + "个人", po.getId() + "otherPer", po.getId() + "otherPer"));
}
columns.add(new Column("其他福利个人合计", "otherPerSum", "otherPerSum"));
//艾志二开"企业年金及其他福利"改为"劳务固定费"
// columns.add(new Column("其他福利个人合计", "otherPerSum", "otherPerSum"));
columns.add(new Column("劳务固定费个人合计", "otherPerSum", "otherPerSum"));
columns.add(new Column("个人合计", "perSum", "perSum"));
//社保单位（生育保险单位、工伤保险单位、失业保险单位、养老保险单位、医疗保险单位）
for (ICategoryPO po : socialWelComList) {
@ -113,12 +117,15 @@ public class InsuranceComparisonResultBO {
for (ICategoryPO po : otherWelComList) {
columns.add(new Column(po.getInsuranceName() + "单位", po.getId() + "otherCom", po.getId() + "otherCom"));
}
columns.add(new Column("其他福利单位合计", "otherComSum", "otherComSum"));
//艾志二开"企业年金及其他福利"改为"劳务固定费"
// columns.add(new Column("其他福利单位合计", "otherComSum", "otherComSum"));
columns.add(new Column("劳务固定费单位合计", "otherComSum", "otherComSum"));
columns.add(new Column("单位合计", "comSum", "comSum"));
columns.add(new Column("社保合计", "socialSum", "socialSum"));
columns.add(new Column("公积金合计", "fundSum", "fundSum"));
columns.add(new Column("其他福利合计", "otherSum", "otherSum"));
// columns.add(new Column("其他福利合计", "otherSum", "otherSum"));
columns.add(new Column("劳务固定费合计", "otherSum", "otherSum"));
columns.add(new Column("合计", "total", "total"));
return columns;
}

9
src/com/engine/salary/entity/siaccount/dto/InsuranceAccountBatchListDTO.java
View File

@ -66,8 +66,10 @@ public class InsuranceAccountBatchListDTO {
/**
* 其他福利核算人数
* //艾志二开"企业年金及其他福利"改为"劳务固定费"
*/
@TableTitle(title = "其他福利核算人数", dataIndex = "otherNum", key = "otherNum")
// @TableTitle(title = "其他福利核算人数", dataIndex = "otherNum", key = "otherNum")
@TableTitle(title = "劳务固定费核算人数", dataIndex = "otherNum", key = "otherNum")
private Integer otherNum;
/**
@ -84,8 +86,11 @@ public class InsuranceAccountBatchListDTO {
/**
* 其他福利缴费总额(单位+个人)
* //艾志二开"企业年金及其他福利"改为"劳务固定费"
*/
@TableTitle(title = "其他福利缴费总额(单位+个人)", dataIndex = "otherPay", key = "otherPay")
// @TableTitle(title = "其他福利缴费总额(单位+个人)", dataIndex = "otherPay", key = "otherPay")
@TableTitle(title = "劳务固定费缴费总额(单位+个人)", dataIndex = "otherPay", key = "otherPay")
private String otherPay;
/**

8
src/com/engine/salary/entity/siaccount/dto/InsuranceAccountViewListDTO.java
View File

@ -35,7 +35,9 @@ public class InsuranceAccountViewListDTO {
@TableTitle(title = "公积金人数", dataIndex = "fundNum", key = "fundNum")
private Integer fundNum;
@TableTitle(title = "其他福利人数", dataIndex = "otherNum", key = "otherNum")
//艾志二开"企业年金及其他福利"改为"劳务固定费"
// @TableTitle(title = "其他福利人数", dataIndex = "otherNum", key = "otherNum")
@TableTitle(title = "劳务固定费人数", dataIndex = "otherNum", key = "otherNum")
private Integer otherNum;
@TableTitle(title = "社保缴费合计", dataIndex = "socialPaySum", key = "socialPaySum")
@ -44,7 +46,9 @@ public class InsuranceAccountViewListDTO {
@TableTitle(title = "公积金缴费合计", dataIndex = "fundPaySum", key = "fundPaySum")
private String fundPaySum;
@TableTitle(title = "其他福利缴费合计", dataIndex = "otherPaySum", key = "otherPaySum")
//艾志二开"企业年金及其他福利"改为"劳务固定费"
// @TableTitle(title = "其他福利缴费合计", dataIndex = "otherPaySum", key = "otherPaySum")
@TableTitle(title = "劳务固定费缴费合计", dataIndex = "otherPaySum", key = "otherPaySum")
private String otherPaySum;
@TableTitle(title = "合计", dataIndex = "sum", key = "sum")

4
src/com/engine/salary/enums/siaccount/ProjectTypeEnum.java
View File

@ -7,7 +7,9 @@ public enum ProjectTypeEnum implements BaseEnum<Integer> {
ALL(0, "全部", 85155),
SOCIAL(1, "社保", 86568),
FUND(2, "公积金", 86569),
OTHER(3, "企业年金及其他福利", 93112),
//艾志二开"企业年金及其他福利"改为"劳务固定费"
// OTHER(3, "企业年金及其他福利", 93112),
OTHER(3, "劳务固定费", 0),
ENDOWMENT_INSURANCE(4, "养老保险", 93113),
MEDICAL_INSURANCE(5, "医疗保险", 93114);

4
src/com/engine/salary/enums/sicategory/WelfareTypeEnum.java
View File

@ -8,7 +8,9 @@ import java.util.Arrays;
public enum WelfareTypeEnum implements BaseEnum<Integer> {
SOCIAL_SECURITY(1, "社保", 86568),
ACCUMULATION_FUND(2, "公积金", 86569),
OTHER(3, "企业年金及其它福利", 86570);
//艾志二开"企业年金及其他福利"改为"劳务固定费"
// OTHER(3, "企业年金及其它福利", 86570);
OTHER(3, "劳务固定费", 0);
private Integer value;

15
src/com/engine/salary/service/impl/ColumnBuildServiceImpl.java
View File

@ -81,8 +81,10 @@ public class ColumnBuildServiceImpl extends Service implements ColumnBuildServic
list.add(new WeaTableColumn("150px",k, v));
});
if (!paymentStatus.equals(PaymentStatusEnum.BALANCE.getValue())) {
//艾志二开"企业年金及其他福利"改为"劳务固定费"
list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel( 91487, "补充公积金账号"), "supplementFundAccount"));
list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel(91496, "其他福利方案名称"), "otherSchemeName"));
// list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel(91496, "其他福利方案名称"), "otherSchemeName"));
list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel(0, "劳务固定费方案名称"), "otherSchemeName"));
}
columns.get(WelfareTypeEnum.OTHER.getValue()).forEach((k, v) -> {
@ -99,7 +101,9 @@ public class ColumnBuildServiceImpl extends Service implements ColumnBuildServic
personColumns.get(WelfareTypeEnum.OTHER.getValue()).forEach((k, v) -> {
list.add(new WeaTableColumn("150px",k, v));
});
list.add(new WeaTableColumn("150px","<span style=\"color:blue\">" + SalaryI18nUtil.getI18nLabel( 100392, "其他福利个人合计") + "</span>", "otherPerSum"));
//艾志二开"企业年金及其他福利"改为"劳务固定费"
// list.add(new WeaTableColumn("150px","<span style=\"color:blue\">" + SalaryI18nUtil.getI18nLabel( 100392, "其他福利个人合计") + "</span>", "otherPerSum"));
list.add(new WeaTableColumn("150px","<span style=\"color:blue\">" + SalaryI18nUtil.getI18nLabel( 100392, "劳务固定费个人合计") + "</span>", "otherPerSum"));
list.add(new WeaTableColumn("150px","<span style=\"color:blue\">" + SalaryI18nUtil.getI18nLabel( 100393, "个人合计") + "</span>", "perSum"));
comColumns.get(WelfareTypeEnum.SOCIAL_SECURITY.getValue()).forEach((k, v) -> {
list.add(new WeaTableColumn("150px",k, v));
@ -112,11 +116,14 @@ public class ColumnBuildServiceImpl extends Service implements ColumnBuildServic
comColumns.get(WelfareTypeEnum.OTHER.getValue()).forEach((k, v) -> {
list.add(new WeaTableColumn("150px",k, v));
});
list.add(new WeaTableColumn("150px","<span style=\"color:blue\">" + SalaryI18nUtil.getI18nLabel( 100396, "其他福利单位合计") + "</span>", "otherComSum"));
//艾志二开"企业年金及其他福利"改为"劳务固定费"
// list.add(new WeaTableColumn("150px","<span style=\"color:blue\">" + SalaryI18nUtil.getI18nLabel( 100396, "其他福利单位合计") + "</span>", "otherComSum"));
list.add(new WeaTableColumn("150px","<span style=\"color:blue\">" + SalaryI18nUtil.getI18nLabel( 100396, "劳务固定费单位合计") + "</span>", "otherComSum"));
list.add(new WeaTableColumn("150px","<span style=\"color:blue\">" + SalaryI18nUtil.getI18nLabel( 100397, "单位合计") + "</span>", "comSum"));
list.add(new WeaTableColumn("150px","<span style=\"color:blue\">" + SalaryI18nUtil.getI18nLabel( 100398, "社保合计") + "</span>", "socialSum"));
list.add(new WeaTableColumn("150px","<span style=\"color:blue\">" + SalaryI18nUtil.getI18nLabel( 100399, "公积金合计") + "</span>", "fundSum"));
list.add(new WeaTableColumn("150px","<span style=\"color:blue\">" + SalaryI18nUtil.getI18nLabel( 100400, "其他福利合计") + "</span>", "otherSum"));
// list.add(new WeaTableColumn("150px","<span style=\"color:blue\">" + SalaryI18nUtil.getI18nLabel( 100400, "其他福利合计") + "</span>", "otherSum"));
list.add(new WeaTableColumn("150px","<span style=\"color:blue\">" + SalaryI18nUtil.getI18nLabel( 100400, "劳务固定费合计") + "</span>", "otherSum"));
list.add(new WeaTableColumn("150px","<span style=\"color:blue\">" + SalaryI18nUtil.getI18nLabel( 93278, "合计") + "</span>", "total"));
return list;
}

47
src/com/engine/salary/service/impl/SIAccountServiceImpl.java
View File

@ -1152,20 +1152,28 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
result.put(SalaryI18nUtil.getI18nLabel(100393, "个人合计"), "perSum");
result.put(SalaryI18nUtil.getI18nLabel(100388, "社保个人合计"), "socialPerSum");
result.put(SalaryI18nUtil.getI18nLabel(100390, "公积金个人合计"), "fundPerSum");
result.put(SalaryI18nUtil.getI18nLabel(100392, "其他福利个人合计"), "otherPerSum");
//艾志二开"企业年金及其他福利"改为"劳务固定费"
// result.put(SalaryI18nUtil.getI18nLabel(100392, "其他福利个人合计"), "otherPerSum");
result.put(SalaryI18nUtil.getI18nLabel(0, "劳务固定费个人合计"), "otherPerSum");
commonResult.put(SalaryI18nUtil.getI18nLabel(0, "个人正常缴纳合计"), "perCommonSum");
commonResult.put(SalaryI18nUtil.getI18nLabel(0, "社保个人正常缴纳合计"), "socialPerCommonSum");
commonResult.put(SalaryI18nUtil.getI18nLabel(0, "公积金个人正常缴纳合计"), "fundPerCommonSum");
commonResult.put(SalaryI18nUtil.getI18nLabel(0, "其他福利个人正常缴纳合计"), "otherPerCommonSum");
//艾志二开"企业年金及其他福利"改为"劳务固定费"
// commonResult.put(SalaryI18nUtil.getI18nLabel(0, "其他福利个人正常缴纳合计"), "otherPerCommonSum");
commonResult.put(SalaryI18nUtil.getI18nLabel(0, "劳务固定费个人正常缴纳合计"), "otherPerCommonSum");
repairResult.put(SalaryI18nUtil.getI18nLabel(0, "个人补缴合计"), "perRepairSum");
repairResult.put(SalaryI18nUtil.getI18nLabel(0, "社保个人补缴合计"), "socialPerRepairSum");
repairResult.put(SalaryI18nUtil.getI18nLabel(0, "公积金个人补缴合计"), "fundPerRepairSum");
repairResult.put(SalaryI18nUtil.getI18nLabel(0, "其他福利个人补缴合计"), "otherPerRepairSum");
//艾志二开"企业年金及其他福利"改为"劳务固定费"
// repairResult.put(SalaryI18nUtil.getI18nLabel(0, "其他福利个人补缴合计"), "otherPerRepairSum");
repairResult.put(SalaryI18nUtil.getI18nLabel(0, "劳务固定费个人补缴合计"), "otherPerRepairSum");
balanceResult.put(SalaryI18nUtil.getI18nLabel(0, "个人补差合计"), "perBalanceSum");
balanceResult.put(SalaryI18nUtil.getI18nLabel(0, "社保个人补差合计"), "socialPerBalanceSum");
balanceResult.put(SalaryI18nUtil.getI18nLabel(0, "公积金个人补差合计"), "fundPerBalanceSum");
balanceResult.put(SalaryI18nUtil.getI18nLabel(0, "其他福利个人补差合计"), "otherPerBalanceSum");
//艾志二开"企业年金及其他福利"改为"劳务固定费"
// balanceResult.put(SalaryI18nUtil.getI18nLabel(0, "其他福利个人补差合计"), "otherPerBalanceSum");
balanceResult.put(SalaryI18nUtil.getI18nLabel(0, "劳务固定费个人补差合计"), "otherPerBalanceSum");
Map<String, String> categoryIdNameMap = getSICategoryService(user).categoryIdNameMap();
list.stream().forEach(item -> {
@ -1201,20 +1209,28 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
result.put(SalaryI18nUtil.getI18nLabel(100397, "单位合计"), "comSum");
result.put(SalaryI18nUtil.getI18nLabel(100394, "社保单位合计"), "socialComSum");
result.put(SalaryI18nUtil.getI18nLabel(100395, "公积金单位合计"), "fundComSum");
result.put(SalaryI18nUtil.getI18nLabel(100396, "其他福利单位合计"), "otherComSum");
//艾志二开"企业年金及其他福利"改为"劳务固定费"
// result.put(SalaryI18nUtil.getI18nLabel(100396, "其他福利单位合计"), "otherComSum");
result.put(SalaryI18nUtil.getI18nLabel(0, "劳务固定费单位合计"), "otherComSum");
commonResult.put(SalaryI18nUtil.getI18nLabel(0, "单位正常缴纳合计"), "comCommonSum");
commonResult.put(SalaryI18nUtil.getI18nLabel(0, "社保单位正常缴纳合计"), "socialComCommonSum");
commonResult.put(SalaryI18nUtil.getI18nLabel(0, "公积金单位正常缴纳合计"), "fundComCommonSum");
commonResult.put(SalaryI18nUtil.getI18nLabel(0, "其他福利单位正常缴纳合计"), "otherComCommonSum");
//艾志二开"企业年金及其他福利"改为"劳务固定费"
// commonResult.put(SalaryI18nUtil.getI18nLabel(0, "其他福利单位正常缴纳合计"), "otherComCommonSum");
commonResult.put(SalaryI18nUtil.getI18nLabel(0, "劳务固定费单位正常缴纳合计"), "otherComCommonSum");
repairResult.put(SalaryI18nUtil.getI18nLabel(0, "单位补缴合计"), "comRepairSum");
repairResult.put(SalaryI18nUtil.getI18nLabel(0, "社保单位补缴合计"), "socialComRepairSum");
repairResult.put(SalaryI18nUtil.getI18nLabel(0, "公积金单位补缴合计"), "fundComRepairSum");
repairResult.put(SalaryI18nUtil.getI18nLabel(0, "其他福利单位补缴合计"), "otherComRepairSum");
//艾志二开"企业年金及其他福利"改为"劳务固定费"
// repairResult.put(SalaryI18nUtil.getI18nLabel(0, "其他福利单位补缴合计"), "otherComRepairSum");
repairResult.put(SalaryI18nUtil.getI18nLabel(0, "劳务固定费单位补缴合计"), "otherComRepairSum");
balanceResult.put(SalaryI18nUtil.getI18nLabel(0, "单位补差合计"), "comBalanceSum");
balanceResult.put(SalaryI18nUtil.getI18nLabel(0, "社保单位补差合计"), "socialComBalanceSum");
balanceResult.put(SalaryI18nUtil.getI18nLabel(0, "公积金单位补差合计"), "fundComBalanceSum");
balanceResult.put(SalaryI18nUtil.getI18nLabel(0, "其他福利单位补差合计"), "otherComBalanceSum");
//艾志二开"企业年金及其他福利"改为"劳务固定费"
// balanceResult.put(SalaryI18nUtil.getI18nLabel(0, "其他福利单位补差合计"), "otherComBalanceSum");
balanceResult.put(SalaryI18nUtil.getI18nLabel(0, "劳务固定费单位补差合计"), "otherComBalanceSum");
list.stream().forEach(item -> {
if (Objects.equals(WelfareTypeEnum.SOCIAL_SECURITY.getValue(), item.getWelfareType())) {
@ -2270,7 +2286,9 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
headerList.add(po.getInsuranceName() + "申报基数");
}
headerList.add(SalaryI18nUtil.getI18nLabel(91487, "补充公积金账号"));
headerList.add(SalaryI18nUtil.getI18nLabel(91496, "其他福利方案名称"));
//艾志二开"企业年金及其他福利"改为"劳务固定费"
// headerList.add(SalaryI18nUtil.getI18nLabel(91496, "其他福利方案名称"));
headerList.add(SalaryI18nUtil.getI18nLabel(0, "劳务固定费方案名称"));
//组装其他福利基数
for (ICategoryPO po : otherWelfareList) {
headerList.add(po.getInsuranceName() + "申报基数");
@ -2289,7 +2307,9 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
for (ICategoryPO po : otherWelPerList) {
headerList.add(po.getInsuranceName() + "个人");
}
headerList.add(SalaryI18nUtil.getI18nLabel(100392, "其他福利个人合计"));
//艾志二开"企业年金及其他福利"改为"劳务固定费"
// headerList.add(SalaryI18nUtil.getI18nLabel(100392, "其他福利个人合计"));
headerList.add(SalaryI18nUtil.getI18nLabel(0, "劳务固定费个人合计"));
headerList.add(SalaryI18nUtil.getI18nLabel(100393, "个人合计"));
//社保单位（生育保险单位、工伤保险单位、失业保险单位、养老保险单位、医疗保险单位）
for (ICategoryPO po : socialWelComList) {
@ -2305,11 +2325,14 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
for (ICategoryPO po : otherWelComList) {
headerList.add(po.getInsuranceName() + "单位");
}
headerList.add(SalaryI18nUtil.getI18nLabel(100396, "其他福利单位合计"));
//艾志二开"企业年金及其他福利"改为"劳务固定费"
// headerList.add(SalaryI18nUtil.getI18nLabel(100396, "其他福利单位合计"));
headerList.add(SalaryI18nUtil.getI18nLabel(0, "劳务固定费单位合计"));
headerList.add(SalaryI18nUtil.getI18nLabel(100397, "单位合计"));
headerList.add(SalaryI18nUtil.getI18nLabel(100398, "社保合计"));
headerList.add(SalaryI18nUtil.getI18nLabel(100399, "公积金合计"));
headerList.add(SalaryI18nUtil.getI18nLabel(100400, "其他福利合计"));
// headerList.add(SalaryI18nUtil.getI18nLabel(100400, "其他福利合计"));
headerList.add(SalaryI18nUtil.getI18nLabel(0, "劳务固定费合计"));
headerList.add(SalaryI18nUtil.getI18nLabel(93278, "合计"));
List<List<Object>> rows = new ArrayList<>();

15
src/com/engine/salary/service/impl/SIExportServiceImpl.java
View File

@ -567,7 +567,9 @@ public class SIExportServiceImpl extends Service implements SIExportService {
});
if (!paymentStatus.equals(PaymentStatusEnum.BALANCE.getValue())) {
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(91487, "补充公积金账号"), "supplementFundAccount"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(91496, "其他福利方案名称"), "otherSchemeName"));
//艾志二开"企业年金及其他福利"改为"劳务固定费"
// list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(91496, "其他福利方案名称"), "otherSchemeName"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(0, "劳务固定费方案名称"), "otherSchemeName"));
}
columns.get(WelfareTypeEnum.OTHER.getValue()).forEach((k, v) -> {
@ -584,7 +586,9 @@ public class SIExportServiceImpl extends Service implements SIExportService {
personColumns.get(WelfareTypeEnum.OTHER.getValue()).forEach((k, v) -> {
list.add(new WeaTableColumn("150px", k, v));
});
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(100392, "其他福利个人合计"), "otherPerSum"));
//艾志二开"企业年金及其他福利"改为"劳务固定费"
// list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(100392, "其他福利个人合计"), "otherPerSum"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(0, "劳务固定费个人合计"), "otherPerSum"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(100393, "个人合计"), "perSum"));
comColumns.get(WelfareTypeEnum.SOCIAL_SECURITY.getValue()).forEach((k, v) -> {
list.add(new WeaTableColumn("150px", k, v));
@ -597,11 +601,14 @@ public class SIExportServiceImpl extends Service implements SIExportService {
comColumns.get(WelfareTypeEnum.OTHER.getValue()).forEach((k, v) -> {
list.add(new WeaTableColumn("150px", k, v));
});
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(100396, "其他福利单位合计"), "otherComSum"));
//艾志二开"企业年金及其他福利"改为"劳务固定费"
// list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(100396, "其他福利单位合计"), "otherComSum"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(0, "劳务固定费单位合计"), "otherComSum"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(100397, "单位合计"), "comSum"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(100398, "社保合计"), "socialSum"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(100399, "公积金合计"), "fundSum"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(100400, "其他福利合计"), "otherSum"));
// list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(100400, "其他福利合计"), "otherSum"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(0, "劳务固定费合计"), "otherSum"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(93278, "合计"), "total"));
return list;
}

11
src/com/engine/salary/service/impl/SIImportServiceImpl.java
View File

@ -276,13 +276,16 @@ public class SIImportServiceImpl extends Service implements SIImportService {
result.add(SalaryI18nUtil.getI18nLabel( 91487, "补充公积金账号"));
result.add(SalaryI18nUtil.getI18nLabel( 91483, "公积金起始缴纳月"));
result.add(SalaryI18nUtil.getI18nLabel( 91484, "公积金最后缴纳月"));
result.add(SalaryI18nUtil.getI18nLabel( 91496, "其他福利方案名称"));
// result.add(SalaryI18nUtil.getI18nLabel( 91497, "其他福利缴纳组织"));
//艾志二开"企业年金及其他福利"改为"劳务固定费"
// result.add(SalaryI18nUtil.getI18nLabel( 91496, "其他福利方案名称"));
result.add(SalaryI18nUtil.getI18nLabel( 0, "劳务固定费方案名称"));
//其他福利基数
Map<String, Long> otherMap = welfareNameIdMap( WelfareTypeEnum.OTHER);
otherMap.forEach((k, v) -> result.add(k + SalaryI18nUtil.getI18nLabel( 100293, "申报基数")));
result.add(SalaryI18nUtil.getI18nLabel( 91490, "其他福利起始缴纳月"));
result.add(SalaryI18nUtil.getI18nLabel( 91494, "其他福利最后缴纳月"));
// result.add(SalaryI18nUtil.getI18nLabel( 91490, "其他福利起始缴纳月"));
// result.add(SalaryI18nUtil.getI18nLabel( 91494, "其他福利最后缴纳月"));
result.add(SalaryI18nUtil.getI18nLabel( 0, "劳务固定费起始缴纳月"));
result.add(SalaryI18nUtil.getI18nLabel( 0, "劳务固定费最后缴纳月"));
return result;
}

10
src/com/engine/salary/service/impl/SISchemeServiceImpl.java
View File

@ -528,10 +528,14 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(91487, "补充公积金账号"), "supplementFundAccount"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(91483, "公积金起始缴纳月"), "fundStartTime"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(91484, "公积金最后缴纳月"), "fundEndTime"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(91496, "其他福利方案名称"), "otherName"));
//艾志二开"企业年金及其他福利"改为"劳务固定费"
// list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(91496, "其他福利方案名称"), "otherName"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(0, "劳务固定费方案名称"), "otherName"));
titleMap.get(WelfareTypeEnum.OTHER.getValue()).forEach((k, v) -> list.add(new WeaTableColumn("150px", v, k)));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(91490, "其他福利起始缴纳月"), "otherStartTime"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(91494, "其他福利最后缴纳月"), "otherEndTime"));
// list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(91490, "其他福利起始缴纳月"), "otherStartTime"));
// list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(91494, "其他福利最后缴纳月"), "otherEndTime"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(0, "劳务固定费起始缴纳月"), "otherStartTime"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(0, "劳务固定费最后缴纳月"), "otherEndTime"));
return list;
}

4
src/com/engine/salary/wrapper/SalaryFormulaWrapper.java
View File

@ -123,7 +123,9 @@ public class SalaryFormulaWrapper extends Service {
welfareList.add(new InsuranceAcctDetailImportFieldDTO("socialSum","社保合计"));
welfareList.add(new InsuranceAcctDetailImportFieldDTO("fundSum","公积金合计"));
welfareList.add(new InsuranceAcctDetailImportFieldDTO("otherSum","其他福利合计"));
//艾志二开"企业年金及其他福利"改为"劳务固定费"
// welfareList.add(new InsuranceAcctDetailImportFieldDTO("otherSum","其他福利合计"));
welfareList.add(new InsuranceAcctDetailImportFieldDTO("otherSum","劳务固定费合计"));
welfareList.add(new InsuranceAcctDetailImportFieldDTO("total","合计"));
return welfareList;