diff --git a/src/com/engine/salary/service/impl/SIImportServiceImpl.java b/src/com/engine/salary/service/impl/SIImportServiceImpl.java index af003bcb9..c80e83a81 100644 --- a/src/com/engine/salary/service/impl/SIImportServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIImportServiceImpl.java @@ -109,7 +109,6 @@ public class SIImportServiceImpl extends Service implements SIImportService { List columns = (List)dataMap.get("columns"); List rowCloumn = Lists.newArrayList(); List names = columns.stream().map(WeaTableColumn::getText).collect(Collectors.toList()); - names.add("社保缴纳组织"); headers.forEach(header -> { if (names.contains(header)){ columns.forEach(column -> { @@ -117,10 +116,6 @@ public class SIImportServiceImpl extends Service implements SIImportService { if (header.equals(column.getText())){ rowCloumn.add(column.getColumn()); } - if ("社保缴纳组织".equals(header) && "个税扣缴义务人".equals(column.getText())){ - rowCloumn.add(column.getColumn());//个税扣缴义务人等于社保缴纳组织 - } - }); }else { rowCloumn.add(null); @@ -151,7 +146,8 @@ public class SIImportServiceImpl extends Service implements SIImportService { result.add(SalaryI18nUtil.getI18nLabel( 86186, "手机号")); result.add(SalaryI18nUtil.getI18nLabel( 86187, "员工状态")); result.add(SalaryI18nUtil.getI18nLabel( 91323, "社保方案名称")); - result.add(SalaryI18nUtil.getI18nLabel( 91325, "社保缴纳组织")); + // result.add(SalaryI18nUtil.getI18nLabel( 91325, "社保缴纳组织")); + result.add(SalaryI18nUtil.getI18nLabel( 86184, "个税扣缴义务人")); //社保福利基数 Map socialMap = welfareNameIdMap( WelfareTypeEnum.SOCIAL_SECURITY); socialMap.forEach((k, v) -> result.add(k + SalaryI18nUtil.getI18nLabel( 100293, "申报基数"))); @@ -159,7 +155,7 @@ public class SIImportServiceImpl extends Service implements SIImportService { result.add(SalaryI18nUtil.getI18nLabel( 91319, "社保起始缴纳月")); result.add(SalaryI18nUtil.getI18nLabel( 91320, "社保最后缴纳月")); result.add(SalaryI18nUtil.getI18nLabel( 91485, "公积金方案名称")); - result.add(SalaryI18nUtil.getI18nLabel( 91488, "公积金缴纳组织")); + // result.add(SalaryI18nUtil.getI18nLabel( 91488, "公积金缴纳组织")); result.add(SalaryI18nUtil.getI18nLabel( 91486, "公积金账号")); //公积金福利基数 Map fundMap = welfareNameIdMap( WelfareTypeEnum.ACCUMULATION_FUND); @@ -168,7 +164,7 @@ public class SIImportServiceImpl extends Service implements SIImportService { result.add(SalaryI18nUtil.getI18nLabel( 91483, "公积金起始缴纳月")); result.add(SalaryI18nUtil.getI18nLabel( 91484, "公积金最后缴纳月")); result.add(SalaryI18nUtil.getI18nLabel( 91496, "其他福利方案名称")); - result.add(SalaryI18nUtil.getI18nLabel( 91497, "其他福利缴纳组织")); + // result.add(SalaryI18nUtil.getI18nLabel( 91497, "其他福利缴纳组织")); //其他福利基数 Map otherMap = welfareNameIdMap( WelfareTypeEnum.OTHER); otherMap.forEach((k, v) -> result.add(k + SalaryI18nUtil.getI18nLabel( 100293, "申报基数"))); diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java index 8f99c40b4..7ce0c5d94 100644 --- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java @@ -728,7 +728,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { InsuranceArchivesFundSchemePO insuranceArchivesFundSchemePO = null; InsuranceArchivesOtherSchemePO insuranceArchivesOtherSchemePO = null; Map socialMap = findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91323, "社保方案名称")); - Map paymentMap = findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91323, "社保缴纳组织")); + Map paymentMap = findElement(singleAccount, SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人")); Map fundMap = findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91485, "公积金方案名称")); Map otherMap = findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91496, "其他福利方案名称")); Map socialStartTimeMap = findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91319, "社保起始缴纳月")); @@ -747,10 +747,10 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { } //社保缴纳组织=个税扣缴义务人 - String paymentOrg = (String) paymentMap.get("社保缴纳组织"); + String paymentOrg = (String) paymentMap.get("个税扣缴义务人"); if (StringUtils.isBlank(paymentOrg)) { Map errorMessageMap = Maps.newHashMap(); - errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(100312, "社保缴纳组织不能为空")); + errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(100579, "个税扣缴义务人不允许为空")); excelComments.add(errorMessageMap); isError = true; }else if (!paymentNameIdMap.containsKey(paymentOrg)) { @@ -927,8 +927,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { insuranceArchivesSocialSchemePO.setWelfareType(WelfareTypeEnum.SOCIAL_SECURITY.getValue()); insuranceArchivesSocialSchemePO.setUpdateTime(new Date()); insuranceArchivesSocialSchemePO.setPaymentOrganization(paymentNameIdMap.get( - (String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91325, "社保缴纳组织")).get( - SalaryI18nUtil.getI18nLabel(91325, "社保缴纳组织")))); + (String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91325, "个税扣缴义务人")).get( + SalaryI18nUtil.getI18nLabel(91325, "个税扣缴义务人")))); insuranceArchivesSocialSchemePO.setNonPayment(NonPaymentEnum.YES.getValue()); insuranceArchivesSocialSchemePO.setCreator(creator); insuranceArchivesSocialSchemePO.setCreateTime(new Date()); @@ -992,8 +992,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { insuranceArchivesFundSchemePO.setFundEndTime(fundEndDate); insuranceArchivesFundSchemePO.setWelfareType(WelfareTypeEnum.ACCUMULATION_FUND.getValue()); insuranceArchivesFundSchemePO.setPaymentOrganization(paymentNameIdMap.get( - (String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91488, "公积金缴纳组织")).get( - SalaryI18nUtil.getI18nLabel(91488, "公积金缴纳组织")))); + (String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91488, "个税扣缴义务人")).get( + SalaryI18nUtil.getI18nLabel(91488, "个税扣缴义务人")))); insuranceArchivesFundSchemePO.setNonPayment(NonPaymentEnum.YES.getValue()); insuranceArchivesFundSchemePO.setDeleteType(DeleteTypeEnum.NOT_DELETED.getValue()); insuranceArchivesFundSchemePO.setUnderTake(UndertakerEnum.SCOPE_PERSON.getValue()); @@ -1048,8 +1048,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { } insuranceArchivesOtherSchemePO.setOtherEndTime(otherEndDate); insuranceArchivesOtherSchemePO.setPaymentOrganization(paymentNameIdMap.get( - (String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91497, "其他福利缴纳组织")).get( - SalaryI18nUtil.getI18nLabel(91497, "其他福利缴纳组织")))); + (String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91497, "个税扣缴义务人")).get( + SalaryI18nUtil.getI18nLabel(91497, "个税扣缴义务人")))); insuranceArchivesOtherSchemePO.setWelfareType(WelfareTypeEnum.OTHER.getValue()); insuranceArchivesOtherSchemePO.setNonPayment(NonPaymentEnum.YES.getValue()); insuranceArchivesOtherSchemePO.setDeleteType(DeleteTypeEnum.NOT_DELETED.getValue());