From ba852316563a5497eae72ac77eaff11540a67269 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Thu, 29 Jun 2023 16:38:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=AA=E7=A8=8E=E7=94=B3=E6=8A=A5?= =?UTF-8?q?=E6=92=A4=E5=9B=9E=E5=BC=80=E5=85=B3-1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/sys/constant/SalarySysConstant.java | 5 +++++ .../engine/salary/sys/service/SalarySysConfService.java | 6 ++++++ .../sys/service/impl/SalarySysConfServiceImpl.java | 9 +++++++++ .../engine/salary/web/SalarySystemConfigController.java | 8 ++++++++ .../engine/salary/wrapper/SalarySystemConfigWrapper.java | 4 ++++ 5 files changed, 32 insertions(+) diff --git a/src/com/engine/salary/sys/constant/SalarySysConstant.java b/src/com/engine/salary/sys/constant/SalarySysConstant.java index 082a9568f..0583098b8 100644 --- a/src/com/engine/salary/sys/constant/SalarySysConstant.java +++ b/src/com/engine/salary/sys/constant/SalarySysConstant.java @@ -61,4 +61,9 @@ public class SalarySysConstant { */ public static final String EDIT_IMPORT_AUTO_LOCK = "EditImportAutoLock"; + /** + * 个税申报撤回 + */ + public static final String WITHDRAW_TAX_DECLARATION ="WITHDRAW_TAX_DECLARATION"; + } diff --git a/src/com/engine/salary/sys/service/SalarySysConfService.java b/src/com/engine/salary/sys/service/SalarySysConfService.java index ab1ae6a9e..99d767823 100644 --- a/src/com/engine/salary/sys/service/SalarySysConfService.java +++ b/src/com/engine/salary/sys/service/SalarySysConfService.java @@ -90,4 +90,10 @@ public interface SalarySysConfService { * @date 2022/11/9 21:07 */ Date getTaxDeclarationRebootDate(); + + /** + * 个税申报撤回开关 + * @param param + */ + void saveWithDrawTaxDeclaration(SalarySysConfPO param); } diff --git a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java index f7270d37e..5b603f81a 100644 --- a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java +++ b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java @@ -406,6 +406,15 @@ public class SalarySysConfServiceImpl extends Service implements SalarySysConfSe return date; } + @Override + public void saveWithDrawTaxDeclaration(SalarySysConfPO param) { + if (StringUtils.isBlank(param.getConfValue())) { + throw new SalaryRunTimeException("无效规则！"); + } + + saveSettingByType(param.getConfValue(), WITHDRAW_TAX_DECLARATION, "个税申报撤回", "basic"); + } + /** * 保存或者修改应用设置 * diff --git a/src/com/engine/salary/web/SalarySystemConfigController.java b/src/com/engine/salary/web/SalarySystemConfigController.java index 5c03047de..483cbdfab 100644 --- a/src/com/engine/salary/web/SalarySystemConfigController.java +++ b/src/com/engine/salary/web/SalarySystemConfigController.java @@ -180,6 +180,14 @@ public class SalarySystemConfigController { return new ResponseResult(user).run(getSalarySystemConfigWrapper(user)::saveMatchEmployeeModeRule, param); } + @POST + @Path("/saveWithDrawTaxDeclaration") + @Produces(MediaType.APPLICATION_JSON) + public String saveWithDrawTaxDeclaration(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalarySysConfPO param) { + User user = HrmUserVarify.getUser(request, response); + return new ResponseResult(user).run(getSalarySystemConfigWrapper(user)::saveWithDrawTaxDeclaration, param); + } + /** * 应用设置 diff --git a/src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java b/src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java index 0dd40eee4..190a4d4f0 100644 --- a/src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java +++ b/src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java @@ -139,4 +139,8 @@ public class SalarySystemConfigWrapper extends Service { public Map getEncryptProgress(String progressId) { return getSalarySysConfService(user).getEncryptProgress(progressId); } + + public void saveWithDrawTaxDeclaration(SalarySysConfPO param) { + getSalarySysConfService(user).saveWithDrawTaxDeclaration(param); + } } From 1fa04f1515d0e7625d75b808d216d8eb538e9304 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Thu, 29 Jun 2023 16:42:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=AA=E7=A8=8E=E7=94=B3=E6=8A=A5?= =?UTF-8?q?=E6=92=A4=E5=9B=9E=E5=BC=80=E5=85=B3-2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/sys/entity/vo/AppSettingVO.java | 5 +++++ .../salary/sys/service/impl/SalarySysConfServiceImpl.java | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/src/com/engine/salary/sys/entity/vo/AppSettingVO.java b/src/com/engine/salary/sys/entity/vo/AppSettingVO.java index a19830fbd..57d8b0330 100644 --- a/src/com/engine/salary/sys/entity/vo/AppSettingVO.java +++ b/src/com/engine/salary/sys/entity/vo/AppSettingVO.java @@ -70,4 +70,9 @@ public class AppSettingVO { */ private String salaryAcctEmployeeRule; + /** + * 撤回个税申报表 + */ + private String withDrawTaxDeclaration; + } diff --git a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java index 7a152e44a..93f810698 100644 --- a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java +++ b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java @@ -497,6 +497,14 @@ public class SalarySysConfServiceImpl extends Service implements SalarySysConfSe appSettingVO.setSalaryAcctEmployeeRule( SalaryAcctEmployeeRuleEnum.parseByValue(salaryAcctEmployeeRule.getConfValue()).getValue() ); } + SalarySysConfPO withDrawRule = salarySysConfMap.get(WITHDRAW_TAX_DECLARATION); + if (withDrawRule == null ) { + // 薪资核算人员匹配规则 + appSettingVO.setWithDrawTaxDeclaration("0"); + } else { + appSettingVO.setSalaryAcctEmployeeRule( withDrawRule.getConfValue() ); + } + //默认加密开启 if (StringUtils.isEmpty(appSettingVO.getIsOpenEncrypt())) { appSettingVO.setIsOpenEncrypt(OpenEnum.OPEN.getValue()); From 18fb376054d8e5f26e96d06437e000133cfe75fd Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Fri, 30 Jun 2023 16:41:06 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=AA=E7=A8=8E=E7=94=B3=E6=8A=A5?= =?UTF-8?q?=E6=92=A4=E5=9B=9Efix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/sys/service/impl/SalarySysConfServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java index 93f810698..ea721e793 100644 --- a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java +++ b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java @@ -502,7 +502,7 @@ public class SalarySysConfServiceImpl extends Service implements SalarySysConfSe // 薪资核算人员匹配规则 appSettingVO.setWithDrawTaxDeclaration("0"); } else { - appSettingVO.setSalaryAcctEmployeeRule( withDrawRule.getConfValue() ); + appSettingVO.setWithDrawTaxDeclaration( withDrawRule.getConfValue() ); } //默认加密开启