王子文 专项培训 - 培训计划

1) 权限分配：导师查看自己学员的培训计划
2) 权限分配：导师查看自己学员的名单下拉列表

master/src/main/java/com/ruoyi/project/training/spec/controller/TStPlanController.java

@@ -47,7 +47,6 @@ public class TStPlanController extends BaseController
     /**
      * 根据STAFF_ID查询培训计划列表
      *
-     *
      * @autor 王子文
      * @date 2022年4月20日
      * @param tStPlan 培训计划对象
@@ -75,6 +74,10 @@ public class TStPlanController extends BaseController
     @PreAuthorize("@ss.hasPermi('spec:plan:list')")
     @GetMapping("/getSuccessorListByMentorId")
     public AjaxResult getSuccessorListByMentorId(TStSuccessor tStSuccessor) {
+        Long userId = getUserId();
+        SysUser sysUser = sysUserService.selectUserById(userId);
+        String staffId = sysUser.getStaffId();
+        tStSuccessor.setMentorStaffId(staffId);
         List<TStSuccessor> tStSuccessors = tStSuccessorService.selectTStSuccessorListByMentorId(tStSuccessor);
         return AjaxResult.success(tStSuccessors);
     }
@@ -86,6 +89,10 @@ public class TStPlanController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(TStPlan tStPlan)
     {
+        Long userId = getUserId();
+        SysUser sysUser = sysUserService.selectUserById(userId);
+        String staffId = sysUser.getStaffId();
+        tStPlan.setMentorStaffId(staffId);
         startPage();
         List<TStPlan> list = tStPlanService.selectTStPlanList(tStPlan);
         return getDataTable(list);

master/src/main/java/com/ruoyi/project/training/spec/domain/TStPlan.java

@@ -28,6 +28,14 @@ public class TStPlan extends BaseEntity
     @Excel(name = "培训员工姓名")
     private String staffName;
 
+    // 王子文 2022年4月21日 添加
+    /** 导师编号 */
+    private String mentorStaffId;
+
+    // 王子文 2022年4月21日 添加
+    /** 导师姓名 */
+    private String mentorStaffName;
+
     /** 培训内容 */
     @Excel(name = "培训内容")
     private String plantName;
@@ -85,6 +93,22 @@ public class TStPlan extends BaseEntity
     /** 综合评价 */
     private String overallComment;
 
+    public String getMentorStaffId() {
+        return mentorStaffId;
+    }
+
+    public void setMentorStaffId(String mentorStaffId) {
+        this.mentorStaffId = mentorStaffId;
+    }
+
+    public String getMentorStaffName() {
+        return mentorStaffName;
+    }
+
+    public void setMentorStaffName(String mentorStaffName) {
+        this.mentorStaffName = mentorStaffName;
+    }
+
     public String getOverallComment() {
         return overallComment;
     }

master/src/main/resources/mybatis/training/spec/TStPlanMapper.xml

@@ -32,9 +32,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 王子文 2022年4月19日 10点28分 -->
         <!-- 添加 表连接 sys_user u -->
         <!-- 添加 结果字段 u.nick_name -->
-        select d.overall_comment, d.score, d.id, d.staff_id,d.APPROVE_STATUS, u.nick_name, d.plant_name, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.start_date, d.end_date, d.class_hour, d.class_content, d.study_state ,s.dept_name from t_st_plan d
+        select suc.MENTOR_STAFF_ID, d.overall_comment, d.score, d.id, d.staff_id,d.APPROVE_STATUS, u.nick_name, d.plant_name, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.start_date, d.end_date, d.class_hour, d.class_content, d.study_state ,s.dept_name from t_st_plan d
         left join sys_dept s on s.dept_id = d.dept_id
         left join sys_user u on d.staff_id = u.staffid
+        left join T_ST_SUCCESSOR suc on d.STAFF_ID = suc.STAFF_ID
     </sql>
 
     <!--王子文 2022年4月20日 09点30分 添加-->
@@ -57,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="endDate != null "> and end_date = #{endDate}</if>
             <if test="classHour != null  and classHour != ''"> and class_hour = #{classHour}</if>
             <if test="studyState != null  and studyState != ''"> and study_state = #{studyState}</if>
+            <if test="mentorStaffId != null  and mentorStaffId != ''"> and mentor_staff_id = #{mentorStaffId}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

ui/src/views/training/spec/plan/index.vue

@@ -466,7 +466,7 @@ export default {
       successorOptions: [],
       // 包含导师ID的查询对象
       queryObject: {
-        mentorStaffId: "00432"
+        mentorStaffId: ""
       },
       // 用户导入参数
       upload: {