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
- */
+ * 薪资周期
+ *
Copyright: Copyright (c) 2022
+ * Company: 泛微软件
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
public enum SalaryCycleTypeEnum implements BaseEnum {
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
- */
+ * 薪资账目取值方式
+ * Copyright: Copyright (c) 2022
+ * Company: 泛微软件
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
public enum SalaryDataSourceEnum implements BaseEnum {
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;
+
+/**
+ * 申报功能启用枚举
+ * Copyright: Copyright (c) 2022
+ * Company: 泛微软件
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+public enum TaxDeclarationFunctionEnum implements BaseEnum {
+ 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;
+
+/**
+ * 薪酬系统配置类
+ * Copyright: Copyright (c) 2022
+ * Company: 泛微软件
+ *
+ * @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;
+
+/**
+ * 薪酬系统配置类
+ * Copyright: Copyright (c) 2022
+ * Company: 泛微软件
+ *
+ * @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
- */
+ * 多语言工具类
+ * Copyright: Copyright (c) 2022
+ * Company: 泛微软件
+ *
+ * @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(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