angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 区域考核数据处理；

This commit is contained in:
cabbage 2025-07-30 10:18:33 +08:00
parent dba0283246
commit f2f09a4ad4
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java
View File

@ -588,9 +588,10 @@ public class BonusSettleServiceImpl implements IBonusSettleService {
// 创建考核月表（cu_member_assess）
iCuMemberAssessService.createCuMemberAssessMonth(afterDate);
// TODO 区域考核，当月、次月免考
// 区域考核，当月、次月免考
iCuMemberAssessService.initAreaMemberAssess(settleDate, currentSettleDate, currentSettleTableName);
}
// 奖金计算结束，统计拨比、业绩、4-N拨比
iCuBonusExpandService.updateCuBonusExpandRatio(BonusExpandParam.builder().settleDate(currentSettleDate).build(), "cu_member_bonus");
} catch (Exception e) {

38
bd-business/bd-business-bonus/src/main/resources/mapper/bonus/detail/CuMemberAssessMapper.xml
View File

@ -593,28 +593,31 @@
cms.rep_b_sum_pv
from ${currentSettleTableName} cms
where cms.pk_member in
(select cma.pk_member
(select distinct cma.pk_member
from ${accessTableName} cma
where cma.del_flag = 0
and cma.assess_type in (6, 7, 8))) a
left join (select cms.pk_member,
cms.a_sum_pv,
cms.b_sum_pv,
cms.rep_a_sum_pv,
cms.rep_b_sum_pv
from ${beforeMonthSettleTableName} cms
where cms.pk_member in
(select cma.pk_member
from ${accessTableName} cma
where cma.del_flag = 0
and cma.assess_type in (6, 7, 8))) b
on a.pk_member = b.pk_member) t
left join (select cms.pk_member,
cms.a_sum_pv,
cms.b_sum_pv,
cms.rep_a_sum_pv,
cms.rep_b_sum_pv
from ${beforeMonthSettleTableName} cms
where cms.pk_member in
(select distinct cma.pk_member
from ${accessTableName} cma
where cma.del_flag = 0
and cma.assess_type in (6, 7, 8))) b
on a.pk_member = b.pk_member) t
) tmp
on (cma.pk_member = tmp.pk_member and cma.assess_type in (6, 7, 8) and cma.assess_status != 1 and cma.del_flag = 0)
on (cma.pk_member = tmp.pk_member and cma.assess_type in (6, 7, 8) and cma.del_flag = 0)
when matched then
update set cma.pk_awards = tmp.pk_awards,
cma.month_add = tmp.small_pv,
cma.assess_status = 2
update set cma.pk_awards = tmp.pk_awards,
cma.month_add = tmp.small_pv,
cma.assess_status = (case
when cma.assess_status = 1 then 1
else 2
end)
</update>
<!-- 更新区域考核考核状态 -->
@ -628,6 +631,7 @@
on ba.pk_id = cma.pk_awards
where cma.del_flag = 0
and cma.assess_type in (6, 7, 8)
and cma.assess_status != 1
and ba.awards_value >= baa.awards_value
and cma.month_add >= cma.assess_target
) tmp