diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberAchieveServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberAchieveServiceImpl.java index 295df82d..09abe59f 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberAchieveServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberAchieveServiceImpl.java @@ -2,6 +2,7 @@ package com.hzs.bonus.achieve.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.bonus.achieve.service.ICuMemberAchieveService; import com.hzs.bonus.achieve.service.ICuMemberSettlePeriodService; @@ -205,6 +206,7 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl updateMemberSettleVOList = new ArrayList<>(); @@ -218,7 +220,8 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl= 0) { diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberSettleVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberSettleVO.java index cc5465a9..6794f994 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberSettleVO.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberSettleVO.java @@ -16,7 +16,7 @@ public class CuMemberSettleVO implements Serializable { private Integer level; private Long pkMember; private Long pkParent; - private Integer placeDep; + private Integer placeDept; private String memberCode; private String memberName; private Integer period; diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml index 37cc19ab..c72dfaa5 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml @@ -1327,9 +1327,16 @@ * FROM ( - SELECT LEVEL - , - cm.* + SELECT + LEVEL, + cm.period, + cm.pk_member as pkMember, + cm.pk_parent as pkParent, + cm.place_Dept as placeDept, + cm.member_Code as memberCode, + cm.member_Name as memberName, + cm.a_Balance as aBalance, + cm.b_Balance as bBalance FROM ${targetTable} cm START WITH cm.pk_member = #{pkMember} CONNECT BY cm.PK_MEMBER = PRIOR cm.PK_PARENT ORDER BY