diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml index 21d33debf..3b2a8ce46 100644 --- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml +++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml @@ -162,7 +162,7 @@ + or (param.status != null and param.status.toString != 'ALL')"> AND employee_id IN ( SELECT id FROM hrmresource em WHERE em.status not in (7) @@ -183,11 +183,11 @@ -- 在职 - + AND em.status in (0,1,2,3) -- 离职 - + AND em.status in (4,5,6) ) @@ -239,7 +239,7 @@ + or (param.status != null and param.status.toString != 'ALL')"> AND employee_id IN ( SELECT id FROM hrmresource em WHERE em.status not in (7) @@ -260,11 +260,11 @@ -- 在职 - + AND em.status in (0,1,2,3) -- 离职 - + AND em.status in (4,5,6) ) @@ -342,7 +342,7 @@ + or (param.status != null and param.status.toString != 'ALL')"> AND employee_id IN ( SELECT id FROM hrmresource em WHERE em.status not in (7) @@ -363,11 +363,11 @@ -- 在职 - + AND em.status in (0,1,2,3) -- 离职 - + AND em.status in (4,5,6) ) @@ -419,7 +419,7 @@ + or (param.status != null and param.status.toString != 'ALL')"> AND employee_id IN ( SELECT id FROM hrmresource em WHERE em.status not in (7) @@ -440,11 +440,11 @@ -- 在职 - + AND em.status in (0,1,2,3) -- 离职 - + AND em.status in (4,5,6) ) @@ -500,7 +500,7 @@ or (param.subcompanyIds != null and param.subcompanyIds.size()>0) or (param.departmentIds != null and param.departmentIds.size()>0) or (param.positionIds != null and param.positionIds.size()>0) - or (param.status != null and param.status != 'ALL')"> + or (param.status != null and param.status.toString != 'ALL')"> AND employee_id IN ( SELECT id FROM hrmresource em WHERE em.status not in (7) @@ -528,11 +528,11 @@ -- 在职 - + AND em.status in (0,1,2,3) -- 离职 - + AND em.status in (4,5,6) ) @@ -563,7 +563,7 @@ or (param.subcompanyIds != null and param.subcompanyIds.size()>0) or (param.departmentIds != null and param.departmentIds.size()>0) or (param.positionIds != null and param.positionIds.size()>0) - or (param.status != null and param.status != 'ALL')"> + or (param.status != null and param.status.toString != 'ALL')"> AND employee_id IN ( SELECT id FROM hrmresource em WHERE em.status not in (7) @@ -591,11 +591,11 @@ -- 在职 - + AND em.status in (0,1,2,3) -- 离职 - + AND em.status in (4,5,6) ) @@ -635,7 +635,7 @@ + or (param.status != null and param.status.toString != 'ALL')"> AND employee_id IN ( SELECT id FROM hrmresource em WHERE em.status not in (7) @@ -656,11 +656,11 @@ -- 在职 - + AND em.status in (0,1,2,3) -- 离职 - + AND em.status in (4,5,6) ) @@ -690,7 +690,7 @@ + or (param.status != null and param.status.toString != 'ALL')"> AND employee_id IN ( SELECT id FROM hrmresource em WHERE em.status not in (7) @@ -711,11 +711,11 @@ -- 在职 - + AND em.status in (0,1,2,3) -- 离职 - + AND em.status in (4,5,6) ) @@ -738,7 +738,7 @@ or (param.subcompanyIds != null and param.subcompanyIds.size()>0) or (param.departmentIds != null and param.departmentIds.size()>0) or (param.positionIds != null and param.positionIds.size()>0) - or (param.status != null and param.status != 'ALL')"> + or (param.status != null and param.status.toString != 'ALL')"> AND employee_id IN ( SELECT id FROM hrmresource em WHERE em.status not in (7) @@ -767,11 +767,11 @@ -- 在职 - + AND em.status in (0,1,2,3) -- 离职 - + AND em.status in (4,5,6) ) @@ -790,7 +790,7 @@ + or (param.status != null and param.status.toString != 'ALL')"> AND employee_id IN ( SELECT id FROM hrmresource em WHERE em.status not in (7) @@ -811,11 +811,11 @@ -- 在职 - + AND em.status in (0,1,2,3) -- 离职 - + AND em.status in (4,5,6) ) @@ -834,7 +834,7 @@ + or (param.status != null and param.status.toString != 'ALL')"> AND employee_id IN ( SELECT id FROM hrmresource em WHERE em.status not in (7) @@ -855,11 +855,11 @@ -- 在职 - + AND em.status in (0,1,2,3) -- 离职 - + AND em.status in (4,5,6) ) @@ -917,7 +917,7 @@ + or (param.status != null and param.status.toString != 'ALL')"> AND employee_id IN ( SELECT id FROM hrmresource em WHERE em.status not in (7) @@ -938,11 +938,11 @@ -- 在职 - + AND em.status in (0,1,2,3) -- 离职 - + AND em.status in (4,5,6) ) @@ -982,7 +982,7 @@ + or (param.status != null and param.status.toString != 'ALL')"> AND employee_id IN ( SELECT id FROM hrmresource em WHERE em.status not in (7) @@ -1003,11 +1003,11 @@ -- 在职 - + AND em.status in (0,1,2,3) -- 离职 - + AND em.status in (4,5,6) ) @@ -1067,7 +1067,7 @@ + or (param.status != null and param.status.toString != 'ALL')"> AND employee_id IN ( SELECT id FROM hrmresource em WHERE em.status not in (7) @@ -1088,11 +1088,11 @@ -- 在职 - + AND em.status in (0,1,2,3) -- 离职 - + AND em.status in (4,5,6) ) @@ -1132,7 +1132,7 @@ + or (param.status != null and param.status.toString != 'ALL')"> AND employee_id IN ( SELECT id FROM hrmresource em WHERE em.status not in (7) @@ -1153,11 +1153,11 @@ -- 在职 - + AND em.status in (0,1,2,3) -- 离职 - + AND em.status in (4,5,6) ) diff --git a/src/com/engine/salary/sys/entity/param/MatchEmployeeModeSaveParam.java b/src/com/engine/salary/sys/entity/param/MatchEmployeeModeSaveParam.java new file mode 100644 index 000000000..76d478fda --- /dev/null +++ b/src/com/engine/salary/sys/entity/param/MatchEmployeeModeSaveParam.java @@ -0,0 +1,25 @@ +package com.engine.salary.sys.entity.param; + +import com.engine.salary.util.valid.DataCheck; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 保存人员定位规则参数 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MatchEmployeeModeSaveParam { + + @DataCheck(require = true,message = "规则为空") + private String rule; +} diff --git a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java index 217a68e1c..0b2b70530 100644 --- a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java +++ b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java @@ -199,7 +199,7 @@ public class SalarySysConfServiceImpl extends Service implements SalarySysConfSe if (po == null) { SalarySysConfPO build = SalarySysConfPO.builder() .id(IdGenerator.generate()) - .confKey(ASCORDESC_CODE) + .confKey(MATCH_EMPLOYEE_MODE) .confValue(rule) .title("定位人员规则") .orderWeight(0) diff --git a/src/com/engine/salary/web/SalarySystemConfigController.java b/src/com/engine/salary/web/SalarySystemConfigController.java index 7d7e5f728..eef5d51bc 100644 --- a/src/com/engine/salary/web/SalarySystemConfigController.java +++ b/src/com/engine/salary/web/SalarySystemConfigController.java @@ -1,6 +1,7 @@ package com.engine.salary.web; import com.engine.common.util.ServiceUtil; +import com.engine.salary.sys.entity.param.MatchEmployeeModeSaveParam; import com.engine.salary.sys.entity.param.OrderRuleParam; import com.engine.salary.sys.entity.param.SalarySysConfQueryParam; import com.engine.salary.sys.entity.po.SalarySysConfPO; @@ -172,9 +173,9 @@ public class SalarySystemConfigController { @POST @Path("/saveMatchEmployeeModeRule") @Produces(MediaType.APPLICATION_JSON) - public String saveMatchEmployeeModeRule(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody String param) { + public String saveMatchEmployeeModeRule(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody MatchEmployeeModeSaveParam param) { User user = HrmUserVarify.getUser(request, response); - return new ResponseResult(user).run(getSalarySystemConfigWrapper(user)::saveMatchEmployeeModeRule, param); + return new ResponseResult(user).run(getSalarySystemConfigWrapper(user)::saveMatchEmployeeModeRule, param); } } diff --git a/src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java b/src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java index 8577857c7..ad20fe9ce 100644 --- a/src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java +++ b/src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java @@ -2,6 +2,7 @@ package com.engine.salary.wrapper; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; +import com.engine.salary.sys.entity.param.MatchEmployeeModeSaveParam; import com.engine.salary.sys.entity.param.OrderRuleParam; import com.engine.salary.sys.entity.param.SalarySysConfQueryParam; import com.engine.salary.sys.entity.po.SalarySysConfPO; @@ -113,7 +114,8 @@ public class SalarySystemConfigWrapper extends Service { return getSalarySysConfService(user).orderRule(); } - public void saveMatchEmployeeModeRule(String rule) { - getSalarySysConfService(user).saveMatchEmployeeModeRule(rule); + public void saveMatchEmployeeModeRule(MatchEmployeeModeSaveParam param) { + ValidUtil.doValidator(param); + getSalarySysConfService(user).saveMatchEmployeeModeRule(param.getRule()); } }