修复社保福利列表高级搜索
This commit is contained in:
parent
65cfe6c28a
commit
7d79dcdfc2
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
|
|
@ -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),
|
||||
|
|
|
|||
|
|
@ -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),
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
@ -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);
|
||||
}
|
||||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
@ -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 {
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -150,7 +150,7 @@ public class SalaryAcctController {
|
|||
return new ResponseResult<Long, Integer>(user).run(getSalaryAcctRecordWrapper(user)::hasConsolidatedTax, id);
|
||||
}
|
||||
|
||||
/**********************************薪资核算记录相关 end*********************************/
|
||||
/* ********************************薪资核算记录相关 end*********************************/
|
||||
|
||||
|
||||
/**********************************薪资核算人员相关 start*********************************/
|
||||
|
|
|
|||
|
|
@ -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 {
|
|||
//
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue