diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java index 9ce784ae..8d849e0b 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java @@ -930,20 +930,23 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl frontMonthCount = selectABCoun(frontPna); - if (CollectionUtil.isNotEmpty(frontMonthCount)) { - for (PlaceNewAddAchieveVO pl : frontMonthCount) { - if (pl.getPlaceDept() == EPlaceDept.LEFT_DEPT.getValue()) { - frontLiftCount = pl.getMemberCount(); - } - if (pl.getPlaceDept() == EPlaceDept.RIGHT_DEPT.getValue()) { - frontRightCount = pl.getMemberCount(); + + CuMemberSettlePeriod tmpSettlePeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(DateUtils.parseDateToStr(frontLastMonth)); + if (null != tmpSettlePeriod) { + int frontLastendperiod = tmpSettlePeriod.getPkId(); + String frontTreeTableNameEnd = TableNameConstants.CU_MEMBER_SETTLE + frontLastendperiod; + frontPna.setPkMember(pna.getPkMember()); + frontPna.setStartDate(frontLastMonth); + frontPna.setAchieveTableName(frontTreeTableNameEnd); + List frontMonthCount = selectABCoun(frontPna); + if (CollectionUtil.isNotEmpty(frontMonthCount)) { + for (PlaceNewAddAchieveVO pl : frontMonthCount) { + if (pl.getPlaceDept() == EPlaceDept.LEFT_DEPT.getValue()) { + frontLiftCount = pl.getMemberCount(); + } + if (pl.getPlaceDept() == EPlaceDept.RIGHT_DEPT.getValue()) { + frontRightCount = pl.getMemberCount(); + } } } }