LY 专项培训

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

@@ -7,6 +7,8 @@ import com.ruoyi.project.plant.domain.TStaffmgr;
 import com.ruoyi.project.plant.service.ITStaffmgrService;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
+import com.ruoyi.project.training.spec.domain.TStSuccessorScore;
+import com.ruoyi.project.training.spec.service.ITStSuccessorScoreService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -44,6 +46,8 @@ public class TStSuccessorController extends BaseController
 
     @Autowired
     private ISysUserService sysUserService;
+    @Autowired
+    private ITStSuccessorScoreService tStSuccessorScoreService;
 
     /**
      * 查询导师列表
@@ -89,6 +93,11 @@ public class TStSuccessorController extends BaseController
              ) {
             TStaffmgr staffmgr = tStaffmgrService.selectTStaffmgrByStaffId(t.getStaffId());
             t.setStaff(staffmgr);
+
+            TStSuccessorScore tStSuccessorScore = new TStSuccessorScore();
+            tStSuccessorScore.setStaffId(t.getStaffId());
+            List<TStSuccessorScore> scoreList = tStSuccessorScoreService.selectTStSuccessorScoreList(tStSuccessorScore);
+            t.setScoreList(scoreList);
         }
         return getDataTable(list);
     }

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

@@ -36,7 +36,6 @@ public class TStSuccessorScoreController extends BaseController
     /**
      * 查询继任者年度评分列表
      */
-    @PreAuthorize("@ss.hasPermi('spec:score:list')")
     @GetMapping("/list")
     public TableDataInfo list(TStSuccessorScore tStSuccessorScore)
     {
@@ -48,7 +47,6 @@ public class TStSuccessorScoreController extends BaseController
     /**
      * 导出继任者年度评分列表
      */
-    @PreAuthorize("@ss.hasPermi('spec:score:export')")
     @Log(title = "继任者年度评分", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TStSuccessorScore tStSuccessorScore)
@@ -61,7 +59,6 @@ public class TStSuccessorScoreController extends BaseController
     /**
      * 获取继任者年度评分详细信息
      */
-    @PreAuthorize("@ss.hasPermi('spec:score:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -71,7 +68,6 @@ public class TStSuccessorScoreController extends BaseController
     /**
      * 获取继任者年度评分详细信息
      */
-    @PreAuthorize("@ss.hasPermi('spec:score:query')")
     @GetMapping("/getTStSuccessorScore")
     public AjaxResult getTStSuccessorScore(TStSuccessorScore tStSuccessorScore)
     {
@@ -81,7 +77,6 @@ public class TStSuccessorScoreController extends BaseController
     /**
      * 新增继任者年度评分
      */
-    @PreAuthorize("@ss.hasPermi('spec:score:add')")
     @Log(title = "继任者年度评分", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TStSuccessorScore tStSuccessorScore)
@@ -92,7 +87,6 @@ public class TStSuccessorScoreController extends BaseController
     /**
      * 修改继任者年度评分
      */
-    @PreAuthorize("@ss.hasPermi('spec:score:edit')")
     @Log(title = "继任者年度评分", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TStSuccessorScore tStSuccessorScore)
@@ -103,7 +97,6 @@ public class TStSuccessorScoreController extends BaseController
     /**
      * 删除继任者年度评分
      */
-    @PreAuthorize("@ss.hasPermi('spec:score:remove')")
     @Log(title = "继任者年度评分", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

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

@@ -1,6 +1,8 @@
 package com.ruoyi.project.training.spec.domain;
 
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
@@ -27,6 +29,8 @@ public class TStSuccessor extends BaseEntity
 
     private TStaffmgr staff;
 
+    private List<TStSuccessorScore>  scoreList;
+
     /** 培训员工编号 */
     @Excel(name = "培训员工姓名")
     private String staffName;
@@ -74,6 +78,14 @@ public class TStSuccessor extends BaseEntity
     @Excel(name = "部门名称")
     private String deptName;
 
+    public List<TStSuccessorScore> getScoreList() {
+        return scoreList;
+    }
+
+    public void setScoreList(List<TStSuccessorScore> scoreList) {
+        this.scoreList = scoreList;
+    }
+
     public String getDeptName() {
         return deptName;
     }

master/src/main/java/com/ruoyi/project/training/spec/mapper/TStSuccessorScoreMapper.java

@@ -6,11 +6,11 @@ import com.ruoyi.project.training.spec.domain.TStSuccessorScore;
 
 /**
  * 继任者年度评分Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2022-05-17
  */
-public interface TStSuccessorScoreMapper 
+public interface TStSuccessorScoreMapper
 {
     /**
      * 查询继任者年度评分
@@ -22,7 +22,7 @@ public interface TStSuccessorScoreMapper
 
     /**
      * 查询继任者年度评分
-     * 
+     *
      * @param id 继任者年度评分ID
      * @return 继任者年度评分
      */
@@ -30,16 +30,15 @@ public interface TStSuccessorScoreMapper
 
     /**
      * 查询继任者年度评分列表
-     * 
+     *
      * @param tStSuccessorScore 继任者年度评分
      * @return 继任者年度评分集合
      */
-    @DataScope(deptAlias = "d")
     public List<TStSuccessorScore> selectTStSuccessorScoreList(TStSuccessorScore tStSuccessorScore);
 
     /**
      * 新增继任者年度评分
-     * 
+     *
      * @param tStSuccessorScore 继任者年度评分
      * @return 结果
      */
@@ -47,7 +46,7 @@ public interface TStSuccessorScoreMapper
 
     /**
      * 修改继任者年度评分
-     * 
+     *
      * @param tStSuccessorScore 继任者年度评分
      * @return 结果
      */
@@ -55,7 +54,7 @@ public interface TStSuccessorScoreMapper
 
     /**
      * 删除继任者年度评分
-     * 
+     *
      * @param id 继任者年度评分ID
      * @return 结果
      */
@@ -63,7 +62,7 @@ public interface TStSuccessorScoreMapper
 
     /**
      * 批量删除继任者年度评分
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

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

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.training.spec.mapper.TStSuccessorScoreMapper">
-    
+
     <resultMap type="TStSuccessorScore" id="TStSuccessorScoreResult">
         <result property="id"    column="id"    />
         <result property="staffId"    column="staff_id"    />
@@ -17,7 +17,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="quarterThree"    column="quarter_three"    />
         <result property="quarterFour"    column="quarter_four"    />
         <result property="year"    column="year"    />
-        <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTStSuccessorScoreVo">
@@ -42,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTStSuccessorScoreList" parameterType="TStSuccessorScore" resultMap="TStSuccessorScoreResult">
         <include refid="selectTStSuccessorScoreVo"/>
-        <where>  
+        <where>
             <if test="staffId != null  and staffId != ''"> and staff_id = #{staffId}</if>
             <if test="createrCode != null  and createrCode != ''"> and creater_code = #{createrCode}</if>
             <if test="createdate != null "> and createdate = #{createdate}</if>
@@ -58,12 +57,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTStSuccessorScoreById" parameterType="Long" resultMap="TStSuccessorScoreResult">
         <include refid="selectTStSuccessorScoreVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTStSuccessorScore" parameterType="TStSuccessorScore">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_st_successor_score.NEXTVAL as id FROM DUAL
@@ -127,5 +126,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

ui/src/api/training/spec/plan.js

@@ -21,7 +21,7 @@ export function listPlanSeasonal(query) {
 // 根据导师ID查询学员列表
 export function getSuccessorListByMentorId(data) {
   return request({
-    url: '/spec/plan/getSuccessorListByMentorId',
+    url: '/spec/plan/listSuccessorsByMentorId',
     method: 'get',
     params: data
   })