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

增加扣除名单

This commit is contained in:
钱涛 2025-03-11 11:15:08 +08:00
parent 894b9cd1fc
commit 12bbfeceae
2 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/engine/salary/entity/deductionamount/po/DeductionAmountPO.java
View File

@ -53,7 +53,7 @@ public class DeductionAmountPO {
* 人员类型 * 人员类型
*/ */
@ElogTransform(name = "人员类型") @ElogTransform(name = "人员类型")
private Byte employeeType; private Integer employeeType;
/** /**
* 工号 * 工号
@ -71,24 +71,24 @@ public class DeductionAmountPO {
* 证件类型 * 证件类型
*/ */
@ElogTransform(name = "证件类型") @ElogTransform(name = "证件类型")
private Byte cardType; private Integer cardType;
/** /**
* 报送状态 * 报送状态
*/ */
@ElogTransform(name = "报送状态") @ElogTransform(name = "报送状态")
private Byte declareStatus; private Integer declareStatus;
/** /**
* 是否扣除 * 是否扣除
*/ */
@ElogTransform(name = "是否扣除") @ElogTransform(name = "是否扣除")
private Byte deductFlag; private Integer deductFlag;
/** /**
* 是否成功报送过 * 是否成功报送过
*/ */
@ElogTransform(name = "是否成功报送过") @ElogTransform(name = "是否成功报送过")
private Byte successfullyDeclared; private Integer successfullyDeclared;
/** /**

48
src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java
View File

@ -3,6 +3,7 @@ package com.engine.salary.service.impl;
import com.engine.common.util.ServiceUtil; import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service; import com.engine.core.impl.Service;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
import com.engine.salary.entity.deductionamount.param.DeductionAmountAddParam; import com.engine.salary.entity.deductionamount.param.DeductionAmountAddParam;
import com.engine.salary.entity.deductionamount.param.DeductionAmountOnlineQueryParam; import com.engine.salary.entity.deductionamount.param.DeductionAmountOnlineQueryParam;
import com.engine.salary.entity.deductionamount.po.DeductionAmountPO; import com.engine.salary.entity.deductionamount.po.DeductionAmountPO;
@ -15,8 +16,10 @@ import com.engine.salary.util.SalaryEntityUtil;
import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.db.MapperProxyFactory;
import com.engine.salary.util.valid.ValidUtil; import com.engine.salary.util.valid.ValidUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.math.NumberUtils;
import weaver.hrm.User; import weaver.hrm.User;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -86,27 +89,28 @@ public class DeductionAmountServiceImpl extends Service implements DeductionAmou
List<Long> employeeDeclareIds = param.getEmployeeDeclareIds(); List<Long> employeeDeclareIds = param.getEmployeeDeclareIds();
List<EmployeeDeclarePO> employeeDeclarePOS = getEmployeeDeclareMapper().listSome(EmployeeDeclarePO.builder().ids(employeeDeclareIds).build()); List<EmployeeDeclarePO> employeeDeclarePOS = getEmployeeDeclareMapper().listSome(EmployeeDeclarePO.builder().ids(employeeDeclareIds).build());
// employeeDeclarePOS.stream() Date now = new Date();
// .filter(employeeDeclarePO -> !oldIds.contains(employeeDeclarePO.getEmployeeId())) employeeDeclarePOS.stream()
// .map(employeeDeclarePO -> { .filter(employeeDeclarePO -> !oldIds.contains(employeeDeclarePO.getEmployeeId()))
// DeductionAmountPO.builder() .map(employeeDeclarePO -> {
// .id(employeeDeclarePO.getEmployeeId()) DeductionAmountPO.builder()
// .taxAgentId(employeeDeclarePO.getEmployeeId()) .id(employeeDeclarePO.getEmployeeId())
// .year(param.getYear()) .taxAgentId(employeeDeclarePO.getEmployeeId())
// .employeeId(employeeDeclarePO.getEmployeeId()) .year(param.getYear())
// .employeeName(employeeDeclarePO.getEmployeeName()) .employeeId(employeeDeclarePO.getEmployeeId())
// .employeeType(employeeDeclarePO.getEmployeeId()) .employeeName(employeeDeclarePO.getEmployeeName())
// .jobNum(employeeDeclarePO.getEmployeeId()) .employeeType(employeeDeclarePO.getEmployeeType())
// .cardNum(employeeDeclarePO.getEmployeeId()) .jobNum(employeeDeclarePO.getJobNum())
// .cardType(employeeDeclarePO.getEmployeeId()) .cardNum(employeeDeclarePO.getCardNum())
// .declareStatus(employeeDeclarePO.getEmployeeId()) .cardType(employeeDeclarePO.getCardType())
// .deductFlag(employeeDeclarePO.getEmployeeId()) .declareStatus(0)
// .successfullyDeclared(employeeDeclarePO.getEmployeeId()) .deductFlag(1)
// .creator(employeeId) .successfullyDeclared(0)
// .createTime(now) .creator((long)user.getUID())
// .updateTime(now) .createTime(now)
// .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) .updateTime(now)
// .deleteType(NumberUtils.INTEGER_ZERO) .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY)
// }); .deleteType(NumberUtils.INTEGER_ZERO);
});
} }
} }