KPI / fw-morax

Commit 541ec9c07130f760589655c04e0fb258cbc7e2bf

Authored by 姜超
2 parents a65c2594 4e522dc0

Merge branch 'main-fix' into 'main' 

当月转正人员计算试用期工资

当月转正人员计算试用期工资

See merge request !112
Inline Side-by-side
Showing 1 changed file with 24 additions and 0 deletions
fw-morax-service/src/main/java/cn/fw/morax/service/biz/salary/SalaryCalcService.java
  View file @541ec9c
... ... @@ -347,6 +347,10 @@ public class SalaryCalcService {
347 347 if (user.getProbationer()) {
348 348 calcProbationSalary(pool, detailList, user);
349 349 } else {
  350 + //当月转正人员 需要计算试用期工资
  351 + if (this.curMonthRegular(user)) {
  352 + calcProbationSalary(pool, detailList, user);
  353 + }
350 354 calcPushMoney(salaryProjectList, user, pool, detailList);
351 355 }
352 356 calcExtraMoney(pool, dataDate, detailList);
... ... @@ -444,6 +448,26 @@ public class SalaryCalcService {
444 448 }
445 449  
446 450 /**
  451 + * 当月转正
  452 + *
  453 + * @param user
  454 + * @return
  455 + */
  456 + public Boolean curMonthRegular(SalaryGroupUser user) {
  457 + int count = salaryGroupUserService.count(Wrappers.<SalaryGroupUser>lambdaQuery()
  458 + .eq(SalaryGroupUser::getUserId, user.getUserId())
  459 + .eq(SalaryGroupUser::getPostId, user.getPostId())
  460 + .eq(SalaryGroupUser::getShopId, user.getShopId())
  461 + .eq(SalaryGroupUser::getProbationer, Boolean.TRUE)
  462 + .eq(SalaryGroupUser::getFrozen, Boolean.FALSE)
  463 + .eq(SalaryGroupUser::getYn, Boolean.TRUE)
  464 + .ge(SalaryGroupUser::getDataDate, user.getDataDate().with(TemporalAdjusters.firstDayOfMonth()))
  465 + .le(SalaryGroupUser::getDataDate, user.getDataDate())
  466 + );
  467 + return count > 0;
  468 + }
  469 +
  470 + /**
447 471 * 计算试用期工资
448 472 *
449 473 * @param pool
... ...