From 7d79dcdfc2bf0fc530e33de10d93f21355e51d6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Thu, 11 Aug 2022 10:27:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A4=BE=E4=BF=9D=E7=A6=8F?=
 =?UTF-8?q?=E5=88=A9=E5=88=97=E8=A1=A8=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/biz/SIArchivesBiz.java  | 17 +++--
 .../salary/enums/SalaryCycleTypeEnum.java     | 13 ++--
 .../salary/enums/SalaryDataSourceEnum.java    | 13 ++--
 .../sys/enums/TaxDeclarationFunctionEnum.java | 55 ++++++++++++++++
 .../sys/service/SalarySysConfService.java     | 23 +++++++
 .../impl/SalarySysConfServiceImpl.java        | 62 +++++++++++++++++++
 .../engine/salary/util/SalaryI18nUtil.java    | 13 ++--
 .../salary/web/SalaryAcctController.java      |  2 +-
 .../web/SalarySystemConfigController.java     | 13 +++-
 .../salary/wrapper/SalarySobRangeWrapper.java |  2 +-
 .../wrapper/SalarySystemConfigWrapper.java    | 20 ++++++
 11 files changed, 202 insertions(+), 31 deletions(-)
 create mode 100644 src/com/engine/salary/sys/enums/TaxDeclarationFunctionEnum.java
 create mode 100644 src/com/engine/salary/sys/service/SalarySysConfService.java
 create mode 100644 src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java

diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java
index 238de84fe..66315a2ca 100644
--- a/src/com/engine/salary/biz/SIArchivesBiz.java
+++ b/src/com/engine/salary/biz/SIArchivesBiz.java
@@ -655,7 +655,7 @@ public class SIArchivesBiz {
         }
 
         if (StringUtils.isNotBlank(param.getPositionsStr())) {
-            request.setDepartmentIds(Arrays.stream(param.getPositionsStr().split(",")).map(BigDecimal::new).collect(Collectors.toList()));
+            request.setPositions(Arrays.stream(param.getPositionsStr().split(",")).map(BigDecimal::new).collect(Collectors.toList()));
         }
 
         request.setNeedAuth(param.getNeedAuth());
@@ -667,15 +667,12 @@ public class SIArchivesBiz {
         long startNum = (current - 1) * pageSize;
         param.setStartNum(startNum);
         param.setPageSize(pageSize);
-        if (Objects.equals("fromQuickSearch", param.getDataSource())) {
-            request.setStatuses(param.getStatuses());
-            request.setKeyword(param.getUserName());
-            request.setStartNum(param.getStartNum());
-            request.setPageSize(param.getPageSize());
-            request.setCurrent(current);
-        } else {
-            request = param;
-        }
+        request.setStatuses(param.getStatuses());
+        request.setKeyword(param.getUserName());
+
+        request.setSiSchemeId(param.getSiSchemeId());
+        request.setFundSchemeId(param.getFundSchemeId());
+        request.setOtherSchemeId(param.getOtherSchemeId());
 
         apidatas = listPageEmployeePOS(request, operateId);
 
diff --git a/src/com/engine/salary/enums/SalaryCycleTypeEnum.java b/src/com/engine/salary/enums/SalaryCycleTypeEnum.java
index c41bd6085..9def3061a 100644
--- a/src/com/engine/salary/enums/SalaryCycleTypeEnum.java
+++ b/src/com/engine/salary/enums/SalaryCycleTypeEnum.java
@@ -4,12 +4,13 @@ package com.engine.salary.enums;
 import java.util.Objects;
 
 /**
- * @description: 薪资周期
- * @author: xiajun
- * @modified By: xiajun
- * @date: Created in 11/9/21 9:20 AM
- * @version:v1.0
- */
+ * 薪资周期
+ * <p>Copyright: Copyright (c) 2022</p>
+ * <p>Company: 泛微软件</p>
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
 public enum SalaryCycleTypeEnum implements BaseEnum<Integer> {
 
     BEFORE_LAST_MONTH(1, "上上月", 86075),
diff --git a/src/com/engine/salary/enums/SalaryDataSourceEnum.java b/src/com/engine/salary/enums/SalaryDataSourceEnum.java
index bdb4cd287..a26a75aa8 100644
--- a/src/com/engine/salary/enums/SalaryDataSourceEnum.java
+++ b/src/com/engine/salary/enums/SalaryDataSourceEnum.java
@@ -4,12 +4,13 @@ import java.util.Arrays;
 import java.util.Objects;
 
 /**
- * @description: 薪资账目取值方式
- * @author: xiajun
- * @modified By: xiajun
- * @date: Created in 12/2/21 2:39 PM
- * @version:v1.0
- */
+ * 薪资账目取值方式
+ * <p>Copyright: Copyright (c) 2022</p>
+ * <p>Company: 泛微软件</p>
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
 public enum SalaryDataSourceEnum implements BaseEnum<Integer> {
 
     INPUT_IMPORT(0, "输入/导入", 92004),
diff --git a/src/com/engine/salary/sys/enums/TaxDeclarationFunctionEnum.java b/src/com/engine/salary/sys/enums/TaxDeclarationFunctionEnum.java
new file mode 100644
index 000000000..c76be7f95
--- /dev/null
+++ b/src/com/engine/salary/sys/enums/TaxDeclarationFunctionEnum.java
@@ -0,0 +1,55 @@
+package com.engine.salary.sys.enums;
+
+import com.engine.salary.enums.BaseEnum;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * 申报功能启用枚举
+ * <p>Copyright: Copyright (c) 2022</p>
+ * <p>Company: 泛微软件</p>
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+public enum TaxDeclarationFunctionEnum implements BaseEnum<String> {
+    OPEN("OPEN", "开启", 1),
+    CLOSURE("CLOSURE", "关闭", 1),
+    REBOOT("REBOOT", "重启", 1);
+
+    private String value;
+
+    private String defaultLabel;
+
+    private int labelId;
+
+
+    TaxDeclarationFunctionEnum(String value, String defaultLabel, int labelId) {
+        this.value = value;
+        this.defaultLabel = defaultLabel;
+        this.labelId = labelId;
+    }
+
+    @Override
+    public String getValue() {
+        return value;
+    }
+
+    @Override
+    public String getDefaultLabel() {
+        return defaultLabel;
+    }
+
+    @Override
+    public Integer getLabelId() {
+        return labelId;
+    }
+
+    public static TaxDeclarationFunctionEnum parseByValue(String value) {
+        for (TaxDeclarationFunctionEnum taxDeclarationFunctionEnum : TaxDeclarationFunctionEnum.values()) {
+            if (StringUtils.equals(taxDeclarationFunctionEnum.getValue(), value)) {
+                return taxDeclarationFunctionEnum;
+            }
+        }
+        return null;
+    }
+}
diff --git a/src/com/engine/salary/sys/service/SalarySysConfService.java b/src/com/engine/salary/sys/service/SalarySysConfService.java
new file mode 100644
index 000000000..6fe051aa3
--- /dev/null
+++ b/src/com/engine/salary/sys/service/SalarySysConfService.java
@@ -0,0 +1,23 @@
+package com.engine.salary.sys.service;
+
+import com.engine.salary.sys.enums.TaxDeclarationFunctionEnum;
+
+/**
+ * 薪酬系统配置类
+ * <p>Copyright: Copyright (c) 2022</p>
+ * <p>Company: 泛微软件</p>
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+public interface SalarySysConfService {
+
+
+    /**
+     * 操作是否需要申报功能
+     *
+     * @param flag 开启 0/关闭 1/重新开启 2
+     * @return 执行结果
+     */
+    boolean operateTaxDeclarationFunction(TaxDeclarationFunctionEnum flag);
+}
diff --git a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
new file mode 100644
index 000000000..9ef9f631c
--- /dev/null
+++ b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
@@ -0,0 +1,62 @@
+package com.engine.salary.sys.service.impl;
+
+import com.api.formmode.mybatis.util.SqlProxyHandle;
+import com.engine.core.impl.Service;
+import com.engine.salary.mapper.sys.SalarySysConfMapper;
+import com.engine.salary.sys.entity.po.SalarySysConfPO;
+import com.engine.salary.sys.enums.TaxDeclarationFunctionEnum;
+import com.engine.salary.sys.service.SalarySysConfService;
+import dm.jdbc.util.IdGenerator;
+
+import java.util.Date;
+
+/**
+ * 薪酬系统配置类
+ * <p>Copyright: Copyright (c) 2022</p>
+ * <p>Company: 泛微软件</p>
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+public class SalarySysConfServiceImpl extends Service implements SalarySysConfService {
+
+    private SalarySysConfMapper getSalarySysConfMapper() {
+        return SqlProxyHandle.getProxy(SalarySysConfMapper.class);
+    }
+
+
+    /**
+     * 操作是否需要申报功能
+     *
+     * @param flag 开启 0/关闭 1/重新开启 2
+     * @return 执行结果
+     */
+    public boolean operateTaxDeclarationFunction(TaxDeclarationFunctionEnum flag) {
+        Date date = new Date();
+        SalarySysConfPO taxDeclarationFunction = getSalarySysConfMapper().getOneByCode("taxDeclarationFunction");
+        if (taxDeclarationFunction == null) {
+            taxDeclarationFunction = SalarySysConfPO.builder().id(IdGenerator.generate()).confKey("taxDeclarationFunction").confValue(flag.getValue()).title(flag.getDefaultLabel()).module("taxDeclaration").orderWeight(0).createTime(date).updateTime(date).deleteType(0).build();
+            getSalarySysConfMapper().insertIgnoreNull(taxDeclarationFunction);
+        } else {
+            TaxDeclarationFunctionEnum oldFunctionEnum = TaxDeclarationFunctionEnum.parseByValue(taxDeclarationFunction.getConfValue());
+            //不改变
+            if (flag == oldFunctionEnum) {
+                return true;
+            }
+            //关闭
+            if (flag == TaxDeclarationFunctionEnum.CLOSURE) {
+                taxDeclarationFunction.setConfValue(flag.getValue());
+                taxDeclarationFunction.setTitle(flag.getDefaultLabel());
+                taxDeclarationFunction.setUpdateTime(new Date());
+            }
+            //重启
+            if (flag == TaxDeclarationFunctionEnum.OPEN && oldFunctionEnum == TaxDeclarationFunctionEnum.CLOSURE) {
+                taxDeclarationFunction.setConfValue(flag.getValue());
+                taxDeclarationFunction.setTitle(flag.getDefaultLabel());
+                taxDeclarationFunction.setUpdateTime(new Date());
+            }
+            getSalarySysConfMapper().updateIgnoreNull(taxDeclarationFunction);
+        }
+        return true;
+    }
+}
diff --git a/src/com/engine/salary/util/SalaryI18nUtil.java b/src/com/engine/salary/util/SalaryI18nUtil.java
index 3b5d0e4a0..a28a7124d 100644
--- a/src/com/engine/salary/util/SalaryI18nUtil.java
+++ b/src/com/engine/salary/util/SalaryI18nUtil.java
@@ -1,12 +1,13 @@
 package com.engine.salary.util;
 
 /**
- * @description: 多语言工具类
- * @author: xiajun
- * @modified By: xiajun
- * @date: Created in 10/19/21 4:18 PM
- * @version:v1.0
- */
+ * 多语言工具类
+ * <p>Copyright: Copyright (c) 2022</p>
+ * <p>Company: 泛微软件</p>
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
 public class SalaryI18nUtil {
 
     /**
diff --git a/src/com/engine/salary/web/SalaryAcctController.java b/src/com/engine/salary/web/SalaryAcctController.java
index 80299ba0c..f6f227993 100644
--- a/src/com/engine/salary/web/SalaryAcctController.java
+++ b/src/com/engine/salary/web/SalaryAcctController.java
@@ -150,7 +150,7 @@ public class SalaryAcctController {
         return new ResponseResult<Long, Integer>(user).run(getSalaryAcctRecordWrapper(user)::hasConsolidatedTax, id);
     }
 
-    /**********************************薪资核算记录相关 end*********************************/
+    /* ********************************薪资核算记录相关 end*********************************/
 
 
     /**********************************薪资核算人员相关 start*********************************/
diff --git a/src/com/engine/salary/web/SalarySystemConfigController.java b/src/com/engine/salary/web/SalarySystemConfigController.java
index 23c2aa238..1ce48282c 100644
--- a/src/com/engine/salary/web/SalarySystemConfigController.java
+++ b/src/com/engine/salary/web/SalarySystemConfigController.java
@@ -1,8 +1,10 @@
 package com.engine.salary.web;
 
 import com.engine.common.util.ServiceUtil;
+import com.engine.salary.sys.enums.TaxDeclarationFunctionEnum;
 import com.engine.salary.util.ResponseResult;
 import com.engine.salary.wrapper.SalarySystemConfigWrapper;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import lombok.extern.slf4j.Slf4j;
 import weaver.hrm.HrmUserVarify;
 import weaver.hrm.User;
@@ -10,6 +12,7 @@ import weaver.hrm.User;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.ws.rs.GET;
+import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
@@ -31,6 +34,15 @@ public class SalarySystemConfigController {
         return new ResponseResult<Map<String, Object>, Map<String, Object>>(user).run(getSalarySystemConfigWrapper(user)::info);
     }
 
+    @POST
+    @Path("/operateTaxDeclarationFunction")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String operateTaxDeclarationFunction(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody String flag) {
+        User user = HrmUserVarify.getUser(request, response);
+
+        return new ResponseResult<TaxDeclarationFunctionEnum, Boolean>(user).run(getSalarySystemConfigWrapper(user)::operateTaxDeclarationFunction, TaxDeclarationFunctionEnum.parseByValue(flag));
+    }
+
 //
 //    @POST
 //    @Path("/list")
@@ -42,5 +54,4 @@ public class SalarySystemConfigController {
 //
 
 
-
 }
diff --git a/src/com/engine/salary/wrapper/SalarySobRangeWrapper.java b/src/com/engine/salary/wrapper/SalarySobRangeWrapper.java
index 9a98e5be1..7efe9f070 100644
--- a/src/com/engine/salary/wrapper/SalarySobRangeWrapper.java
+++ b/src/com/engine/salary/wrapper/SalarySobRangeWrapper.java
@@ -24,7 +24,7 @@ import java.util.Collection;
 public class SalarySobRangeWrapper extends Service {
 
     private SalarySobRangeService getSalarySobRangeService(User user) {
-        return (SalarySobRangeService) ServiceUtil.getService(SalarySobRangeServiceImpl.class, user);
+        return ServiceUtil.getService(SalarySobRangeServiceImpl.class, user);
     }
 
     /**
diff --git a/src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java b/src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
index 27bb38699..0482be31e 100644
--- a/src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
+++ b/src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
@@ -1,7 +1,12 @@
 package com.engine.salary.wrapper;
 
+import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
+import com.engine.salary.sys.enums.TaxDeclarationFunctionEnum;
+import com.engine.salary.sys.service.SalarySysConfService;
+import com.engine.salary.sys.service.impl.SalarySysConfServiceImpl;
 import weaver.general.BaseBean;
+import weaver.hrm.User;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -16,6 +21,10 @@ import java.util.Map;
  **/
 public class SalarySystemConfigWrapper extends Service {
 
+    private SalarySysConfService getSalarySysConfService(User user) {
+        return ServiceUtil.getService(SalarySysConfServiceImpl.class, user);
+    }
+
     public Map<String, Object> info() {
         BaseBean baseBean = new BaseBean();
         String log = baseBean.getPropValue("hrmSalary", "log");
@@ -28,4 +37,15 @@ public class SalarySystemConfigWrapper extends Service {
         o.put("openFormulaForcedEditing", openFormulaForcedEditing);
         return o;
     }
+
+    /**
+     * 操作是否需要申报功能
+     *
+     * @param flag 开启 0/关闭 1/重新开启 2
+     * @return 执行结果
+     */
+    public boolean operateTaxDeclarationFunction(TaxDeclarationFunctionEnum flag) {
+        return getSalarySysConfService(user).operateTaxDeclarationFunction(flag);
+    }
+
 }