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

薪酬系统-福利档案结构改造，档案列表导出增加runstatus条件、并将导入和历史数据生成的福利档案基础信息的默认runStatus置为2

This commit is contained in:
sy 2022-10-10 17:11:44 +08:00
parent b24c08474c
commit a7b47a8bfe
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1238,7 +1238,7 @@ public class SIArchivesBiz {
po.setCreateTime(new Date());
po.setDeleteType(0);
po.setCreator(creator);
po.setRunStatus(EmployeeStatusEnum.STAY_ADD.getValue());
po.setRunStatus(EmployeeStatusEnum.PAYING.getValue());
po.setUpdateTime(new Date());
po.setTenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY);

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

@ -1077,7 +1077,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
insuranceArchivesBaseInfoPO.setCreateTime(new Date());
insuranceArchivesBaseInfoPO.setDeleteType(0);
insuranceArchivesBaseInfoPO.setCreator(creator);
insuranceArchivesBaseInfoPO.setRunStatus(EmployeeStatusEnum.STAY_ADD.getValue());
insuranceArchivesBaseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue());
insuranceArchivesBaseInfoPO.setUpdateTime(new Date());
insuranceArchivesBaseInfoPO.setTenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY);
insuranceArchivesBaseInfoPO.setPaymentOrganization(paymentNameIdMap.get((String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91497, "个税扣缴义务人")).get(SalaryI18nUtil.getI18nLabel(91497, "个税扣缴义务人"))));

5
src/com/engine/salary/web/SISchemeController.java
View File

@ -174,6 +174,11 @@ public class SISchemeController {
if(StringUtils.isNotBlank(ids)){
param.setEmployeeIds( Arrays.stream(ids.split(",")).map(Long::valueOf).collect(Collectors.toList()));
}
String runStatuses = request.getParameter("runStatuses");
if(StringUtils.isNotBlank(runStatuses)){
param.setRunStatuses( Arrays.stream(runStatuses.split(",")).map(String::valueOf).collect(Collectors.toList()));
}
User user = HrmUserVarify.getUser(request, response);
XSSFWorkbook workbook = getService(user).export(param);
String fileName = null;