diff --git a/src/com/engine/salary/sys/constant/SalarySysConstant.java b/src/com/engine/salary/sys/constant/SalarySysConstant.java index 082a9568f..4008693af 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 SALARY_PAYROLL_CHECK_TYPE = "SALARY_PAYROLL_CHECK_TYPE"; + } diff --git a/src/com/engine/salary/sys/enums/PayrollCheckTypeEnum.java b/src/com/engine/salary/sys/enums/PayrollCheckTypeEnum.java new file mode 100644 index 000000000..266424adb --- /dev/null +++ b/src/com/engine/salary/sys/enums/PayrollCheckTypeEnum.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 PayrollCheckTypeEnum implements BaseEnum { + + PWD("PWD", "密码验证", 1), + SMS("SMS", "短信验证", 1); + + private String value; + + private String defaultLabel; + + private int labelId; + + + PayrollCheckTypeEnum(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 PayrollCheckTypeEnum parseByValue(String value) { + for (PayrollCheckTypeEnum payrollCheckTypeEnum : PayrollCheckTypeEnum.values()) { + if (StringUtils.equals(payrollCheckTypeEnum.getValue(), value)) { + return payrollCheckTypeEnum; + } + } + return PWD; + } +} diff --git a/src/com/engine/salary/web/SalaryBillController.java b/src/com/engine/salary/web/SalaryBillController.java index 46b1ad642..c058de8d3 100644 --- a/src/com/engine/salary/web/SalaryBillController.java +++ b/src/com/engine/salary/web/SalaryBillController.java @@ -5,6 +5,7 @@ import com.engine.salary.entity.salaryBill.dto.*; import com.engine.salary.entity.salaryBill.param.*; import com.engine.salary.enums.salarybill.SalarySendStatusEnum; import com.engine.salary.exception.SalaryRunTimeException; +import com.engine.salary.sys.enums.PayrollCheckTypeEnum; import com.engine.salary.util.ResponseResult; import com.engine.salary.util.SalaryEntityUtil; import com.engine.salary.util.page.PageInfo; @@ -540,6 +541,18 @@ public class SalaryBillController { } /******** 工资单发放 end ***********************************************************************************************/ + /** + * 获取验证方式 + * + * @return + */ + @GET + @Path("/payrollCheckType") + @Produces(MediaType.APPLICATION_JSON) + public String payrollCheckType(@Context HttpServletRequest request, @Context HttpServletResponse response) { + User user = HrmUserVarify.getUser(request, response); + return new ResponseResult(user).run(getSalarySendWrapper(user)::payrollCheckType); + } /** * 短信验证码 diff --git a/src/com/engine/salary/wrapper/SalarySendWrapper.java b/src/com/engine/salary/wrapper/SalarySendWrapper.java index 914ca60d5..21b2389c9 100644 --- a/src/com/engine/salary/wrapper/SalarySendWrapper.java +++ b/src/com/engine/salary/wrapper/SalarySendWrapper.java @@ -26,6 +26,11 @@ import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.mapper.salarybill.SalarySendMapper; import com.engine.salary.service.*; import com.engine.salary.service.impl.*; +import com.engine.salary.sys.constant.SalarySysConstant; +import com.engine.salary.sys.entity.po.SalarySysConfPO; +import com.engine.salary.sys.enums.PayrollCheckTypeEnum; +import com.engine.salary.sys.service.SalarySysConfService; +import com.engine.salary.sys.service.impl.SalarySysConfServiceImpl; import com.engine.salary.util.SalaryDateUtil; import com.engine.salary.util.SalaryEntityUtil; import com.engine.salary.util.SalaryI18nUtil; @@ -78,6 +83,10 @@ public class SalarySendWrapper extends Service implements SalarySendWrapperProxy return ServiceUtil.getService(SalaryAcctRecordServiceImpl.class, user); } + private SalarySysConfService getSalarySysConfService(User user) { + return ServiceUtil.getService(SalarySysConfServiceImpl.class, user); + } + /** * 工资单发放列表 @@ -663,6 +672,16 @@ public class SalarySendWrapper extends Service implements SalarySendWrapperProxy public Boolean checkMobileCode(SMSCodeCheckParam param) { return getSalarySendService(user).checkMobileCode(param); } + + public PayrollCheckTypeEnum payrollCheckType() { + SalarySysConfPO conf = getSalarySysConfService(user).getOneByCode(SalarySysConstant.SALARY_PAYROLL_CHECK_TYPE); + + if(conf == null){ + return PayrollCheckTypeEnum.PWD; + } + + return PayrollCheckTypeEnum.parseByValue(conf.getConfValue()); + } }