支部成员管理 - 添加“工号”字段

ruoyi-system/src/main/java/com/ruoyi/branch/domain/TBranchMember.java

@@ -137,6 +137,18 @@ public class TBranchMember extends BaseEntity
     @Excel(name = "民族")
     private String ethnic;
 
+    /** 工号 */
+    @Excel(name = "工号")
+    private String staffId;
+
+    public String getStaffId() {
+        return staffId;
+    }
+
+    public void setStaffId(String staffId) {
+        this.staffId = staffId;
+    }
+
     public String getEthnic() {
         return ethnic;
     }

ruoyi-system/src/main/resources/mapper/branch/TBranchMemberMapper.xml

@@ -34,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="sex"    column="sex"    />
         <result property="phonenumber"    column="phonenumber"    />
         <result property="ethnic"    column="ethnic"    />
+        <result property="staffId"    column="staff_id"    />
         <collection  property="roles"   javaType="java.util.List" resultMap="RoleResult" />
         <collection  property="posts"   javaType="java.util.List" resultMap="PostResult" />
     </resultMap>
@@ -56,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTBranchMemberVo">
-        select u.member_id, u.user_id, u.ethnic, u.member_type, u.birthday, u.education_level, u.work_join_time, u.work_entry_time, u.party_entry_time, u.labour_entry_time, u.labour_leave_time, u.entry_time, u.leave_time, u.is_league, u.apply_time, u.form_create_time, u.current_mentor, u.plan_develop_duration, u.is_trained, u.remarks, u.del_flag, u.create_by, u.create_time, u.update_by, u.update_time, u.dept_id,
+        select u.member_id, u.user_id, u.staff_id, u.ethnic, u.member_type, u.birthday, u.education_level, u.work_join_time, u.work_entry_time, u.party_entry_time, u.labour_entry_time, u.labour_leave_time, u.entry_time, u.leave_time, u.is_league, u.apply_time, u.form_create_time, u.current_mentor, u.plan_develop_duration, u.is_trained, u.remarks, u.del_flag, u.create_by, u.create_time, u.update_by, u.update_time, u.dept_id,
         us.NICK_NAME, us.SEX, us.PHONENUMBER,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,
         p.post_id, p.post_code, p.post_name, p.post_sort, p.status as post_status
@@ -76,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null "> and u.user_id = #{userId}</if>
             <if test="memberType != null  and memberType != ''"> and u.member_type = #{memberType}</if>
             <if test="ethnic != null  and ethnic != ''"> and u.ethnic = #{ethnic}</if>
+            <if test="staffId != null  and staffId != ''"> and u.staff_id = #{staffId}</if>
             <if test="birthday != null "> and u.birthday = #{birthday}</if>
             <if test="educationLevel != null  and educationLevel != ''"> and u.education_level = #{educationLevel}</if>
             <if test="workJoinTime != null "> and u.work_join_time = #{workJoinTime}</if>
@@ -115,6 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null">user_id,</if>
             <if test="memberType != null">member_type,</if>
             <if test="ethnic != null">ethnic,</if>
+            <if test="staffId != null">staff_id,</if>
             <if test="birthday != null">birthday,</if>
             <if test="educationLevel != null">education_level,</if>
             <if test="workJoinTime != null">work_join_time,</if>
@@ -143,6 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null">#{userId},</if>
             <if test="memberType != null">#{memberType},</if>
             <if test="ethnic != null">#{ethnic},</if>
+            <if test="staffId != null">#{staffId},</if>
             <if test="birthday != null">#{birthday},</if>
             <if test="educationLevel != null">#{educationLevel},</if>
             <if test="workJoinTime != null">#{workJoinTime},</if>
@@ -174,6 +178,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null">user_id = #{userId},</if>
             <if test="memberType != null">member_type = #{memberType},</if>
             <if test="ethnic != null">ethnic = #{ethnic},</if>
+            <if test="staffId != null">staff_id = #{staffId},</if>
             <if test="birthday != null">birthday = #{birthday},</if>
             <if test="educationLevel != null">education_level = #{educationLevel},</if>
             <if test="workJoinTime != null">work_join_time = #{workJoinTime},</if>

ruoyi-ui/src/views/branch/sqrjjfzmc/index.vue

@@ -67,6 +67,7 @@
     <el-table v-loading="loading" :data="memberList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="党支部" align="center" prop="deptId" :formatter="deptListFormat"/>
+      <el-table-column label="工号" align="center" prop="staffId"/>
       <el-table-column label="姓名" align="center" prop="nickName"/>
       <el-table-column label="性别" align="center" prop="sex" :formatter="sysUserSexFormat"/>
       <el-table-column label="民族" align="center" prop="ethnic" :formatter="memberEthnicFormat" />
@@ -170,6 +171,11 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="工号" prop="staffId">
+              <el-input v-model="form.staffId" placeholder="请输入工号" />
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="民族" prop="ethnic">
               <el-select v-model="form.ethnic" placeholder="请选择民族">