mengxu/pusong-crm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提成列表bug

Browse Source
This commit is contained in:
mx 2024-11-27 10:31:48 +08:00
parent 0b3233fa2a
commit eab0fb95dd
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pusong-modules/pusong-business/src/main/java/com/pusong/business/batch/CalSalaryBatch.java
View File

@ -30,6 +30,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.temporal.Temporal;
import java.time.temporal.TemporalAdjusters; import java.time.temporal.TemporalAdjusters;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -80,11 +81,11 @@ public class CalSalaryBatch {
calcData(deadline, thisMonth, true); calcData(deadline, thisMonth, true);
} }
public List<PsSalary> calcData(LocalDate deadline, LocalDate thisMonth, boolean save){ public List<PsSalary> calcData(Temporal deadline, LocalDate thisMonth, boolean save){
List<PsSalary> psSalaryList = new ArrayList<>(); List<PsSalary> psSalaryList = new ArrayList<>();
//删除该月历史数据 //删除该月历史数据
psSalaryMapper.delete(Wrappers.<PsSalary>lambdaQuery().eq(PsSalary::getSalaryMonth,DateUtils.toString(thisMonth,"yyyy-MM"))); psSalaryMapper.delete(Wrappers.<PsSalary>lambdaQuery().eq(PsSalary::getSalaryMonth, DateUtils.toString(thisMonth,"yyyy-MM")));
log.info("查询所有员工"); log.info("查询所有员工");
List<SysUser> list = sysUserMapper.selectList(Wrappers.<SysUser>lambdaQuery().select(SysUser::getUserId).eq(SysUser::getStatus, 0)); List<SysUser> list = sysUserMapper.selectList(Wrappers.<SysUser>lambdaQuery().select(SysUser::getUserId).eq(SysUser::getStatus, 0));
log.info("查询所有员工{}", list.size()); log.info("查询所有员工{}", list.size());
@ -93,7 +94,7 @@ public class CalSalaryBatch {
//当月新签+当月之前未完成合同数 = 全部合同 - 完成时间在当月之前的 //当月新签+当月之前未完成合同数 = 全部合同 - 完成时间在当月之前的
List<PsContractInfo> contractInfos = psContractInfoMapper.selectList(Wrappers.<PsContractInfo>lambdaQuery() List<PsContractInfo> contractInfos = psContractInfoMapper.selectList(Wrappers.<PsContractInfo>lambdaQuery()
.ne(PsContractInfo::getIsCancel, CommonStatusEnum.SUCCESS.getCode()) .ne(PsContractInfo::getIsCancel, CommonStatusEnum.SUCCESS.getCode())
.and(wq -> wq.lt(PsContractInfo::getFinishDate, deadline).or().isNull(PsContractInfo::getFinishDate))); .and(wq -> wq.le(PsContractInfo::getFinishDate, deadline).or().isNull(PsContractInfo::getFinishDate)));
// List<PsContractInfo> contractInfos = psContractInfoMapper.selectList(Wrappers.<PsContractInfo>lambdaQuery() // List<PsContractInfo> contractInfos = psContractInfoMapper.selectList(Wrappers.<PsContractInfo>lambdaQuery()
// .ne(PsContractInfo::getIsCancel, CommonStatusEnum.SUCCESS.getCode()) // .ne(PsContractInfo::getIsCancel, CommonStatusEnum.SUCCESS.getCode())

4
pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsSalaryServiceImpl.java
View File

@ -22,6 +22,8 @@ import com.pusong.business.mapper.PsSalaryMapper;
import com.pusong.business.service.IPsSalaryService; import com.pusong.business.service.IPsSalaryService;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -54,7 +56,7 @@ public class PsSalaryServiceImpl implements IPsSalaryService {
Page<PsSalaryVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw); Page<PsSalaryVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
if (bo.getStartDate().getTime() <= DateUtils.getFirstDayZeroTimeByMonth().getTime() && bo.getEndDate().getTime() >= DateUtils.getFirstDayZeroTimeByMonth().getTime()){ if (bo.getStartDate().getTime() <= DateUtils.getFirstDayZeroTimeByMonth().getTime() && bo.getEndDate().getTime() >= DateUtils.getFirstDayZeroTimeByMonth().getTime()){
LocalDate deadline = LocalDate.now(); LocalDateTime deadline = bo.getEndDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
LocalDate thisMonth = LocalDate.now(); LocalDate thisMonth = LocalDate.now();
List<PsSalary> psSalaries = calSalaryBatch.calcData(deadline, thisMonth, false); List<PsSalary> psSalaries = calSalaryBatch.calcData(deadline, thisMonth, false);
List<PsSalaryVo> adds = MapstructUtils.convert(psSalaries, PsSalaryVo.class); List<PsSalaryVo> adds = MapstructUtils.convert(psSalaries, PsSalaryVo.class);