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

去除各种组织合并成个税扣缴义务人

This commit is contained in:
liuliang 2022-08-01 14:35:07 +08:00
parent 50f047fb6f
commit b516b06d8b
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,7 +109,6 @@ public class SIImportServiceImpl extends Service implements SIImportService {
List<WeaTableColumn> columns = (List<WeaTableColumn>)dataMap.get("columns");
List<String> rowCloumn = Lists.newArrayList();
List<String> 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<String, Long> 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<String, Long> 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<String, Long> otherMap = welfareNameIdMap( WelfareTypeEnum.OTHER);
otherMap.forEach((k, v) -> result.add(k + SalaryI18nUtil.getI18nLabel( 100293, "申报基数")));

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

@ -728,7 +728,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
InsuranceArchivesFundSchemePO insuranceArchivesFundSchemePO = null;
InsuranceArchivesOtherSchemePO insuranceArchivesOtherSchemePO = null;
Map<String, Object> socialMap = findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91323, "社保方案名称"));
Map<String, Object> paymentMap = findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91323, "社保缴纳组织"));
Map<String, Object> paymentMap = findElement(singleAccount, SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人"));
Map<String, Object> fundMap = findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91485, "公积金方案名称"));
Map<String, Object> otherMap = findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91496, "其他福利方案名称"));
Map<String, Object> 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<String, String> 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());