王子文 专项培养 季度回顾

1) 导师下拉列表
2) 邀请导师，反馈表新增parent_id为某学员、某年、某季度主键，mentor_id为受邀导师id的记录
3) 按学员、年、季度查询培养计划

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

@@ -264,6 +264,16 @@ public class TStFeedbackController extends BaseController
         return util.exportExcel(list, "feedback");
     }
 
+    /**
+     * 获取专项培训反馈详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('spec:feedback:query')")
+    @GetMapping(value = "/getInfoByParams")
+    public AjaxResult getInfoByParams(TStFeedback tStFeedback)
+    {
+        return AjaxResult.success(tStFeedbackService.selectTStFeedbackByParams(tStFeedback));
+    }
+
     /**
      * 获取专项培训反馈详细信息
      */

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

@@ -67,4 +67,12 @@ public interface TStFeedbackMapper
      * @return 结果
      */
     public int deleteTStFeedbackByIds(Long[] ids);
+
+    /**
+     * 查询专项培训反馈
+     *
+     * @param tStFeedback 专项培训反馈
+     * @return 专项培训反馈
+     */
+    public TStFeedback selectTStFeedbackByParams(TStFeedback tStFeedback);
 }

master/src/main/java/com/ruoyi/project/training/spec/service/ITStFeedbackService.java

@@ -66,4 +66,12 @@ public interface ITStFeedbackService
      * @return 结果
      */
     public int deleteTStFeedbackById(Long id);
+
+    /**
+     * 查询专项培训反馈
+     *
+     * @param tStFeedback 专项培训反馈
+     * @return 专项培训反馈
+     */
+    public TStFeedback selectTStFeedbackByParams(TStFeedback tStFeedback);
 }

master/src/main/java/com/ruoyi/project/training/spec/service/impl/TStFeedbackServiceImpl.java

@@ -101,4 +101,15 @@ public class TStFeedbackServiceImpl implements ITStFeedbackService
     {
         return tStFeedbackMapper.deleteTStFeedbackById(id);
     }
+
+    /**
+     * 查询专项培训反馈
+     *
+     * @param tStFeedback 专项培训反馈
+     * @return 专项培训反馈
+     */
+    @Override
+    public TStFeedback selectTStFeedbackByParams(TStFeedback tStFeedback) {
+        return tStFeedbackMapper.selectTStFeedbackByParams(tStFeedback);
+    }
 }

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

@@ -63,6 +63,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        to_number(replace(d.feedback_month,',','')) asc
     </select>
 
+    <select id="selectTStFeedbackByParams" parameterType="TStFeedback" resultMap="TStFeedbackResult">
+        <include refid="selectTStFeedbackVo"/>
+        <where>
+            <if test="feedbackType != null "> and feedback_type = #{feedbackType}</if>
+            <if test="mentorId != null  and mentorId != ''"> and mentor_id = #{mentorId}</if>
+            <if test="successorId != null  and successorId != ''"> and successor_id = #{successorId}</if>
+            <if test="parentId != null "> and parent_id = #{parentId}</if>
+            <if test="planId != null "> and plan_id = #{planId}</if>
+            <if test="feedbackYear != null  and feedbackYear != ''"> and feedback_year = #{feedbackYear}</if>
+            <if test="feedbackSeason != null  and feedbackSeason != ''"> and feedback_season = #{feedbackSeason}</if>
+            <if test="feedbackMonth != null  and feedbackMonth != ''"> and feedback_month = #{feedbackMonth}</if>
+            <if test="successorFeedback != null  and successorFeedback != ''"> and successor_feedback = #{successorFeedback}</if>
+            <if test="mentorFeedback != null  and mentorFeedback != ''"> and mentor_feedback = #{mentorFeedback}</if>
+            <if test="feedbackScore != null  and feedbackScore != ''"> and feedback_score = #{feedbackScore}</if>
+            <if test="feedbackStatus != null "> and feedback_status = #{feedbackStatus}</if>
+            <if test="meetingDate != null "> and meeting_date = #{meetingDate}</if>
+        </where>
+    </select>
+
     <select id="selectTStFeedbackByPlanId" parameterType="Long" resultMap="TStFeedbackResult">
         <include refid="selectTStFeedbackVo"/>
         where plan_id = #{planId}

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

@@ -45,6 +45,15 @@ export function listFeedback(query) {
   })
 }
 
+// 查询 专项培养反馈详细
+export function getFeedbackByParams(query) {
+  return request({
+    url: '/spec/feedback/getInfoByParams/',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询 专项培养反馈详细
 export function getFeedbackByPlanId(planId) {
   return request({

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

@@ -800,7 +800,7 @@ export default {
       // 导师反馈内容，有则修改，无则新增
       if (this.mentorFeedback == null) {
         addFeedback(this.feedbackParams).then(response => {
-          // 后期需要发邮件通知学员
+          // 发邮件通知学员
 
           this.feedbackDialog.open = false;
           // 修改学习状态为1已完成
@@ -816,7 +816,7 @@ export default {
         });
       } else {
         updateFeedback(this.feedbackParams).then(response => {
-          // 后期需要发邮件通知学员
+          // 发邮件通知学员
 
           this.feedbackDialog.open = false;
           // 修改学习状态为1已完成
@@ -839,7 +839,7 @@ export default {
       // 导师反馈内容：有则修改，无则新增
       if (this.mentorFeedback == null) {
         addFeedback(this.feedbackParams).then(response => {
-          // 后期需要发邮件通知学员
+          // 发邮件通知学员
 
           this.feedbackDialog.open = false;
         // 修改学习状态为3导师已反馈
@@ -856,7 +856,7 @@ export default {
         });
       } else {
         updateFeedback(this.feedbackParams).then(response => {
-          // 后期需要发邮件通知学员
+          // 发邮件通知学员
 
           this.feedbackDialog.open = false;
         // 修改学习状态为3导师已反馈
@@ -1047,12 +1047,12 @@ export default {
         this.loading = false;
       });
     },
-     /** 查询部门下拉树结构 */
-     getTreeselect() {
-          treeselect().then(response => {
-              this.deptOptions = response.data;
-          });
-     },
+    /** 查询部门下拉树结构 */
+    getTreeselect() {
+        treeselect().then(response => {
+            this.deptOptions = response.data;
+        });
+    },
     /** 学习状态字典翻译 */
     studyStateFormat(row, column) {
       return this.selectDictLabel(this.studyStateOptions, row.studyState);