From 888938f150c0b1de09c51abbd8f8526ffadfe77d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Thu, 13 Jul 2023 11:33:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/sys/service/SalarySysConfService.java |  6 ++++++
 .../service/impl/SalarySysConfServiceImpl.java   | 15 ++++++++++-----
 .../salary/web/SalarySystemConfigController.java | 16 ++++++++++++++++
 .../wrapper/SalarySystemConfigWrapper.java       |  4 ++++
 4 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/src/com/engine/salary/sys/service/SalarySysConfService.java b/src/com/engine/salary/sys/service/SalarySysConfService.java
index 5f0414164..e0ed13931 100644
--- a/src/com/engine/salary/sys/service/SalarySysConfService.java
+++ b/src/com/engine/salary/sys/service/SalarySysConfService.java
@@ -108,4 +108,10 @@ public interface SalarySysConfService {
      * @param setting
      */
     void saveArchiveDelete(String setting);
+
+    /**
+     * 保存或者更新
+     * @param salarySysConfPO
+     */
+    void operate(SalarySysConfPO salarySysConfPO);
 }
diff --git a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
index ec39eb31a..984486e4a 100644
--- a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
+++ b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
@@ -433,6 +433,11 @@ public class SalarySysConfServiceImpl extends Service implements SalarySysConfSe
         saveSettingByType(setting, SALARY_ARCHIVE_DELETE, "薪资、社保福利档案删除规则", "basic");
     }
 
+    @Override
+    public void operate(SalarySysConfPO salarySysConfPO) {
+        saveSettingByType(salarySysConfPO.getConfValue(), salarySysConfPO.getConfKey(), salarySysConfPO.getTitle(), salarySysConfPO.getModule());
+    }
+
     /**
      * 保存或者修改应用设置
      *
@@ -498,23 +503,23 @@ public class SalarySysConfServiceImpl extends Service implements SalarySysConfSe
         }
 
         SalarySysConfPO salaryAcctEmployeeRule = salarySysConfMap.get(SALARY_ACCT_EMPLOYEE_RULE);
-        if (salaryAcctEmployeeRule == null ) {
+        if (salaryAcctEmployeeRule == null) {
             // 薪资核算人员匹配规则
             appSettingVO.setSalaryAcctEmployeeRule(SalaryAcctEmployeeRuleEnum.BYPAYENDTIME.getValue());
         } else {
-            appSettingVO.setSalaryAcctEmployeeRule( SalaryAcctEmployeeRuleEnum.parseByValue(salaryAcctEmployeeRule.getConfValue()).getValue() );
+            appSettingVO.setSalaryAcctEmployeeRule(SalaryAcctEmployeeRuleEnum.parseByValue(salaryAcctEmployeeRule.getConfValue()).getValue());
         }
 
         SalarySysConfPO withDrawRule = salarySysConfMap.get(WITHDRAW_TAX_DECLARATION);
-        if (withDrawRule == null ) {
+        if (withDrawRule == null) {
             // 个税申报撤回
             appSettingVO.setWithDrawTaxDeclaration("0");
         } else {
-            appSettingVO.setWithDrawTaxDeclaration( withDrawRule.getConfValue() );
+            appSettingVO.setWithDrawTaxDeclaration(withDrawRule.getConfValue());
         }
 
         SalarySysConfPO salaryArchiveDeletePO = salarySysConfMap.get(SALARY_ARCHIVE_DELETE);
-        if (salaryArchiveDeletePO == null ) {
+        if (salaryArchiveDeletePO == null) {
             // 是否允许删除薪资、社保档案，默认不允许删除
             appSettingVO.setSalaryArchiveDelete("0");
         } else {
diff --git a/src/com/engine/salary/web/SalarySystemConfigController.java b/src/com/engine/salary/web/SalarySystemConfigController.java
index 1d640cd17..ab185e359 100644
--- a/src/com/engine/salary/web/SalarySystemConfigController.java
+++ b/src/com/engine/salary/web/SalarySystemConfigController.java
@@ -140,6 +140,22 @@ public class SalarySystemConfigController {
         return new ResponseResult<SalarySysConfPO, String>(user).run(getSalarySystemConfigWrapper(user)::update, param);
     }
 
+    /**
+     * 新增或更新系统配置
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @POST
+    @Path("/operate")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String operate(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalarySysConfPO param) {
+        User user = HrmUserVarify.getUser(request, response);
+        return new ResponseResult<SalarySysConfPO, String>(user).run(getSalarySystemConfigWrapper(user)::operate, param);
+    }
+
+
     /**
      * 单个规则配置
      *
diff --git a/src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java b/src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
index 16ec870b5..d9acd2170 100644
--- a/src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
+++ b/src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
@@ -151,4 +151,8 @@ public class SalarySystemConfigWrapper extends Service {
     public void saveArchiveDelete(String setting) {
         getSalarySysConfService(user).saveArchiveDelete(setting);
     }
+
+    public void operate(SalarySysConfPO salarySysConfPO) {
+        getSalarySysConfService(user).operate(salarySysConfPO);
+    }
 }