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

钱智需求

This commit is contained in:
钱涛 2025-09-24 16:14:06 +08:00
parent 613478b19c
commit 41fc2d5c13
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/salary/service/impl/EmployeeDeclareOptServiceImpl.java
View File

@ -42,6 +42,7 @@ public class EmployeeDeclareOptServiceImpl extends Service implements EmployeeDe
po = EmployeeDeclareOptPO.builder()
.id(IdGenerator.generate())
.taxAgentId(taxAgentId)
.taxCycle(po.getTaxCycle())
.status(po.getStatus())
.lastOperate(po.getLastOperate())
.lastOperateTime(now)
@ -53,6 +54,7 @@ public class EmployeeDeclareOptServiceImpl extends Service implements EmployeeDe
.build();
getEmployeeDeclareOptMapper().insertIgnoreNull(po);
}else {
po.setTaxCycle(po.getTaxCycle());
optPO.setStatus(po.getStatus());
optPO.setLastOperate(po.getLastOperate());
optPO.setLastOperateTime(now);

15
src/com/engine/salary/wrapper/EmployeeDeclareWrapper.java
View File

@ -39,6 +39,7 @@ import com.weaver.util.threadPool.entity.LocalRunnable;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import weaver.general.Util;
import weaver.hrm.User;
import java.util.*;
@ -106,8 +107,6 @@ public class EmployeeDeclareWrapper extends Service {
List<String> statuses = queryParam.getStatuses();
EmployeeDeclareOptPO declareOptPO = EmployeeDeclareOptPO.builder()
.taxAgentIds(SalaryEntityUtil.properties(taxAgents, TaxAgentPO::getId))
.lastOperates(lastOperates)
.statuses(statuses)
.build();
List<EmployeeDeclareOptPO> employeeDeclareOptPOS = getEmployeeDeclareOptService(user).listSome(declareOptPO);
Map<Long, EmployeeDeclareOptPO> longEmployeeDeclareOptPOMap = SalaryEntityUtil.convert2Map(employeeDeclareOptPOS, EmployeeDeclareOptPO::getTaxAgentId);
@ -121,19 +120,19 @@ public class EmployeeDeclareWrapper extends Service {
optPO = optPO == null ? new EmployeeDeclareOptPO() : optPO;
Date taxCycle = optPO.getTaxCycle();
EmployeeDeclareInfoDTO declareInfo = getDeclareInfo(EmployeeDeclareParam.builder().taxAgentId(taxAgent.getId()).taxCycle(taxCycle).build());
String status;
DeclareStatusEnum status;
if (declareInfo.getNotDeclareSize() > 0) {
status = DeclareStatusEnum.NOT_DECLARE.getDefaultLabel();
status = DeclareStatusEnum.NOT_DECLARE;
} else if (declareInfo.getDeclareFailSize() > 0) {
status = DeclareStatusEnum.DECLARE_FAIL.getDefaultLabel();
status = DeclareStatusEnum.DECLARE_FAIL;
} else {
status = DeclareStatusEnum.DECLARE_SUCCESS.getDefaultLabel();
status = DeclareStatusEnum.DECLARE_SUCCESS;
}
TaxAgentDeclareListDTO dto = TaxAgentDeclareListDTO.builder()
.id(taxAgent.getId())
.taxAgentName(taxAgent.getName())
.status(status)
.status(status.getDefaultLabel())
.lastOperate(DeclareOptEnum.getByValue(optPO.getLastOperate()).getDefaultLabel())
.lastOperateTime(optPO.getLastOperateTime())
.opts(Sets.newHashSet("admin"))
@ -143,7 +142,7 @@ public class EmployeeDeclareWrapper extends Service {
if (CollUtil.isNotEmpty(lastOperates) && !lastOperates.contains(optPO.getLastOperate())) {
continue;
}
if (CollUtil.isNotEmpty(statuses) && !statuses.contains(status)) {
if (CollUtil.isNotEmpty(statuses) && !statuses.contains(Util.null2String(status.getValue()))) {
continue;
}