From a7b47a8bfe96f4e3bbd9c39dd7f9e32fbeb0576f Mon Sep 17 00:00:00 2001 From: sy Date: Mon, 10 Oct 2022 17:11:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-=E7=A6=8F?= =?UTF-8?q?=E5=88=A9=E6=A1=A3=E6=A1=88=E7=BB=93=E6=9E=84=E6=94=B9=E9=80=A0?= =?UTF-8?q?=EF=BC=8C=E6=A1=A3=E6=A1=88=E5=88=97=E8=A1=A8=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0runstatus=E6=9D=A1=E4=BB=B6=E3=80=81=E5=B9=B6?= =?UTF-8?q?=E5=B0=86=E5=AF=BC=E5=85=A5=E5=92=8C=E5=8E=86=E5=8F=B2=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=94=9F=E6=88=90=E7=9A=84=E7=A6=8F=E5=88=A9=E6=A1=A3?= =?UTF-8?q?=E6=A1=88=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E7=9A=84=E9=BB=98?= =?UTF-8?q?=E8=AE=A4runStatus=E7=BD=AE=E4=B8=BA2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/biz/SIArchivesBiz.java | 2 +- src/com/engine/salary/service/impl/SISchemeServiceImpl.java | 2 +- src/com/engine/salary/web/SISchemeController.java | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java index c16674e64..c1465195a 100644 --- a/src/com/engine/salary/biz/SIArchivesBiz.java +++ b/src/com/engine/salary/biz/SIArchivesBiz.java @@ -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); diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java index c7362d2fa..24beb1030 100644 --- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java @@ -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, "个税扣缴义务人")))); diff --git a/src/com/engine/salary/web/SISchemeController.java b/src/com/engine/salary/web/SISchemeController.java index edbbd0e01..f30501eac 100644 --- a/src/com/engine/salary/web/SISchemeController.java +++ b/src/com/engine/salary/web/SISchemeController.java @@ -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;