qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 路径修改接近e10

This commit is contained in:
fcli 2022-11-29 14:36:37 +08:00
parent fc81955b15
commit 4f9e2d8f80
6 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/api/salary/web/SalarySendRangeController.java
View File

@ -2,7 +2,7 @@ package com.api.salary.web;
import javax.ws.rs.Path;
@Path("/bs/hrmsalary/salarySendRange")
@Path("/bs/hrmsalary/salaryBill/send/range/")
public class SalarySendRangeController extends com.engine.salary.web.SalarySendRangeController{
}

2
src/com/engine/salary/entity/salaryBill/bo/SalarySendRangeBO.java
View File

@ -41,7 +41,7 @@ public class SalarySendRangeBO {
public boolean putNew(SalarySendRangeObj salarySendRangeObj) {
//如果已经设置了排除所有人 或者 添加所有人， 直接跳过处理
if (isExcludeAll || isIncludeAll) {
if (isExcludeAll) {
return true;
}
Integer rangeType = salarySendRangeObj.getRangeType();

3
src/com/engine/salary/service/SalarySendRangeService.java
View File

@ -3,6 +3,7 @@ package com.engine.salary.service;
import com.engine.salary.entity.salaryBill.dto.SalarySendRangeListDTO;
import com.engine.salary.entity.salaryBill.param.SalarySendRangeQueryParam;
import com.engine.salary.entity.salaryBill.param.SalarySendRangeSaveParam;
import com.engine.salary.enums.salarysend.SalarySendGrantTypeEnum;
import com.engine.salary.util.page.PageInfo;
import java.util.Collection;
@ -20,5 +21,5 @@ public interface SalarySendRangeService {
void deleteByIds(List<Long> sendRangeIds);
List<Long> getSendInfoIdsBySendId(Long sendId, List<Long> sendRangeIds);
List<Long> getSendInfoIdsBySendId(Long sendId, List<Long> sendRangeIds, SalarySendGrantTypeEnum grantType);
}

8
src/com/engine/salary/service/impl/SalarySendRangeServiceImpl.java
View File

@ -15,6 +15,7 @@ import com.engine.salary.entity.salaryBill.param.SalarySendRangeSaveParam;
import com.engine.salary.entity.salaryBill.po.SalarySendRangeObj;
import com.engine.salary.entity.salaryBill.po.SalarySendRangePO;
import com.engine.salary.entity.taxagent.po.TaxAgentPO;
import com.engine.salary.enums.salarysend.SalarySendGrantTypeEnum;
import com.engine.salary.enums.salarysend.SalarySendRangeTargetTypeEnum;
import com.engine.salary.enums.salarysend.SalarySendRangeTypeEnum;
import com.engine.salary.exception.SalaryRunTimeException;
@ -70,6 +71,9 @@ public class SalarySendRangeServiceImpl extends Service implements SalarySendRan
@Override
public void save(SalarySendRangeSaveParam param) {
if (user == null) {
throw new SalaryRunTimeException("您没有此操作的权限");
}
SalarySendRangeSaveParam.checkParam(param, (long) user.getUID(), DEFAULT_TENANT_KEY);
SalarySendRangePO salarySendRangePO = param.toSalarySendRangePO(user);
@ -185,9 +189,9 @@ public class SalarySendRangeServiceImpl extends Service implements SalarySendRan
}
@Override
public List<Long> getSendInfoIdsBySendId(Long sendId, List<Long> sendRangeIds) {
public List<Long> getSendInfoIdsBySendId(Long sendId, List<Long> sendRangeIds, SalarySendGrantTypeEnum grantType) {
List<Long> rangeIdList =
applyMapper(mapper -> mapper.selectIdsBySendIdAndGrantType(sendId, null));
applyMapper(mapper -> mapper.selectIdsBySendIdAndGrantType(sendId, grantType.getValue()));
rangeIdList = rangeIdList.stream()
.filter(sendRangeIds::contains)

8
src/com/engine/salary/service/impl/SalarySendServiceImpl.java
View File

@ -29,6 +29,7 @@ import com.engine.salary.entity.salarysob.po.SalarySobPO;
import com.engine.salary.entity.taxagent.po.TaxAgentPO;
import com.engine.salary.enums.salaryaccounting.SalaryAcctRecordStatusEnum;
import com.engine.salary.enums.salarybill.SalarySendStatusEnum;
import com.engine.salary.enums.salarysend.SalarySendGrantTypeEnum;
import com.engine.salary.exception.SalaryRunTimeException;
import com.engine.salary.mapper.salaryacct.SalaryAcctEmployeeMapper;
import com.engine.salary.mapper.salaryacct.SalaryAcctRecordMapper;
@ -671,7 +672,10 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
if (param.getSalarySendRangeIds() != null) {
//如果传了范围id，则使用范围id发放
ids = getSalarySendRangeService(user)
.getSendInfoIdsBySendId(salarySendId, param.getSalarySendRangeIds());
.getSendInfoIdsBySendId(salarySendId, param.getSalarySendRangeIds(), SalarySendGrantTypeEnum.GRANT);
if (ids.isEmpty()) {// 由于查出来是空的，会导致全部发放，在此进行拦截
throw new SalaryRunTimeException("工资发放范围内没有员工");
}
}
SalarySendPO salarySend = mapper.getById(salarySendId);
@ -934,7 +938,7 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
if (param.getSalarySendRangeIds() != null) {
//如果传了范围id，则使用范围id撤回
ids = getSalarySendRangeService(user)
.getSendInfoIdsBySendId(salarySendId, param.getSalarySendRangeIds());
.getSendInfoIdsBySendId(salarySendId, param.getSalarySendRangeIds(), SalarySendGrantTypeEnum.WITHDRAW);
}
SalarySendPO salarySend = mapper.getById(salarySendId);

4
src/com/engine/salary/web/SalarySendRangeController.java
View File

@ -38,7 +38,7 @@ public class SalarySendRangeController {
}
@POST
@Path("/deleteByIds")
@Path("/delete")
@Produces(MediaType.APPLICATION_JSON)
public String deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response,
@RequestBody Collection<Long> ids) {
@ -47,7 +47,7 @@ public class SalarySendRangeController {
}
@POST
@Path("/listPage")
@Path("/list")
@Produces(MediaType.APPLICATION_JSON)
public String save(@Context HttpServletRequest request, @Context HttpServletResponse response,
@RequestBody SalarySendRangeQueryParam queryParam) {