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

fix(cumemberService): 安置架构方案五添加奖衔与等级字段

This commit is contained in:
woody 2025-05-19 14:42:10 +08:00
parent 88815a18b9
commit 420e0ce2a8
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java
View File

@ -2113,7 +2113,10 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
tree.putExtra("memberCode", treeNode.getMemberCode()); tree.putExtra("memberCode", treeNode.getMemberCode());
tree.putExtra("placeDept", treeNode.getPlaceDept()); tree.putExtra("placeDept", treeNode.getPlaceDept());
tree.putExtra("level", treeNode.getLevel()); tree.putExtra("level", treeNode.getLevel());
tree.putExtra("gradeName", treeNode.getGradeName());
tree.putExtra("awardsName", treeNode.getAwardsName());
tree.putExtra("parentMemberCode", treeNode.getParentMemberCode()); tree.putExtra("parentMemberCode", treeNode.getParentMemberCode());
}); });
return build; return build;
} }

8
bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml
View File

@ -303,12 +303,14 @@
t.MALL_PV ,t.MALL_NEW_PV,t.MIN_ACHIEVE,t.ROUND,t.SECOND, t.a_new_box, t.b_new_box, t.a_sum_box, t.b_sum_box , t.MALL_PV ,t.MALL_NEW_PV,t.MIN_ACHIEVE,t.ROUND,t.SECOND, t.a_new_box, t.b_new_box, t.a_sum_box, t.b_sum_box ,
</if> </if>
cm.PK_AWARDS,cm.PK_PLACE_PARENT,cm.PK_PARENT ,cm.PLACE_DEPT ,cm.MEMBER_NAME, cm.MEMBER_CODE,cm.PK_ID cm.PK_AWARDS,cm.PK_PLACE_PARENT,cm.PK_PARENT ,cm.PLACE_DEPT ,cm.MEMBER_NAME, cm.MEMBER_CODE,cm.PK_ID
PK_MEMBER,cm.PK_COUNTRY,cm.PK_SETTLE_COUNTRY,cme.MEMBER_CODE parentMemberCode, PK_MEMBER,cm.PK_COUNTRY,cm.PK_SETTLE_COUNTRY,cme.MEMBER_CODE parentMemberCode, grade.GRADE_NAME, awards.AWARDS_NAME,
(select count(cr.pk_id) from CU_MEMBER cr where cr.pk_parent = cm.pk_id and cr.del_flag = 0) (select count(cr.pk_id) from CU_MEMBER cr where cr.pk_parent = cm.pk_id and cr.del_flag = 0)
directPushNumber,cm.PK_VERTEX ,cm.NICK_NAME directPushNumber,cm.PK_VERTEX ,cm.NICK_NAME
from from
CU_MEMBER cm CU_MEMBER cm
left join CU_MEMBER cme on cme.PK_ID = cm.PK_PLACE_PARENT left join CU_MEMBER cme on cme.PK_ID = cm.PK_PLACE_PARENT
left join BD_GRADE grade on grade.PK_ID = cm.PK_SETTLE_GRADE
left join BD_AWARDS awards on awards.PK_ID = cm.PK_AWARDS
<if test="tableName != null and tableName != ''"> <if test="tableName != null and tableName != ''">
left join ${tableName} t on cm.PK_ID = t.PK_MEMBER left join ${tableName} t on cm.PK_ID = t.PK_MEMBER
</if> </if>
@ -465,9 +467,11 @@
<select id="selectByTreeMemberListFive" resultMap="CuMemberSettleExt"> <select id="selectByTreeMemberListFive" resultMap="CuMemberSettleExt">
select level,cm.PK_AWARDS,cm.PK_SETTLE_COUNTRY, select level,cm.PK_AWARDS,cm.PK_SETTLE_COUNTRY,
cm.PK_PLACE_PARENT,cm.PK_PARENT ,cm.PLACE_DEPT ,cm.MEMBER_NAME, cm.MEMBER_CODE,cm.PK_ID cm.PK_PLACE_PARENT,cm.PK_PARENT ,cm.PLACE_DEPT ,cm.MEMBER_NAME, cm.MEMBER_CODE,cm.PK_ID
PK_MEMBER,cm.PK_COUNTRY,cme.MEMBER_CODE parentMemberCode PK_MEMBER,cm.PK_COUNTRY,cme.MEMBER_CODE parentMemberCode, grade.GRADE_NAME gradeName, awards.AWARDS_NAME
from CU_MEMBER cm from CU_MEMBER cm
left join BD_GRADE grade on cm.PK_SETTLE_GRADE = grade.PK_ID
left join CU_MEMBER cme on cme.PK_ID = cm.PK_PARENT left join CU_MEMBER cme on cme.PK_ID = cm.PK_PARENT
left join BD_AWARDS awards on cme.PK_AWARDS = awards.PK_ID
where level &lt; #{level} and cm.del_flag = 0 where level &lt; #{level} and cm.del_flag = 0
<!-- 体系权限处理 --> <!-- 体系权限处理 -->
<if test="vertexIdList != null and vertexIdList.size > 0"> <if test="vertexIdList != null and vertexIdList.size > 0">

3
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/ext/CuMemberSettleExt.java
View File

@ -25,6 +25,8 @@ public class CuMemberSettleExt extends CuMemberTree {
private Integer gradeValue; private Integer gradeValue;
private String gradeName;
/** /**
* 原奖衔 * 原奖衔
*/ */
@ -437,4 +439,5 @@ public class CuMemberSettleExt extends CuMemberTree {
*/ */
private Integer awardsValue; private Integer awardsValue;
private String awardsName;
} }