fix 委员履职信息详细信息

ruoyi-admin/src/main/java/com/ruoyi/web/controller/member/MemberInfoController.java

@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.member;
 
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.member.MemberInfo;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -45,6 +46,16 @@ public class MemberInfoController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 获取委员菜单下拉树列表
+     */
+    @GetMapping("/treeSelect")
+    public AjaxResult treeSelect(MemberInfo memberInfo)
+    {
+        List<MemberInfo> list = memberInfoService.selectMemberInfoList(memberInfo);
+        return success(memberInfoService.buildMemberInfoTreeSelect(list));
+    }
+
     /**
      * 查询委员信息列表不分页
      */

ruoyi-system/src/main/java/com/ruoyi/system/domain/member/MemberInfo.java

@@ -61,6 +61,10 @@ public class MemberInfo extends BaseEntity
      * 排名
      */
     private String ranking;
+    /**
+     * 级别，多选
+     */
+    private String grade;
 
     /** 删除标志（0代表存在 2代表删除） */
     private String delFlag;
@@ -69,6 +73,14 @@ public class MemberInfo extends BaseEntity
     private String type;
 
 
+    public String getGrade() {
+        return grade;
+    }
+
+    public void setGrade(String grade) {
+        this.grade = grade;
+    }
+
     public String getScore() {
         return score;
     }

ruoyi-system/src/main/java/com/ruoyi/system/domain/member/MemberInfoTree.java

@@ -0,0 +1,49 @@
+package com.ruoyi.system.domain.member;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author: tjf
+ * @Date: 2024/3/15 10:47
+ * @Describe:
+ */
+public class MemberInfoTree implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /** 节点ID */
+    private String id;
+
+    /** 节点名称 */
+    private String label;
+
+    /** 子节点 */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private List<MemberInfo> children;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    public List<MemberInfo> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<MemberInfo> children) {
+        this.children = children;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IMemberInfoService.java

@@ -2,6 +2,7 @@ package com.ruoyi.system.service;
 
 
 import com.ruoyi.system.domain.member.MemberInfo;
+import com.ruoyi.system.domain.member.MemberInfoTree;
 import com.ruoyi.system.domain.vo.MemberInfoVo;
 
 import java.util.List;
@@ -34,6 +35,10 @@ public interface IMemberInfoService
      * @return 委员信息集合
      */
     public List<MemberInfo> selectMemberInfoList(MemberInfo memberInfo);
+    /**
+     * 获取委员菜单下拉树列表
+     */
+    public List<MemberInfoTree> buildMemberInfoTreeSelect(List<MemberInfo> memberInfo);
 
     /**
      * 新增委员信息

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MemberInfoServiceImpl.java

@@ -1,21 +1,21 @@
 package com.ruoyi.system.service.impl;
 
 
+import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.system.domain.activity.ZxActivity;
 import com.ruoyi.system.domain.conference.ZxConference;
 import com.ruoyi.system.domain.member.MemberInfo;
+import com.ruoyi.system.domain.member.MemberInfoTree;
 import com.ruoyi.system.domain.speak.ZxSpeak;
 import com.ruoyi.system.domain.vo.MemberInfoVo;
-import com.ruoyi.system.mapper.ZxActivityMapper;
-import com.ruoyi.system.mapper.ZxConferenceMapper;
-import com.ruoyi.system.mapper.ZxSpeakMapper;
+import com.ruoyi.system.mapper.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.system.mapper.MemberInfoMapper;
 import com.ruoyi.system.service.IMemberInfoService;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -36,6 +36,9 @@ public class MemberInfoServiceImpl implements IMemberInfoService
     @Autowired
     private ZxSpeakMapper zxSpeakMapper;
 
+    @Autowired
+    private SysDictDataMapper dictDataMapper;
+
     /**
      * 查询委员信息
      * 
@@ -91,6 +94,38 @@ public class MemberInfoServiceImpl implements IMemberInfoService
         return memberInfoMapper.selectMemberInfoList(memberInfo);
     }
 
+    /**
+     * 获取委员菜单下拉树列表
+     */
+    @Override
+    public List<MemberInfoTree> buildMemberInfoTreeSelect(List<MemberInfo> memberInfo) {
+        //查询字典值，政协委员级别
+        List<MemberInfoTree> memberInfoTreeList = new ArrayList<>();
+        if (memberInfo != null && memberInfo.size() >0){
+            List<SysDictData> dictDataList = dictDataMapper.selectDictDataByType("grade");
+            if (dictDataList !=null && dictDataList.size() >0){
+                for (SysDictData sysDictData : dictDataList) {
+                    MemberInfoTree memberInfoTree = new MemberInfoTree();
+                    memberInfoTree.setId(sysDictData.getDictValue());
+                    memberInfoTree.setLabel(sysDictData.getDictLabel());
+                    memberInfoTreeList.add(memberInfoTree);
+                }
+                for (MemberInfoTree memberInfoTree : memberInfoTreeList) {
+                    //委员级别id
+                    String id = memberInfoTree.getId();
+                    List<MemberInfo> memberInfoList = new ArrayList<>();
+                    for (MemberInfo info : memberInfo) {
+                        if (info.getGrade().contains(id)){
+                            memberInfoList.add(info);
+                        }
+                    }
+                    memberInfoTree.setChildren(memberInfoList);
+                }
+            }
+        }
+        return memberInfoTreeList;
+    }
+
     /**
      * 新增委员信息
      * 

ruoyi-system/src/main/resources/mapper/system/MemberInfoMapper.xml

@@ -17,6 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="studio"    column="studio"    />
         <result property="score"    column="score"    />
         <result property="ranking"    column="ranking"    />
+        <result property="grade"    column="grade"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -26,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectMemberInfoVo">
-        select member_id, user_id, name, card, boundary, party_affiliation, phonenumber, avatar, unit, studio,score,ranking, del_flag, create_by, create_time, update_by, update_time, remark from member_info
+        select member_id, user_id, name, card, boundary, party_affiliation, phonenumber, avatar, unit, studio,score,ranking,grade, del_flag, create_by, create_time, update_by, update_time, remark from member_info
     </sql>
 
     <select id="selectMemberInfoList" parameterType="MemberInfo" resultMap="MemberInfoResult">
@@ -43,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="studio != null  and studio != ''"> and studio = #{studio}</if>
             <if test="score != null  and score != ''"> and score = #{score}</if>
             <if test="ranking != null  and ranking != ''"> and ranking = #{ranking}</if>
+            <if test="grade != null  and grade != ''"> and find_in_set(#{grade}, grade)</if>
         </where>
     </select>
     
@@ -65,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="studio != null">studio,</if>
             <if test="score != null">score,</if>
             <if test="ranking != null">ranking,</if>
+            <if test="grade != null">grade,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -84,6 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="studio != null">#{studio},</if>
             <if test="score != null">#{score},</if>
             <if test="ranking != null">#{ranking},</if>
+            <if test="grade != null">#{grade},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -107,6 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="studio != null">studio = #{studio},</if>
             <if test="score != null and score != ''">score = #{score},</if>
             <if test="ranking != null and ranking != ''">ranking = #{ranking},</if>
+            <if test="grade != null and grade != ''">grade = #{grade},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>