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

fix

This commit is contained in:
钱涛 2022-04-07 13:51:26 +08:00
parent 90335032fd
commit 76eca07701
2 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/engine/salary/entity/salaryacct/param/SalaryAcctRecordQueryParam.java
View File

@ -9,12 +9,13 @@ import lombok.NoArgsConstructor;
import java.time.YearMonth;
/**
* @description: 薪资核算列表查询参数
* @author: xiajun
* @modified By: xiajun
* @date: Created in 12/1/21 1:41 PM
* @version:v1.0
*/
* 薪资核算列表查询参数
* <p>Copyright: Copyright (c) 2022</p>
* <p>Company: 泛微软件</p>
*
* @author qiantao
* @version 1.0
**/
@Data
@Builder
@NoArgsConstructor

36
src/com/engine/salary/service/impl/SalaryArchiveTaxAgentServiceImpl.java
View File

@ -41,27 +41,30 @@ import java.util.*;
**/
public class SalaryArchiveTaxAgentServiceImpl extends Service implements SalaryArchiveTaxAgentService {
private static final Logger log = LoggerFactory.getLogger(SalaryArchiveTaxAgentServiceImpl.class);
private SalaryArchiveMapper salaryArchiveMapper = SqlProxyHandle.getProxy(SalaryArchiveMapper.class);
private SalaryArchiveTaxAgentMapper salaryArchiveTaxAgentMapper = SqlProxyHandle.getProxy(SalaryArchiveTaxAgentMapper.class);
private SalaryArchiveTaxAgentMapper getSalaryArchiveTaxAgentMapper() {
return SqlProxyHandle.getProxy(SalaryArchiveTaxAgentMapper.class);
}
private TaxAgentBiz taxAgentService = new TaxAgentBiz();
// private SalaryBatchService salaryBatchService;
@Override
public SalaryArchiveTaxAgentPO getById(Long salaryArchiveTaxAgentId) {
return salaryArchiveTaxAgentMapper.getById(salaryArchiveTaxAgentId);
return getSalaryArchiveTaxAgentMapper().getById(salaryArchiveTaxAgentId);
}
@Override
public PageInfo<TaxAgentAdjustRecordListDTO> taxAgentAdjustRecordListPage(TaxAgentAdjustRecordQueryParam queryParam) {
PageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
List<TaxAgentAdjustRecordListDTO> taxAgentAdjustRecordListDTOS = salaryArchiveTaxAgentMapper.taxAgentAdjustRecordList(queryParam);
List<TaxAgentAdjustRecordListDTO> taxAgentAdjustRecordListDTOS = getSalaryArchiveTaxAgentMapper().taxAgentAdjustRecordList(queryParam);
PageInfo<TaxAgentAdjustRecordListDTO> pageInfo = new PageInfo<TaxAgentAdjustRecordListDTO>(taxAgentAdjustRecordListDTOS, TaxAgentAdjustRecordListDTO.class);
return pageInfo;
}
@Override
public List<TaxAgentAdjustRecordListDTO> taxAgentAdjustRecordList(TaxAgentAdjustRecordQueryParam queryParam) {
return salaryArchiveTaxAgentMapper.taxAgentAdjustRecordList(queryParam);
return getSalaryArchiveTaxAgentMapper().taxAgentAdjustRecordList(queryParam);
}
/**
@ -71,7 +74,7 @@ public class SalaryArchiveTaxAgentServiceImpl extends Service implements SalaryA
* @return
*/
private SalaryArchiveTaxAgentPO getIneffectiveTaxAgent(Long salaryArchiveId) {
List<SalaryArchiveTaxAgentPO> ineffectiveTaxAgentList = salaryArchiveTaxAgentMapper.getIneffectiveTaxAgentList(SalaryArchiveTaxAgentQueryParam.builder().salaryArchiveId(salaryArchiveId).effectiveTime(new Date()).build());
List<SalaryArchiveTaxAgentPO> ineffectiveTaxAgentList = getSalaryArchiveTaxAgentMapper().getIneffectiveTaxAgentList(SalaryArchiveTaxAgentQueryParam.builder().salaryArchiveId(salaryArchiveId).effectiveTime(new Date()).build());
return CollectionUtils.isNotEmpty(ineffectiveTaxAgentList) ? ineffectiveTaxAgentList.get(0) : null;
}
@ -83,8 +86,7 @@ public class SalaryArchiveTaxAgentServiceImpl extends Service implements SalaryA
*/
@Override
public SalaryArchiveTaxAgentPO getEffectiveTaxAgent(Long salaryArchiveId) {
SalaryArchiveTaxAgentMapper salaryArchiveTaxAgentMapper = SqlProxyHandle.getProxy(SalaryArchiveTaxAgentMapper.class);
List<SalaryArchiveTaxAgentPO> effectiveTaxAgentList = salaryArchiveTaxAgentMapper.getEffectiveTaxAgentList(SalaryArchiveTaxAgentQueryParam.builder().salaryArchiveId(salaryArchiveId).effectiveTime(new Date()).build());
List<SalaryArchiveTaxAgentPO> effectiveTaxAgentList = getSalaryArchiveTaxAgentMapper().getEffectiveTaxAgentList(SalaryArchiveTaxAgentQueryParam.builder().salaryArchiveId(salaryArchiveId).effectiveTime(new Date()).build());
return CollectionUtils.isNotEmpty(effectiveTaxAgentList) ? effectiveTaxAgentList.get(0) : null;
}
@ -102,7 +104,7 @@ public class SalaryArchiveTaxAgentServiceImpl extends Service implements SalaryA
// 获取当前已生效之前的
List<SalaryArchiveTaxAgentPO> salaryArchiveTaxAgents = Lists.newArrayList();
if (effectiveTaxAgent != null) {
salaryArchiveTaxAgents = salaryArchiveTaxAgentMapper.getTaxAgentLtTimeBySalaryArchiveId(SalaryArchiveTaxAgentQueryParam.builder().salaryArchiveId(saveParam.getSalaryArchiveId()).effectiveTime(effectiveTaxAgent.getEffectiveTime()).build());
salaryArchiveTaxAgents = getSalaryArchiveTaxAgentMapper().getTaxAgentLtTimeBySalaryArchiveId(SalaryArchiveTaxAgentQueryParam.builder().salaryArchiveId(saveParam.getSalaryArchiveId()).effectiveTime(effectiveTaxAgent.getEffectiveTime()).build());
}
// 获取未生效数据
SalaryArchiveTaxAgentPO ineffectiveTaxAgent = getIneffectiveTaxAgent(saveParam.getSalaryArchiveId());
@ -145,10 +147,10 @@ public class SalaryArchiveTaxAgentServiceImpl extends Service implements SalaryA
// 2.数据处理
// 2.数据处理,有的就先删后增
if (effectiveTaxAgent != null && saveEffectiveTime.equals(effectiveTaxAgent.getEffectiveTime())) {
salaryArchiveTaxAgentMapper.delete(SalaryArchiveTaxAgentPO.builder().id(effectiveTaxAgent.getId()).build());
getSalaryArchiveTaxAgentMapper().delete(SalaryArchiveTaxAgentPO.builder().id(effectiveTaxAgent.getId()).build());
}
if (ineffectiveTaxAgent != null && saveEffectiveTime.after(today)) {
salaryArchiveTaxAgentMapper.delete(SalaryArchiveTaxAgentPO.builder().id(ineffectiveTaxAgent.getId()).build());
getSalaryArchiveTaxAgentMapper().delete(SalaryArchiveTaxAgentPO.builder().id(ineffectiveTaxAgent.getId()).build());
}
insertTaxAgent(salaryArchive, saveParam);
// 3.todo 日志处理
@ -170,19 +172,19 @@ public class SalaryArchiveTaxAgentServiceImpl extends Service implements SalaryA
.salaryArchiveId(saveParam.getSalaryArchiveId()).employeeId(salaryArchive.getEmployeeId()).effectiveTime(saveParam.getEffectiveTime()).adjustReason(saveParam.getAdjustReason())
// 调整后
.taxAgentId(saveParam.getTaxAgentId()).operator(employeeId).operateTime(now).createTime(now).updateTime(now).creator(employeeId).tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY).build();
salaryArchiveTaxAgentMapper.insertIgnoreNull(salaryArchiveTaxAgent);
getSalaryArchiveTaxAgentMapper().insertIgnoreNull(salaryArchiveTaxAgent);
}
@Override
public String deleteTaxAgent(Long salaryArchiveTaxAgentId) {
SalaryArchiveTaxAgentPO salaryArchiveTaxAgent = salaryArchiveTaxAgentMapper.getById(salaryArchiveTaxAgentId);
SalaryArchiveTaxAgentPO salaryArchiveTaxAgent = getSalaryArchiveTaxAgentMapper().getById(salaryArchiveTaxAgentId);
if (salaryArchiveTaxAgent == null) {
return StringUtils.EMPTY;
}
if (salaryArchiveTaxAgent.getEffectiveTime().after(new Date())) {
salaryArchiveTaxAgent.setDeleteType(1);
// 删除未生效数据
salaryArchiveTaxAgentMapper.delete(salaryArchiveTaxAgent);
getSalaryArchiveTaxAgentMapper().delete(salaryArchiveTaxAgent);
}
return StringUtils.EMPTY;
}
@ -205,8 +207,8 @@ public class SalaryArchiveTaxAgentServiceImpl extends Service implements SalaryA
header.add(SalaryI18nUtil.getI18nLabel(84961, "备注"));
// 3.表数据
// 获取记录
List<TaxAgentAdjustRecordListDTO> list = salaryArchiveTaxAgentMapper.taxAgentAdjustRecordList(queryParam);
List<TaxAgentAdjustRecordListDTO> listAll = salaryArchiveTaxAgentMapper.taxAgentAdjustRecordList(TaxAgentAdjustRecordQueryParam.builder().build());
List<TaxAgentAdjustRecordListDTO> list = getSalaryArchiveTaxAgentMapper().taxAgentAdjustRecordList(queryParam);
List<TaxAgentAdjustRecordListDTO> listAll = getSalaryArchiveTaxAgentMapper().taxAgentAdjustRecordList(TaxAgentAdjustRecordQueryParam.builder().build());
// 个税扣缴义务人
Collection<TaxAgent> taxAgentList = taxAgentService.listAll();
// 人员信息赋值
@ -248,7 +250,7 @@ public class SalaryArchiveTaxAgentServiceImpl extends Service implements SalaryA
@Override
public SalaryArchiveTaxAgentPO getAdjustBeforeTaxAgent(SalaryArchiveTaxAgentPO salaryArchiveTaxAgent) {
List<SalaryArchiveTaxAgentPO> salaryArchiveTaxAgents = salaryArchiveTaxAgentMapper.getAdjustBeforeTaxAgent(SalaryArchiveTaxAgentPO.builder().salaryArchiveId(salaryArchiveTaxAgent.getSalaryArchiveId()).effectiveTime(salaryArchiveTaxAgent.getEffectiveTime()).build());
List<SalaryArchiveTaxAgentPO> salaryArchiveTaxAgents = getSalaryArchiveTaxAgentMapper().getAdjustBeforeTaxAgent(SalaryArchiveTaxAgentPO.builder().salaryArchiveId(salaryArchiveTaxAgent.getSalaryArchiveId()).effectiveTime(salaryArchiveTaxAgent.getEffectiveTime()).build());
return CollectionUtils.isNotEmpty(salaryArchiveTaxAgents) ? salaryArchiveTaxAgents.get(0) : null;
}