From 79ed6a3226aae70fe1debfde294efc2367f8f402 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Tue, 26 Nov 2024 13:50:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E5=88=B6=E5=88=97=E6=81=A2=E5=A4=8D?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../param/PageListSettingResetParam.java      | 22 +++++++++++++++++++
 .../engine/salary/service/SettingService.java |  3 +++
 .../service/impl/SettingServiceImpl.java      | 16 +++++++++++++-
 .../salary/web/SalaryCommonController.java    |  8 +++++++
 .../salary/wrapper/SalaryCommonWrapper.java   |  9 ++++++--
 5 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 src/com/engine/salary/entity/setting/param/PageListSettingResetParam.java

diff --git a/src/com/engine/salary/entity/setting/param/PageListSettingResetParam.java b/src/com/engine/salary/entity/setting/param/PageListSettingResetParam.java
new file mode 100644
index 000000000..6b110acd8
--- /dev/null
+++ b/src/com/engine/salary/entity/setting/param/PageListSettingResetParam.java
@@ -0,0 +1,22 @@
+package com.engine.salary.entity.setting.param;
+
+import com.engine.salary.util.valid.DataCheck;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 恢复默认值
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PageListSettingResetParam {
+    /**
+     * 页面，0：薪资明细
+     */
+    @DataCheck(require = true,message = "请选择页面")
+    private String page;
+}
\ No newline at end of file
diff --git a/src/com/engine/salary/service/SettingService.java b/src/com/engine/salary/service/SettingService.java
index 8846ddf69..3bc47a569 100644
--- a/src/com/engine/salary/service/SettingService.java
+++ b/src/com/engine/salary/service/SettingService.java
@@ -12,6 +12,8 @@ public interface SettingService {
 
     PageListTemplateDTO getPageListSetting(PageListSettingQueryParam param);
 
+    void resetPageListSetting(PageListSettingResetParam param);
+
     PageListTemplateDTO getPageListTemplate(PageListTemplateQueryParam param);
 
     List<PageListTemplatePO> getPageListTemplates(PageListTemplateQueryParam queryParam);
@@ -21,4 +23,5 @@ public interface SettingService {
     void changePageListTemplate(PageListTemplateChangeParam param);
 
     List<WeaTableColumn> getPageListColumns(String page);
+
 }
diff --git a/src/com/engine/salary/service/impl/SettingServiceImpl.java b/src/com/engine/salary/service/impl/SettingServiceImpl.java
index 0f6636d8e..5c27e25ea 100644
--- a/src/com/engine/salary/service/impl/SettingServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SettingServiceImpl.java
@@ -36,7 +36,7 @@ import static com.engine.salary.constant.SalaryDefaultTenantConstant.DEFAULT_TEN
 import static com.engine.salary.enums.setting.PageListSettingPageEnum.SALARY_DETAILS_REPORT;
 
 /**
- * 薪资核算
+ * 页面显示
  * <p>Copyright: Copyright (c) 2022</p>
  * <p>Company: 泛微软件</p>
  *
@@ -160,6 +160,20 @@ public class SettingServiceImpl extends Service implements SettingService {
         return PageListTemplateDTO.builder().setting(new ArrayList<>()).checked(new ArrayList<>()).build();
     }
 
+    @Override
+    public void resetPageListSetting(PageListSettingResetParam param) {
+        ValidUtil.doValidator(param);
+
+        String page = param.getPage();
+
+        //个人设置
+        PageListSettingPO selfSetting = getPageListSettingMapper().getByPage(page, 0, (long) user.getUID());
+
+        if (selfSetting != null) {
+            getPageListSettingMapper().delete(selfSetting);
+        }
+    }
+
     @Override
     public PageListTemplateDTO getPageListTemplate(PageListTemplateQueryParam param) {
         String page = param.getPage();
diff --git a/src/com/engine/salary/web/SalaryCommonController.java b/src/com/engine/salary/web/SalaryCommonController.java
index 86152defe..0895ec79e 100644
--- a/src/com/engine/salary/web/SalaryCommonController.java
+++ b/src/com/engine/salary/web/SalaryCommonController.java
@@ -68,6 +68,14 @@ public class SalaryCommonController {
         return new ResponseResult<PageListSettingSaveParam, String>(user).run(getSalaryCommonWrapper(user)::savePageListSetting, param);
     }
 
+    @POST
+    @Path("/pageList/reset/setting")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String resetPageListSetting(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody PageListSettingResetParam param) {
+        User user = HrmUserVarify.getUser(request, response);
+        return new ResponseResult<PageListSettingResetParam, String>(user).run(getSalaryCommonWrapper(user)::resetPageListSetting, param);
+    }
+
     /**
      * 页面默认值
      * @param request
diff --git a/src/com/engine/salary/wrapper/SalaryCommonWrapper.java b/src/com/engine/salary/wrapper/SalaryCommonWrapper.java
index 1ff7c641c..c8182fef1 100644
--- a/src/com/engine/salary/wrapper/SalaryCommonWrapper.java
+++ b/src/com/engine/salary/wrapper/SalaryCommonWrapper.java
@@ -32,8 +32,12 @@ public class SalaryCommonWrapper extends Service {
         getSalaryCacheService(user).remove(key);
     }
 
-    public void savePageListSetting(PageListSettingSaveParam pageListSettingSaveParam) {
-        getSettingService(user).savePageListSetting(pageListSettingSaveParam);
+    public void savePageListSetting(PageListSettingSaveParam param) {
+        getSettingService(user).savePageListSetting(param);
+    }
+
+    public void resetPageListSetting(PageListSettingResetParam param) {
+        getSettingService(user).resetPageListSetting(param);
     }
 
 
@@ -58,4 +62,5 @@ public class SalaryCommonWrapper extends Service {
         getSettingService(user).changePageListTemplate(param);
     }
 
+
 }