王子文

master/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -124,10 +124,6 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/ehs/approvedanger/processImg/**").anonymous()
                 .antMatchers("/sems/historyYlrq/exportPDFForYear").anonymous()
                 .antMatchers("/sems/historyYlgd/exportPDFForYear").anonymous()
-                // 王子文 2022年4月15日 添加 用于 Postman API 测试
-                .antMatchers("/aspen/dashboarddayelec/list").anonymous()
-                // 王子文 2022年4月18日 添加 用于 Postman API 测试
-                .antMatchers("/spec/plan/getSuccessorListByMentorId").permitAll()
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()
                 .and()

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

@@ -1,6 +1,13 @@
 package com.ruoyi.project.training.spec.controller;
 
+import java.util.ArrayList;
 import java.util.List;
+
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.service.ISysUserService;
+import com.ruoyi.project.training.spec.domain.TStFeedbackVO;
+import com.ruoyi.project.training.spec.domain.TStPlan;
+import com.ruoyi.project.training.spec.service.ITStPlanService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -24,15 +31,70 @@ import com.ruoyi.framework.web.page.TableDataInfo;
  * 专项培训反馈Controller
  *
  * @author ruoyi
- * @date 2022-04-24
+ * @date 2022-04-26
  */
 @RestController
-@RequestMapping("/spec/feedback/successor")
+@RequestMapping("/spec/feedback")
 public class TStFeedbackController extends BaseController
 {
     @Autowired
     private ITStFeedbackService tStFeedbackService;
 
+    @Autowired
+    private ITStPlanService tStPlanService;
+
+    @Autowired
+    private ISysUserService sysUserService;
+
+    /**
+     * 学员查询月度反馈列表
+     */
+//    @PreAuthorize("@ss.hasPermi('spec:feedback:list')")
+    @GetMapping("/list/successor/month")
+    public TableDataInfo listSuccessorMonth(TStFeedback tStFeedback)
+    {
+        // 获取当前登录用户
+        Long userId = getUserId();
+        SysUser sysUser = sysUserService.selectUserById(userId);
+        String staffId = sysUser.getStaffId();
+        // 设置学员ID为当前登录用户
+        tStFeedback.setSuccessorId(staffId);
+        // 设置反馈类型为“月度反馈”
+        tStFeedback.setFeedbackType(2L);
+        startPage();
+        // 查询月度反馈列表
+        List<TStFeedback> list = tStFeedbackService.selectTStFeedbackList(tStFeedback);
+        // 月度反馈VO列表
+        List<TStFeedbackVO> newList = new ArrayList<>();
+        for (TStFeedback feedback : list) {
+            feedback.setSuccessorId(staffId);
+            // 查询月度反馈中包含的计划列表
+            List<TStPlan> monthlyTStPlanList = tStPlanService.selectMonthlyTStPlanList(feedback);
+            // 月度反馈VO
+            TStFeedbackVO tStFeedbackVO = new TStFeedbackVO();
+            // 复制对象
+            tStFeedbackVO.setId(feedback.getId());
+            tStFeedbackVO.setFeedbackType(feedback.getFeedbackType());
+            tStFeedbackVO.setFeedbackMonth(feedback.getFeedbackMonth());
+            tStFeedbackVO.setFeedbackSeason(feedback.getFeedbackSeason());
+            tStFeedbackVO.setFeedbackYear(feedback.getFeedbackYear());
+            tStFeedbackVO.setMentorId(feedback.getMentorId());
+            tStFeedbackVO.setSuccessorId(feedback.getSuccessorId());
+            tStFeedbackVO.setParentId(feedback.getParentId());
+            tStFeedbackVO.setPlanId(feedback.getPlanId());
+            tStFeedbackVO.setSuccessorFeedback(feedback.getSuccessorFeedback());
+            tStFeedbackVO.setMentorFeedback(feedback.getMentorFeedback());
+            tStFeedbackVO.setFeedbackScore(feedback.getFeedbackScore());
+            tStFeedbackVO.setFeedbackStatus(feedback.getFeedbackStatus());
+            tStFeedbackVO.setMeetingDate(feedback.getMeetingDate());
+            // 设置月度培训计划清单
+            tStFeedbackVO.setPlanList(monthlyTStPlanList);
+            newList.add(tStFeedbackVO);
+        }
+        System.out.println(newList);
+        return getDataTable(newList);
+    }
+
     /**
      * 查询专项培训反馈列表
      */

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

@@ -1,103 +0,0 @@
-package com.ruoyi.project.training.spec.controller;
-
-import java.util.List;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.training.spec.domain.TStFeedbackM;
-import com.ruoyi.project.training.spec.service.ITStFeedbackMService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
-
-/**
- * 专项培训反馈（导师）Controller
- *
- * @author ruoyi
- * @date 2022-04-24
- */
-@RestController
-@RequestMapping("/spec/feedback/mentor")
-public class TStFeedbackMController extends BaseController
-{
-    @Autowired
-    private ITStFeedbackMService tStFeedbackMService;
-
-    /**
-     * 查询专项培训反馈（导师）列表
-     */
-    @PreAuthorize("@ss.hasPermi('spec:m:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(TStFeedbackM tStFeedbackM)
-    {
-        startPage();
-        List<TStFeedbackM> list = tStFeedbackMService.selectTStFeedbackMList(tStFeedbackM);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出专项培训反馈（导师）列表
-     */
-    @PreAuthorize("@ss.hasPermi('spec:m:export')")
-    @Log(title = "专项培训反馈（导师）", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(TStFeedbackM tStFeedbackM)
-    {
-        List<TStFeedbackM> list = tStFeedbackMService.selectTStFeedbackMList(tStFeedbackM);
-        ExcelUtil<TStFeedbackM> util = new ExcelUtil<TStFeedbackM>(TStFeedbackM.class);
-        return util.exportExcel(list, "m");
-    }
-
-    /**
-     * 获取专项培训反馈（导师）详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('spec:m:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(tStFeedbackMService.selectTStFeedbackMById(id));
-    }
-
-    /**
-     * 新增专项培训反馈（导师）
-     */
-    @PreAuthorize("@ss.hasPermi('spec:m:add')")
-    @Log(title = "专项培训反馈（导师）", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody TStFeedbackM tStFeedbackM)
-    {
-        return toAjax(tStFeedbackMService.insertTStFeedbackM(tStFeedbackM));
-    }
-
-    /**
-     * 修改专项培训反馈（导师）
-     */
-    @PreAuthorize("@ss.hasPermi('spec:m:edit')")
-    @Log(title = "专项培训反馈（导师）", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody TStFeedbackM tStFeedbackM)
-    {
-        return toAjax(tStFeedbackMService.updateTStFeedbackM(tStFeedbackM));
-    }
-
-    /**
-     * 删除专项培训反馈（导师）
-     */
-    @PreAuthorize("@ss.hasPermi('spec:m:remove')")
-    @Log(title = "专项培训反馈（导师）", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(tStFeedbackMService.deleteTStFeedbackMByIds(ids));
-    }
-}

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

@@ -1,103 +0,0 @@
-package com.ruoyi.project.training.spec.controller;
-
-import java.util.List;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.training.spec.domain.TStFeedbackMR;
-import com.ruoyi.project.training.spec.service.ITStFeedbackMRService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
-
-/**
- * 专项培训反馈-导师关系Controller
- *
- * @author ruoyi
- * @date 2022-04-24
- */
-@RestController
-@RequestMapping("/spec/mr")
-public class TStFeedbackMRController extends BaseController
-{
-    @Autowired
-    private ITStFeedbackMRService tStFeedbackMRService;
-
-    /**
-     * 查询专项培训反馈-导师关系列表
-     */
-    @PreAuthorize("@ss.hasPermi('spec:r:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(TStFeedbackMR tStFeedbackMR)
-    {
-        startPage();
-        List<TStFeedbackMR> list = tStFeedbackMRService.selectTStFeedbackMRList(tStFeedbackMR);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出专项培训反馈-导师关系列表
-     */
-    @PreAuthorize("@ss.hasPermi('spec:r:export')")
-    @Log(title = "专项培训反馈-导师关系", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(TStFeedbackMR tStFeedbackMR)
-    {
-        List<TStFeedbackMR> list = tStFeedbackMRService.selectTStFeedbackMRList(tStFeedbackMR);
-        ExcelUtil<TStFeedbackMR> util = new ExcelUtil<TStFeedbackMR>(TStFeedbackMR.class);
-        return util.exportExcel(list, "r");
-    }
-
-    /**
-     * 获取专项培训反馈-导师关系详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('spec:r:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(tStFeedbackMRService.selectTStFeedbackMRById(id));
-    }
-
-    /**
-     * 新增专项培训反馈-导师关系
-     */
-    @PreAuthorize("@ss.hasPermi('spec:r:add')")
-    @Log(title = "专项培训反馈-导师关系", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody TStFeedbackMR tStFeedbackMR)
-    {
-        return toAjax(tStFeedbackMRService.insertTStFeedbackMR(tStFeedbackMR));
-    }
-
-    /**
-     * 修改专项培训反馈-导师关系
-     */
-    @PreAuthorize("@ss.hasPermi('spec:r:edit')")
-    @Log(title = "专项培训反馈-导师关系", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody TStFeedbackMR tStFeedbackMR)
-    {
-        return toAjax(tStFeedbackMRService.updateTStFeedbackMR(tStFeedbackMR));
-    }
-
-    /**
-     * 删除专项培训反馈-导师关系
-     */
-    @PreAuthorize("@ss.hasPermi('spec:r:remove')")
-    @Log(title = "专项培训反馈-导师关系", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(tStFeedbackMRService.deleteTStFeedbackMRByIds(ids));
-    }
-}

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

@@ -1,103 +0,0 @@
-package com.ruoyi.project.training.spec.controller;
-
-import java.util.List;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.training.spec.domain.TStFeedbackPR;
-import com.ruoyi.project.training.spec.service.ITStFeedbackPRService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
-
-/**
- * 专项培训反馈-专项培训计划关联Controller
- *
- * @author ruoyi
- * @date 2022-04-24
- */
-@RestController
-@RequestMapping("/spec/pr")
-public class TStFeedbackPRController extends BaseController
-{
-    @Autowired
-    private ITStFeedbackPRService tStFeedbackPRService;
-
-    /**
-     * 查询专项培训反馈-专项培训计划关联列表
-     */
-    @PreAuthorize("@ss.hasPermi('spec:r:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(TStFeedbackPR tStFeedbackPR)
-    {
-        startPage();
-        List<TStFeedbackPR> list = tStFeedbackPRService.selectTStFeedbackPRList(tStFeedbackPR);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出专项培训反馈-专项培训计划关联列表
-     */
-    @PreAuthorize("@ss.hasPermi('spec:r:export')")
-    @Log(title = "专项培训反馈-专项培训计划关联", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(TStFeedbackPR tStFeedbackPR)
-    {
-        List<TStFeedbackPR> list = tStFeedbackPRService.selectTStFeedbackPRList(tStFeedbackPR);
-        ExcelUtil<TStFeedbackPR> util = new ExcelUtil<TStFeedbackPR>(TStFeedbackPR.class);
-        return util.exportExcel(list, "r");
-    }
-
-    /**
-     * 获取专项培训反馈-专项培训计划关联详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('spec:r:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(tStFeedbackPRService.selectTStFeedbackPRById(id));
-    }
-
-    /**
-     * 新增专项培训反馈-专项培训计划关联
-     */
-    @PreAuthorize("@ss.hasPermi('spec:r:add')")
-    @Log(title = "专项培训反馈-专项培训计划关联", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody TStFeedbackPR tStFeedbackPR)
-    {
-        return toAjax(tStFeedbackPRService.insertTStFeedbackPR(tStFeedbackPR));
-    }
-
-    /**
-     * 修改专项培训反馈-专项培训计划关联
-     */
-    @PreAuthorize("@ss.hasPermi('spec:r:edit')")
-    @Log(title = "专项培训反馈-专项培训计划关联", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody TStFeedbackPR tStFeedbackPR)
-    {
-        return toAjax(tStFeedbackPRService.updateTStFeedbackPR(tStFeedbackPR));
-    }
-
-    /**
-     * 删除专项培训反馈-专项培训计划关联
-     */
-    @PreAuthorize("@ss.hasPermi('spec:r:remove')")
-    @Log(title = "专项培训反馈-专项培训计划关联", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(tStFeedbackPRService.deleteTStFeedbackPRByIds(ids));
-    }
-}

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

@@ -28,7 +28,7 @@ import com.ruoyi.framework.web.page.TableDataInfo;
  * @date 2022-04-20
  */
 @RestController
-@RequestMapping("/spec/feedback")
+@RequestMapping("/spec/planfeedback")
 public class TStPlanFeedbackController extends BaseController
 {
     @Autowired

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

@@ -11,40 +11,67 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * 专项培训反馈对象 t_st_feedback
  *
  * @author ruoyi
- * @date 2022-04-24
+ * @date 2022-04-26
  */
 public class TStFeedback extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    /** 主键 */
     private Long id;
 
+    /** 反馈类型 */
+    @Excel(name = "反馈类型")
+    private Long feedbackType;
+
+    /** 导师ID */
+    @Excel(name = "导师ID")
+    private String mentorId;
+
+    /** 学员ID */
+    @Excel(name = "学员ID")
+    private String successorId;
+
+    /** 受邀导师父级主键ID */
+    @Excel(name = "受邀导师父级主键ID")
+    private Long parentId;
+
+    /** 培训计划ID */
+    @Excel(name = "培训计划ID")
+    private Long planId;
+
+    /** 年 */
+    @Excel(name = "年")
+    private String feedbackYear;
+
+    /** 季度 */
+    @Excel(name = "季度")
+    private String feedbackSeason;
+
+    /** 月 */
+    @Excel(name = "月")
+    private String feedbackMonth;
+
     /** 学员反馈 */
     @Excel(name = "学员反馈")
-    private String successorComment;
+    private String successorFeedback;
 
-    /** 修改人编号 */
-    @Excel(name = "修改人编号")
-    private String updaterCode;
+    /** 导师反馈 */
+    @Excel(name = "导师反馈")
+    private String mentorFeedback;
 
-    /** 修改日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    @Excel(name = "修改日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date updatedate;
+    /** 导师评分 */
+    @Excel(name = "导师评分")
+    private String feedbackScore;
 
-    /** 创建人编号 */
-    @Excel(name = "创建人编号")
-    private String createrCode;
+    /** 反馈状态 */
+    @Excel(name = "反馈状态")
+    private Long feedbackStatus;
 
-    /** 创建日期 */
+    /** 面试会议日期 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    @Excel(name = "创建日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date createdate;
-
-    /** 反馈类型 1表示月度 2表示季度 */
-    @Excel(name = "反馈类型 1表示月度 2表示季度")
-    private Long feecbackType;
+    @Excel(name = "面试会议日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date meetingDate;
 
     public void setId(Long id)
     {
@@ -55,71 +82,141 @@ public class TStFeedback extends BaseEntity
     {
         return id;
     }
-    public void setSuccessorComment(String successorComment)
+    public void setFeedbackType(Long feedbackType)
+    {
+        this.feedbackType = feedbackType;
+    }
+
+    public Long getFeedbackType()
+    {
+        return feedbackType;
+    }
+    public void setMentorId(String mentorId)
+    {
+        this.mentorId = mentorId;
+    }
+
+    public String getMentorId()
+    {
+        return mentorId;
+    }
+    public void setSuccessorId(String successorId)
+    {
+        this.successorId = successorId;
+    }
+
+    public String getSuccessorId()
+    {
+        return successorId;
+    }
+    public void setParentId(Long parentId)
+    {
+        this.parentId = parentId;
+    }
+
+    public Long getParentId()
+    {
+        return parentId;
+    }
+    public void setPlanId(Long planId)
+    {
+        this.planId = planId;
+    }
+
+    public Long getPlanId()
+    {
+        return planId;
+    }
+    public void setFeedbackYear(String feedbackYear)
+    {
+        this.feedbackYear = feedbackYear;
+    }
+
+    public String getFeedbackYear()
+    {
+        return feedbackYear;
+    }
+    public void setFeedbackSeason(String feedbackSeason)
+    {
+        this.feedbackSeason = feedbackSeason;
+    }
+
+    public String getFeedbackSeason()
+    {
+        return feedbackSeason;
+    }
+    public void setFeedbackMonth(String feedbackMonth)
     {
-        this.successorComment = successorComment;
+        this.feedbackMonth = feedbackMonth;
     }
 
-    public String getSuccessorComment()
+    public String getFeedbackMonth()
     {
-        return successorComment;
+        return feedbackMonth;
     }
-    public void setUpdaterCode(String updaterCode)
+    public void setSuccessorFeedback(String successorFeedback)
     {
-        this.updaterCode = updaterCode;
+        this.successorFeedback = successorFeedback;
     }
 
-    public String getUpdaterCode()
+    public String getSuccessorFeedback()
     {
-        return updaterCode;
+        return successorFeedback;
     }
-    public void setUpdatedate(Date updatedate)
+    public void setMentorFeedback(String mentorFeedback)
     {
-        this.updatedate = updatedate;
+        this.mentorFeedback = mentorFeedback;
     }
 
-    public Date getUpdatedate()
+    public String getMentorFeedback()
     {
-        return updatedate;
+        return mentorFeedback;
     }
-    public void setCreaterCode(String createrCode)
+    public void setFeedbackScore(String feedbackScore)
     {
-        this.createrCode = createrCode;
+        this.feedbackScore = feedbackScore;
     }
 
-    public String getCreaterCode()
+    public String getFeedbackScore()
     {
-        return createrCode;
+        return feedbackScore;
     }
-    public void setCreatedate(Date createdate)
+    public void setFeedbackStatus(Long feedbackStatus)
     {
-        this.createdate = createdate;
+        this.feedbackStatus = feedbackStatus;
     }
 
-    public Date getCreatedate()
+    public Long getFeedbackStatus()
     {
-        return createdate;
+        return feedbackStatus;
     }
-    public void setFeecbackType(Long feecbackType)
+    public void setMeetingDate(Date meetingDate)
     {
-        this.feecbackType = feecbackType;
+        this.meetingDate = meetingDate;
     }
 
-    public Long getFeecbackType()
+    public Date getMeetingDate()
     {
-        return feecbackType;
+        return meetingDate;
     }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("successorComment", getSuccessorComment())
-            .append("updaterCode", getUpdaterCode())
-            .append("updatedate", getUpdatedate())
-            .append("createrCode", getCreaterCode())
-            .append("createdate", getCreatedate())
-            .append("feecbackType", getFeecbackType())
+            .append("feedbackType", getFeedbackType())
+            .append("mentorId", getMentorId())
+            .append("successorId", getSuccessorId())
+            .append("parentId", getParentId())
+            .append("planId", getPlanId())
+            .append("feedbackYear", getFeedbackYear())
+            .append("feedbackSeason", getFeedbackSeason())
+            .append("feedbackMonth", getFeedbackMonth())
+            .append("successorFeedback", getSuccessorFeedback())
+            .append("mentorFeedback", getMentorFeedback())
+            .append("feedbackScore", getFeedbackScore())
+            .append("feedbackStatus", getFeedbackStatus())
+            .append("meetingDate", getMeetingDate())
             .toString();
     }
 }

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

@@ -1,65 +0,0 @@
-package com.ruoyi.project.training.spec.domain;
-
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.framework.web.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 专项培训反馈（导师）对象 t_st_feedback_m
- *
- * @author ruoyi
- * @date 2022-04-24
- */
-public class TStFeedbackM extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** $column.columnComment */
-    private Long id;
-
-    /** 专项培训反馈编号 */
-    @Excel(name = "专项培训反馈编号")
-    private Long monthlyFeedbackId;
-
-    /** 导师综合评价 */
-    @Excel(name = "导师综合评价")
-    private String overallComment;
-
-    public void setId(Long id)
-    {
-        this.id = id;
-    }
-
-    public Long getId()
-    {
-        return id;
-    }
-    public void setMonthlyFeedbackId(Long monthlyFeedbackId)
-    {
-        this.monthlyFeedbackId = monthlyFeedbackId;
-    }
-
-    public Long getMonthlyFeedbackId()
-    {
-        return monthlyFeedbackId;
-    }
-    public void setOverallComment(String overallComment)
-    {
-        this.overallComment = overallComment;
-    }
-
-    public String getOverallComment()
-    {
-        return overallComment;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("monthlyFeedbackId", getMonthlyFeedbackId())
-            .append("overallComment", getOverallComment())
-            .toString();
-    }
-}

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

@@ -1,65 +0,0 @@
-package com.ruoyi.project.training.spec.domain;
-
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.framework.web.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 专项培训反馈-导师关系对象 t_st_feedback_m_r
- *
- * @author ruoyi
- * @date 2022-04-24
- */
-public class TStFeedbackMR extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** $column.columnComment */
-    private Long id;
-
-    /** 专项培训反馈编号 */
-    @Excel(name = "专项培训反馈编号")
-    private Long monthlyFeedbackId;
-
-    /** 专项培训反馈（导师）编号 */
-    @Excel(name = "专项培训反馈", readConverterExp = "导=师")
-    private Long monthlyFeedbackMId;
-
-    public void setId(Long id)
-    {
-        this.id = id;
-    }
-
-    public Long getId()
-    {
-        return id;
-    }
-    public void setMonthlyFeedbackId(Long monthlyFeedbackId)
-    {
-        this.monthlyFeedbackId = monthlyFeedbackId;
-    }
-
-    public Long getMonthlyFeedbackId()
-    {
-        return monthlyFeedbackId;
-    }
-    public void setMonthlyFeedbackMId(Long monthlyFeedbackMId)
-    {
-        this.monthlyFeedbackMId = monthlyFeedbackMId;
-    }
-
-    public Long getMonthlyFeedbackMId()
-    {
-        return monthlyFeedbackMId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("monthlyFeedbackId", getMonthlyFeedbackId())
-            .append("monthlyFeedbackMId", getMonthlyFeedbackMId())
-            .toString();
-    }
-}

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

@@ -1,65 +0,0 @@
-package com.ruoyi.project.training.spec.domain;
-
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.framework.web.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 专项培训反馈-专项培训计划关联对象 t_st_feedback_p_r
- *
- * @author ruoyi
- * @date 2022-04-24
- */
-public class TStFeedbackPR extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** $column.columnComment */
-    private Long id;
-
-    /** 专项培训反馈编号 */
-    @Excel(name = "专项培训反馈编号")
-    private Long monthlyFeedbackId;
-
-    /** 专项培训计划编号 */
-    @Excel(name = "专项培训计划编号")
-    private Long planId;
-
-    public void setId(Long id)
-    {
-        this.id = id;
-    }
-
-    public Long getId()
-    {
-        return id;
-    }
-    public void setMonthlyFeedbackId(Long monthlyFeedbackId)
-    {
-        this.monthlyFeedbackId = monthlyFeedbackId;
-    }
-
-    public Long getMonthlyFeedbackId()
-    {
-        return monthlyFeedbackId;
-    }
-    public void setPlanId(Long planId)
-    {
-        this.planId = planId;
-    }
-
-    public Long getPlanId()
-    {
-        return planId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("monthlyFeedbackId", getMonthlyFeedbackId())
-            .append("planId", getPlanId())
-            .toString();
-    }
-}

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

@@ -0,0 +1,235 @@
+package com.ruoyi.project.training.spec.domain;
+
+import java.util.ArrayList;
+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;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 专项培训反馈VO
+ *
+ * @author ruoyi
+ * @date 2022-04-26
+ */
+public class TStFeedbackVO
+{
+    private List<TStPlan> planList = new ArrayList<>();
+
+    public List<TStPlan> getPlanList() {
+        return planList;
+    }
+
+    public void setPlanList(List<TStPlan> planList) {
+        this.planList = planList;
+    }
+
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 反馈类型 */
+    @Excel(name = "反馈类型")
+    private Long feedbackType;
+
+    /** 导师ID */
+    @Excel(name = "导师ID")
+    private String mentorId;
+
+    /** 学员ID */
+    @Excel(name = "学员ID")
+    private String successorId;
+
+    /** 受邀导师父级主键ID */
+    @Excel(name = "受邀导师父级主键ID")
+    private Long parentId;
+
+    /** 培训计划ID */
+    @Excel(name = "培训计划ID")
+    private Long planId;
+
+    /** 年 */
+    @Excel(name = "年")
+    private String feedbackYear;
+
+    /** 季度 */
+    @Excel(name = "季度")
+    private String feedbackSeason;
+
+    /** 月 */
+    @Excel(name = "月")
+    private String feedbackMonth;
+
+    /** 学员反馈 */
+    @Excel(name = "学员反馈")
+    private String successorFeedback;
+
+    /** 导师反馈 */
+    @Excel(name = "导师反馈")
+    private String mentorFeedback;
+
+    /** 导师评分 */
+    @Excel(name = "导师评分")
+    private String feedbackScore;
+
+    /** 反馈状态 */
+    @Excel(name = "反馈状态")
+    private Long feedbackStatus;
+
+    /** 面试会议日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "面试会议日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date meetingDate;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setFeedbackType(Long feedbackType)
+    {
+        this.feedbackType = feedbackType;
+    }
+
+    public Long getFeedbackType()
+    {
+        return feedbackType;
+    }
+    public void setMentorId(String mentorId)
+    {
+        this.mentorId = mentorId;
+    }
+
+    public String getMentorId()
+    {
+        return mentorId;
+    }
+    public void setSuccessorId(String successorId)
+    {
+        this.successorId = successorId;
+    }
+
+    public String getSuccessorId()
+    {
+        return successorId;
+    }
+    public void setParentId(Long parentId)
+    {
+        this.parentId = parentId;
+    }
+
+    public Long getParentId()
+    {
+        return parentId;
+    }
+    public void setPlanId(Long planId)
+    {
+        this.planId = planId;
+    }
+
+    public Long getPlanId()
+    {
+        return planId;
+    }
+    public void setFeedbackYear(String feedbackYear)
+    {
+        this.feedbackYear = feedbackYear;
+    }
+
+    public String getFeedbackYear()
+    {
+        return feedbackYear;
+    }
+    public void setFeedbackSeason(String feedbackSeason)
+    {
+        this.feedbackSeason = feedbackSeason;
+    }
+
+    public String getFeedbackSeason()
+    {
+        return feedbackSeason;
+    }
+    public void setFeedbackMonth(String feedbackMonth)
+    {
+        this.feedbackMonth = feedbackMonth;
+    }
+
+    public String getFeedbackMonth()
+    {
+        return feedbackMonth;
+    }
+    public void setSuccessorFeedback(String successorFeedback)
+    {
+        this.successorFeedback = successorFeedback;
+    }
+
+    public String getSuccessorFeedback()
+    {
+        return successorFeedback;
+    }
+    public void setMentorFeedback(String mentorFeedback)
+    {
+        this.mentorFeedback = mentorFeedback;
+    }
+
+    public String getMentorFeedback()
+    {
+        return mentorFeedback;
+    }
+    public void setFeedbackScore(String feedbackScore)
+    {
+        this.feedbackScore = feedbackScore;
+    }
+
+    public String getFeedbackScore()
+    {
+        return feedbackScore;
+    }
+    public void setFeedbackStatus(Long feedbackStatus)
+    {
+        this.feedbackStatus = feedbackStatus;
+    }
+
+    public Long getFeedbackStatus()
+    {
+        return feedbackStatus;
+    }
+    public void setMeetingDate(Date meetingDate)
+    {
+        this.meetingDate = meetingDate;
+    }
+
+    public Date getMeetingDate()
+    {
+        return meetingDate;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("feedbackType", getFeedbackType())
+                .append("mentorId", getMentorId())
+                .append("successorId", getSuccessorId())
+                .append("parentId", getParentId())
+                .append("planId", getPlanId())
+                .append("feedbackYear", getFeedbackYear())
+                .append("feedbackSeason", getFeedbackSeason())
+                .append("feedbackMonth", getFeedbackMonth())
+                .append("successorFeedback", getSuccessorFeedback())
+                .append("mentorFeedback", getMentorFeedback())
+                .append("feedbackScore", getFeedbackScore())
+                .append("feedbackStatus", getFeedbackStatus())
+                .append("meetingDate", getMeetingDate())
+                .toString();
+    }
+}

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

@@ -1,63 +0,0 @@
-package com.ruoyi.project.training.spec.mapper;
-
-import java.util.List;
-import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
-import com.ruoyi.project.training.spec.domain.TStFeedbackM;
-
-/**
- * 专项培训反馈（导师）Mapper接口
- * 
- * @author ruoyi
- * @date 2022-04-24
- */
-public interface TStFeedbackMMapper 
-{
-    /**
-     * 查询专项培训反馈（导师）
-     * 
-     * @param id 专项培训反馈（导师）ID
-     * @return 专项培训反馈（导师）
-     */
-    public TStFeedbackM selectTStFeedbackMById(Long id);
-
-    /**
-     * 查询专项培训反馈（导师）列表
-     * 
-     * @param tStFeedbackM 专项培训反馈（导师）
-     * @return 专项培训反馈（导师）集合
-     */
-    @DataScope(deptAlias = "d")
-    public List<TStFeedbackM> selectTStFeedbackMList(TStFeedbackM tStFeedbackM);
-
-    /**
-     * 新增专项培训反馈（导师）
-     * 
-     * @param tStFeedbackM 专项培训反馈（导师）
-     * @return 结果
-     */
-    public int insertTStFeedbackM(TStFeedbackM tStFeedbackM);
-
-    /**
-     * 修改专项培训反馈（导师）
-     * 
-     * @param tStFeedbackM 专项培训反馈（导师）
-     * @return 结果
-     */
-    public int updateTStFeedbackM(TStFeedbackM tStFeedbackM);
-
-    /**
-     * 删除专项培训反馈（导师）
-     * 
-     * @param id 专项培训反馈（导师）ID
-     * @return 结果
-     */
-    public int deleteTStFeedbackMById(Long id);
-
-    /**
-     * 批量删除专项培训反馈（导师）
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteTStFeedbackMByIds(Long[] ids);
-}

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

@@ -1,63 +0,0 @@
-package com.ruoyi.project.training.spec.mapper;
-
-import java.util.List;
-import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
-import com.ruoyi.project.training.spec.domain.TStFeedbackMR;
-
-/**
- * 专项培训反馈-导师关系Mapper接口
- * 
- * @author ruoyi
- * @date 2022-04-24
- */
-public interface TStFeedbackMRMapper 
-{
-    /**
-     * 查询专项培训反馈-导师关系
-     * 
-     * @param id 专项培训反馈-导师关系ID
-     * @return 专项培训反馈-导师关系
-     */
-    public TStFeedbackMR selectTStFeedbackMRById(Long id);
-
-    /**
-     * 查询专项培训反馈-导师关系列表
-     * 
-     * @param tStFeedbackMR 专项培训反馈-导师关系
-     * @return 专项培训反馈-导师关系集合
-     */
-    @DataScope(deptAlias = "d")
-    public List<TStFeedbackMR> selectTStFeedbackMRList(TStFeedbackMR tStFeedbackMR);
-
-    /**
-     * 新增专项培训反馈-导师关系
-     * 
-     * @param tStFeedbackMR 专项培训反馈-导师关系
-     * @return 结果
-     */
-    public int insertTStFeedbackMR(TStFeedbackMR tStFeedbackMR);
-
-    /**
-     * 修改专项培训反馈-导师关系
-     * 
-     * @param tStFeedbackMR 专项培训反馈-导师关系
-     * @return 结果
-     */
-    public int updateTStFeedbackMR(TStFeedbackMR tStFeedbackMR);
-
-    /**
-     * 删除专项培训反馈-导师关系
-     * 
-     * @param id 专项培训反馈-导师关系ID
-     * @return 结果
-     */
-    public int deleteTStFeedbackMRById(Long id);
-
-    /**
-     * 批量删除专项培训反馈-导师关系
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteTStFeedbackMRByIds(Long[] ids);
-}

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

@@ -8,7 +8,7 @@ import com.ruoyi.project.training.spec.domain.TStFeedback;
  * 专项培训反馈Mapper接口
  * 
  * @author ruoyi
- * @date 2022-04-24
+ * @date 2022-04-26
  */
 public interface TStFeedbackMapper 
 {
@@ -26,7 +26,6 @@ public interface TStFeedbackMapper
      * @param tStFeedback 专项培训反馈
      * @return 专项培训反馈集合
      */
-    @DataScope(deptAlias = "d")
     public List<TStFeedback> selectTStFeedbackList(TStFeedback tStFeedback);
 
     /**

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

@@ -1,63 +0,0 @@
-package com.ruoyi.project.training.spec.mapper;
-
-import java.util.List;
-import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
-import com.ruoyi.project.training.spec.domain.TStFeedbackPR;
-
-/**
- * 专项培训反馈-专项培训计划关联Mapper接口
- * 
- * @author ruoyi
- * @date 2022-04-24
- */
-public interface TStFeedbackPRMapper 
-{
-    /**
-     * 查询专项培训反馈-专项培训计划关联
-     * 
-     * @param id 专项培训反馈-专项培训计划关联ID
-     * @return 专项培训反馈-专项培训计划关联
-     */
-    public TStFeedbackPR selectTStFeedbackPRById(Long id);
-
-    /**
-     * 查询专项培训反馈-专项培训计划关联列表
-     * 
-     * @param tStFeedbackPR 专项培训反馈-专项培训计划关联
-     * @return 专项培训反馈-专项培训计划关联集合
-     */
-    @DataScope(deptAlias = "d")
-    public List<TStFeedbackPR> selectTStFeedbackPRList(TStFeedbackPR tStFeedbackPR);
-
-    /**
-     * 新增专项培训反馈-专项培训计划关联
-     * 
-     * @param tStFeedbackPR 专项培训反馈-专项培训计划关联
-     * @return 结果
-     */
-    public int insertTStFeedbackPR(TStFeedbackPR tStFeedbackPR);
-
-    /**
-     * 修改专项培训反馈-专项培训计划关联
-     * 
-     * @param tStFeedbackPR 专项培训反馈-专项培训计划关联
-     * @return 结果
-     */
-    public int updateTStFeedbackPR(TStFeedbackPR tStFeedbackPR);
-
-    /**
-     * 删除专项培训反馈-专项培训计划关联
-     * 
-     * @param id 专项培训反馈-专项培训计划关联ID
-     * @return 结果
-     */
-    public int deleteTStFeedbackPRById(Long id);
-
-    /**
-     * 批量删除专项培训反馈-专项培训计划关联
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteTStFeedbackPRByIds(Long[] ids);
-}

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

@@ -2,6 +2,7 @@ package com.ruoyi.project.training.spec.mapper;
 
 import java.util.List;
 import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.training.spec.domain.TStFeedback;
 import com.ruoyi.project.training.spec.domain.TStPlan;
 
 /**
@@ -12,6 +13,13 @@ import com.ruoyi.project.training.spec.domain.TStPlan;
  */
 public interface TStPlanMapper
 {
+    /**
+     * 查询月度培训计划列表
+     * @param tStFeedback
+     * @return
+     */
+    List<TStPlan> selectMonthlyTStPlanList(TStFeedback tStFeedback);
+
     /**
      * 根据STAFF_ID查询培训计划列表
      * @autor 王子文

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

@@ -1,61 +0,0 @@
-package com.ruoyi.project.training.spec.service;
-
-import java.util.List;
-import com.ruoyi.project.training.spec.domain.TStFeedbackMR;
-
-/**
- * 专项培训反馈-导师关系Service接口
- * 
- * @author ruoyi
- * @date 2022-04-24
- */
-public interface ITStFeedbackMRService 
-{
-    /**
-     * 查询专项培训反馈-导师关系
-     * 
-     * @param id 专项培训反馈-导师关系ID
-     * @return 专项培训反馈-导师关系
-     */
-    public TStFeedbackMR selectTStFeedbackMRById(Long id);
-
-    /**
-     * 查询专项培训反馈-导师关系列表
-     * 
-     * @param tStFeedbackMR 专项培训反馈-导师关系
-     * @return 专项培训反馈-导师关系集合
-     */
-    public List<TStFeedbackMR> selectTStFeedbackMRList(TStFeedbackMR tStFeedbackMR);
-
-    /**
-     * 新增专项培训反馈-导师关系
-     * 
-     * @param tStFeedbackMR 专项培训反馈-导师关系
-     * @return 结果
-     */
-    public int insertTStFeedbackMR(TStFeedbackMR tStFeedbackMR);
-
-    /**
-     * 修改专项培训反馈-导师关系
-     * 
-     * @param tStFeedbackMR 专项培训反馈-导师关系
-     * @return 结果
-     */
-    public int updateTStFeedbackMR(TStFeedbackMR tStFeedbackMR);
-
-    /**
-     * 批量删除专项培训反馈-导师关系
-     * 
-     * @param ids 需要删除的专项培训反馈-导师关系ID
-     * @return 结果
-     */
-    public int deleteTStFeedbackMRByIds(Long[] ids);
-
-    /**
-     * 删除专项培训反馈-导师关系信息
-     * 
-     * @param id 专项培训反馈-导师关系ID
-     * @return 结果
-     */
-    public int deleteTStFeedbackMRById(Long id);
-}

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

@@ -1,61 +0,0 @@
-package com.ruoyi.project.training.spec.service;
-
-import java.util.List;
-import com.ruoyi.project.training.spec.domain.TStFeedbackM;
-
-/**
- * 专项培训反馈（导师）Service接口
- * 
- * @author ruoyi
- * @date 2022-04-24
- */
-public interface ITStFeedbackMService 
-{
-    /**
-     * 查询专项培训反馈（导师）
-     * 
-     * @param id 专项培训反馈（导师）ID
-     * @return 专项培训反馈（导师）
-     */
-    public TStFeedbackM selectTStFeedbackMById(Long id);
-
-    /**
-     * 查询专项培训反馈（导师）列表
-     * 
-     * @param tStFeedbackM 专项培训反馈（导师）
-     * @return 专项培训反馈（导师）集合
-     */
-    public List<TStFeedbackM> selectTStFeedbackMList(TStFeedbackM tStFeedbackM);
-
-    /**
-     * 新增专项培训反馈（导师）
-     * 
-     * @param tStFeedbackM 专项培训反馈（导师）
-     * @return 结果
-     */
-    public int insertTStFeedbackM(TStFeedbackM tStFeedbackM);
-
-    /**
-     * 修改专项培训反馈（导师）
-     * 
-     * @param tStFeedbackM 专项培训反馈（导师）
-     * @return 结果
-     */
-    public int updateTStFeedbackM(TStFeedbackM tStFeedbackM);
-
-    /**
-     * 批量删除专项培训反馈（导师）
-     * 
-     * @param ids 需要删除的专项培训反馈（导师）ID
-     * @return 结果
-     */
-    public int deleteTStFeedbackMByIds(Long[] ids);
-
-    /**
-     * 删除专项培训反馈（导师）信息
-     * 
-     * @param id 专项培训反馈（导师）ID
-     * @return 结果
-     */
-    public int deleteTStFeedbackMById(Long id);
-}

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

@@ -1,61 +0,0 @@
-package com.ruoyi.project.training.spec.service;
-
-import java.util.List;
-import com.ruoyi.project.training.spec.domain.TStFeedbackPR;
-
-/**
- * 专项培训反馈-专项培训计划关联Service接口
- * 
- * @author ruoyi
- * @date 2022-04-24
- */
-public interface ITStFeedbackPRService 
-{
-    /**
-     * 查询专项培训反馈-专项培训计划关联
-     * 
-     * @param id 专项培训反馈-专项培训计划关联ID
-     * @return 专项培训反馈-专项培训计划关联
-     */
-    public TStFeedbackPR selectTStFeedbackPRById(Long id);
-
-    /**
-     * 查询专项培训反馈-专项培训计划关联列表
-     * 
-     * @param tStFeedbackPR 专项培训反馈-专项培训计划关联
-     * @return 专项培训反馈-专项培训计划关联集合
-     */
-    public List<TStFeedbackPR> selectTStFeedbackPRList(TStFeedbackPR tStFeedbackPR);
-
-    /**
-     * 新增专项培训反馈-专项培训计划关联
-     * 
-     * @param tStFeedbackPR 专项培训反馈-专项培训计划关联
-     * @return 结果
-     */
-    public int insertTStFeedbackPR(TStFeedbackPR tStFeedbackPR);
-
-    /**
-     * 修改专项培训反馈-专项培训计划关联
-     * 
-     * @param tStFeedbackPR 专项培训反馈-专项培训计划关联
-     * @return 结果
-     */
-    public int updateTStFeedbackPR(TStFeedbackPR tStFeedbackPR);
-
-    /**
-     * 批量删除专项培训反馈-专项培训计划关联
-     * 
-     * @param ids 需要删除的专项培训反馈-专项培训计划关联ID
-     * @return 结果
-     */
-    public int deleteTStFeedbackPRByIds(Long[] ids);
-
-    /**
-     * 删除专项培训反馈-专项培训计划关联信息
-     * 
-     * @param id 专项培训反馈-专项培训计划关联ID
-     * @return 结果
-     */
-    public int deleteTStFeedbackPRById(Long id);
-}

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

@@ -7,13 +7,13 @@ import com.ruoyi.project.training.spec.domain.TStFeedback;
  * 专项培训反馈Service接口
  * 
  * @author ruoyi
- * @date 2022-04-24
+ * @date 2022-04-26
  */
 public interface ITStFeedbackService 
 {
     /**
      * 查询专项培训反馈
-     * 
+     *
      * @param id 专项培训反馈ID
      * @return 专项培训反馈
      */

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

@@ -1,6 +1,8 @@
 package com.ruoyi.project.training.spec.service;
 
 import java.util.List;
+
+import com.ruoyi.project.training.spec.domain.TStFeedback;
 import com.ruoyi.project.training.spec.domain.TStPlan;
 
 /**
@@ -11,6 +13,13 @@ import com.ruoyi.project.training.spec.domain.TStPlan;
  */
 public interface ITStPlanService
 {
+    /**
+     * 查询月度培训计划列表
+     * @param tStFeedback
+     * @return
+     */
+    List<TStPlan> selectMonthlyTStPlanList(TStFeedback tStFeedback);
+
     /**
      * 查询培训计划
      *

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

@@ -1,93 +0,0 @@
-package com.ruoyi.project.training.spec.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.project.training.spec.mapper.TStFeedbackMRMapper;
-import com.ruoyi.project.training.spec.domain.TStFeedbackMR;
-import com.ruoyi.project.training.spec.service.ITStFeedbackMRService;
-
-/**
- * 专项培训反馈-导师关系Service业务层处理
- *
- * @author ruoyi
- * @date 2022-04-24
- */
-@Service
-public class TStFeedbackMRServiceImpl implements ITStFeedbackMRService
-{
-    @Autowired
-    private TStFeedbackMRMapper tStFeedbackMRMapper;
-
-    /**
-     * 查询专项培训反馈-导师关系
-     *
-     * @param id 专项培训反馈-导师关系ID
-     * @return 专项培训反馈-导师关系
-     */
-    @Override
-    public TStFeedbackMR selectTStFeedbackMRById(Long id)
-    {
-        return tStFeedbackMRMapper.selectTStFeedbackMRById(id);
-    }
-
-    /**
-     * 查询专项培训反馈-导师关系列表
-     *
-     * @param tStFeedbackMR 专项培训反馈-导师关系
-     * @return 专项培训反馈-导师关系
-     */
-    @Override
-    public List<TStFeedbackMR> selectTStFeedbackMRList(TStFeedbackMR tStFeedbackMR)
-    {
-        return tStFeedbackMRMapper.selectTStFeedbackMRList(tStFeedbackMR);
-    }
-
-    /**
-     * 新增专项培训反馈-导师关系
-     *
-     * @param tStFeedbackMR 专项培训反馈-导师关系
-     * @return 结果
-     */
-    @Override
-    public int insertTStFeedbackMR(TStFeedbackMR tStFeedbackMR)
-    {
-        return tStFeedbackMRMapper.insertTStFeedbackMR(tStFeedbackMR);
-    }
-
-    /**
-     * 修改专项培训反馈-导师关系
-     *
-     * @param tStFeedbackMR 专项培训反馈-导师关系
-     * @return 结果
-     */
-    @Override
-    public int updateTStFeedbackMR(TStFeedbackMR tStFeedbackMR)
-    {
-        return tStFeedbackMRMapper.updateTStFeedbackMR(tStFeedbackMR);
-    }
-
-    /**
-     * 批量删除专项培训反馈-导师关系
-     *
-     * @param ids 需要删除的专项培训反馈-导师关系ID
-     * @return 结果
-     */
-    @Override
-    public int deleteTStFeedbackMRByIds(Long[] ids)
-    {
-        return tStFeedbackMRMapper.deleteTStFeedbackMRByIds(ids);
-    }
-
-    /**
-     * 删除专项培训反馈-导师关系信息
-     *
-     * @param id 专项培训反馈-导师关系ID
-     * @return 结果
-     */
-    @Override
-    public int deleteTStFeedbackMRById(Long id)
-    {
-        return tStFeedbackMRMapper.deleteTStFeedbackMRById(id);
-    }
-}

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

@@ -1,93 +0,0 @@
-package com.ruoyi.project.training.spec.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.project.training.spec.mapper.TStFeedbackMMapper;
-import com.ruoyi.project.training.spec.domain.TStFeedbackM;
-import com.ruoyi.project.training.spec.service.ITStFeedbackMService;
-
-/**
- * 专项培训反馈（导师）Service业务层处理
- *
- * @author ruoyi
- * @date 2022-04-24
- */
-@Service
-public class TStFeedbackMServiceImpl implements ITStFeedbackMService
-{
-    @Autowired
-    private TStFeedbackMMapper tStFeedbackMMapper;
-
-    /**
-     * 查询专项培训反馈（导师）
-     *
-     * @param id 专项培训反馈（导师）ID
-     * @return 专项培训反馈（导师）
-     */
-    @Override
-    public TStFeedbackM selectTStFeedbackMById(Long id)
-    {
-        return tStFeedbackMMapper.selectTStFeedbackMById(id);
-    }
-
-    /**
-     * 查询专项培训反馈（导师）列表
-     *
-     * @param tStFeedbackM 专项培训反馈（导师）
-     * @return 专项培训反馈（导师）
-     */
-    @Override
-    public List<TStFeedbackM> selectTStFeedbackMList(TStFeedbackM tStFeedbackM)
-    {
-        return tStFeedbackMMapper.selectTStFeedbackMList(tStFeedbackM);
-    }
-
-    /**
-     * 新增专项培训反馈（导师）
-     *
-     * @param tStFeedbackM 专项培训反馈（导师）
-     * @return 结果
-     */
-    @Override
-    public int insertTStFeedbackM(TStFeedbackM tStFeedbackM)
-    {
-        return tStFeedbackMMapper.insertTStFeedbackM(tStFeedbackM);
-    }
-
-    /**
-     * 修改专项培训反馈（导师）
-     *
-     * @param tStFeedbackM 专项培训反馈（导师）
-     * @return 结果
-     */
-    @Override
-    public int updateTStFeedbackM(TStFeedbackM tStFeedbackM)
-    {
-        return tStFeedbackMMapper.updateTStFeedbackM(tStFeedbackM);
-    }
-
-    /**
-     * 批量删除专项培训反馈（导师）
-     *
-     * @param ids 需要删除的专项培训反馈（导师）ID
-     * @return 结果
-     */
-    @Override
-    public int deleteTStFeedbackMByIds(Long[] ids)
-    {
-        return tStFeedbackMMapper.deleteTStFeedbackMByIds(ids);
-    }
-
-    /**
-     * 删除专项培训反馈（导师）信息
-     *
-     * @param id 专项培训反馈（导师）ID
-     * @return 结果
-     */
-    @Override
-    public int deleteTStFeedbackMById(Long id)
-    {
-        return tStFeedbackMMapper.deleteTStFeedbackMById(id);
-    }
-}

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

@@ -1,93 +0,0 @@
-package com.ruoyi.project.training.spec.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.project.training.spec.mapper.TStFeedbackPRMapper;
-import com.ruoyi.project.training.spec.domain.TStFeedbackPR;
-import com.ruoyi.project.training.spec.service.ITStFeedbackPRService;
-
-/**
- * 专项培训反馈-专项培训计划关联Service业务层处理
- *
- * @author ruoyi
- * @date 2022-04-24
- */
-@Service
-public class TStFeedbackPRServiceImpl implements ITStFeedbackPRService
-{
-    @Autowired
-    private TStFeedbackPRMapper tStFeedbackPRMapper;
-
-    /**
-     * 查询专项培训反馈-专项培训计划关联
-     *
-     * @param id 专项培训反馈-专项培训计划关联ID
-     * @return 专项培训反馈-专项培训计划关联
-     */
-    @Override
-    public TStFeedbackPR selectTStFeedbackPRById(Long id)
-    {
-        return tStFeedbackPRMapper.selectTStFeedbackPRById(id);
-    }
-
-    /**
-     * 查询专项培训反馈-专项培训计划关联列表
-     *
-     * @param tStFeedbackPR 专项培训反馈-专项培训计划关联
-     * @return 专项培训反馈-专项培训计划关联
-     */
-    @Override
-    public List<TStFeedbackPR> selectTStFeedbackPRList(TStFeedbackPR tStFeedbackPR)
-    {
-        return tStFeedbackPRMapper.selectTStFeedbackPRList(tStFeedbackPR);
-    }
-
-    /**
-     * 新增专项培训反馈-专项培训计划关联
-     *
-     * @param tStFeedbackPR 专项培训反馈-专项培训计划关联
-     * @return 结果
-     */
-    @Override
-    public int insertTStFeedbackPR(TStFeedbackPR tStFeedbackPR)
-    {
-        return tStFeedbackPRMapper.insertTStFeedbackPR(tStFeedbackPR);
-    }
-
-    /**
-     * 修改专项培训反馈-专项培训计划关联
-     *
-     * @param tStFeedbackPR 专项培训反馈-专项培训计划关联
-     * @return 结果
-     */
-    @Override
-    public int updateTStFeedbackPR(TStFeedbackPR tStFeedbackPR)
-    {
-        return tStFeedbackPRMapper.updateTStFeedbackPR(tStFeedbackPR);
-    }
-
-    /**
-     * 批量删除专项培训反馈-专项培训计划关联
-     *
-     * @param ids 需要删除的专项培训反馈-专项培训计划关联ID
-     * @return 结果
-     */
-    @Override
-    public int deleteTStFeedbackPRByIds(Long[] ids)
-    {
-        return tStFeedbackPRMapper.deleteTStFeedbackPRByIds(ids);
-    }
-
-    /**
-     * 删除专项培训反馈-专项培训计划关联信息
-     *
-     * @param id 专项培训反馈-专项培训计划关联ID
-     * @return 结果
-     */
-    @Override
-    public int deleteTStFeedbackPRById(Long id)
-    {
-        return tStFeedbackPRMapper.deleteTStFeedbackPRById(id);
-    }
-}

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

@@ -11,7 +11,7 @@ import com.ruoyi.project.training.spec.service.ITStFeedbackService;
  * 专项培训反馈Service业务层处理
  *
  * @author ruoyi
- * @date 2022-04-24
+ * @date 2022-04-26
  */
 @Service
 public class TStFeedbackServiceImpl implements ITStFeedbackService

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

@@ -1,6 +1,8 @@
 package com.ruoyi.project.training.spec.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.project.training.spec.domain.TStFeedback;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.project.training.spec.mapper.TStPlanMapper;
@@ -19,6 +21,11 @@ public class TStPlanServiceImpl implements ITStPlanService
     @Autowired
     private TStPlanMapper tStPlanMapper;
 
+    @Override
+    public List<TStPlan> selectMonthlyTStPlanList(TStFeedback tStFeedback) {
+        return tStPlanMapper.selectMonthlyTStPlanList(tStFeedback);
+    }
+
     /**
      * 查询培训计划
      *

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

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.training.spec.mapper.TStFeedbackMMapper">
-    
-    <resultMap type="TStFeedbackM" id="TStFeedbackMResult">
-        <result property="id"    column="id"    />
-        <result property="monthlyFeedbackId"    column="monthly_feedback_id"    />
-        <result property="overallComment"    column="overall_comment"    />
-        <result property="deptName" column="dept_name" />
-    </resultMap>
-
-    <sql id="selectTStFeedbackMVo">
-        select d.id, d.MENTOR_ID, d.overall_comment ,s.dept_name from t_st_feedback_m d
-      left join sys_dept s on s.dept_id = d.dept_id
-    </sql>
-
-    <select id="selectTStFeedbackMList" parameterType="TStFeedbackM" resultMap="TStFeedbackMResult">
-        <include refid="selectTStFeedbackMVo"/>
-        <where>  
-            <if test="monthlyFeedbackId != null "> and monthly_feedback_id = #{monthlyFeedbackId}</if>
-            <if test="overallComment != null  and overallComment != ''"> and overall_comment = #{overallComment}</if>
-            and d.del_flag = 0
-        </where>
-        <!-- 数据范围过滤 -->
-        ${params.dataScope}
-    </select>
-    
-    <select id="selectTStFeedbackMById" parameterType="Long" resultMap="TStFeedbackMResult">
-        <include refid="selectTStFeedbackMVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertTStFeedbackM" parameterType="TStFeedbackM">
-        insert into t_st_feedback_m
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="monthlyFeedbackId != null">monthly_feedback_id,</if>
-            <if test="overallComment != null">overall_comment,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="monthlyFeedbackId != null">#{monthlyFeedbackId},</if>
-            <if test="overallComment != null">#{overallComment},</if>
-         </trim>
-    </insert>
-
-    <update id="updateTStFeedbackM" parameterType="TStFeedbackM">
-        update t_st_feedback_m
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="monthlyFeedbackId != null">monthly_feedback_id = #{monthlyFeedbackId},</if>
-            <if test="overallComment != null">overall_comment = #{overallComment},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <update id="deleteTStFeedbackMById" parameterType="Long">
-        update t_st_feedback_m set del_flag = 2 where id = #{id}
-    </update>
-
-    <update id="deleteTStFeedbackMByIds" parameterType="String">
-        update t_st_feedback_m set del_flag = 2 where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </update>
-    
-</mapper>

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

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.training.spec.mapper.TStFeedbackMRMapper">
-    
-    <resultMap type="TStFeedbackMR" id="TStFeedbackMRResult">
-        <result property="id"    column="id"    />
-        <result property="monthlyFeedbackId"    column="monthly_feedback_id"    />
-        <result property="monthlyFeedbackMId"    column="monthly_feedback_m_id"    />
-        <result property="deptName" column="dept_name" />
-    </resultMap>
-
-    <sql id="selectTStFeedbackMRVo">
-        select d.id, d.FEEDBACK_ID, d.FEEDBACK_M_ID ,s.dept_name from t_st_feedback_m_r d
-      left join sys_dept s on s.dept_id = d.dept_id
-    </sql>
-
-    <select id="selectTStFeedbackMRList" parameterType="TStFeedbackMR" resultMap="TStFeedbackMRResult">
-        <include refid="selectTStFeedbackMRVo"/>
-        <where>  
-            <if test="monthlyFeedbackId != null "> and monthly_feedback_id = #{monthlyFeedbackId}</if>
-            <if test="monthlyFeedbackMId != null "> and monthly_feedback_m_id = #{monthlyFeedbackMId}</if>
-            and d.del_flag = 0
-        </where>
-        <!-- 数据范围过滤 -->
-        ${params.dataScope}
-    </select>
-    
-    <select id="selectTStFeedbackMRById" parameterType="Long" resultMap="TStFeedbackMRResult">
-        <include refid="selectTStFeedbackMRVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertTStFeedbackMR" parameterType="TStFeedbackMR">
-        insert into t_st_feedback_m_r
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="monthlyFeedbackId != null">monthly_feedback_id,</if>
-            <if test="monthlyFeedbackMId != null">monthly_feedback_m_id,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="monthlyFeedbackId != null">#{monthlyFeedbackId},</if>
-            <if test="monthlyFeedbackMId != null">#{monthlyFeedbackMId},</if>
-         </trim>
-    </insert>
-
-    <update id="updateTStFeedbackMR" parameterType="TStFeedbackMR">
-        update t_st_feedback_m_r
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="monthlyFeedbackId != null">monthly_feedback_id = #{monthlyFeedbackId},</if>
-            <if test="monthlyFeedbackMId != null">monthly_feedback_m_id = #{monthlyFeedbackMId},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <update id="deleteTStFeedbackMRById" parameterType="Long">
-        update t_st_feedback_m_r set del_flag = 2 where id = #{id}
-    </update>
-
-    <update id="deleteTStFeedbackMRByIds" parameterType="String">
-        update t_st_feedback_m_r set del_flag = 2 where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </update>
-    
-</mapper>

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

@@ -6,33 +6,59 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="TStFeedback" id="TStFeedbackResult">
         <result property="id"    column="id"    />
-        <result property="successorComment"    column="successor_comment"    />
-        <result property="updaterCode"    column="updater_code"    />
-        <result property="updatedate"    column="updatedate"    />
-        <result property="createrCode"    column="creater_code"    />
-        <result property="createdate"    column="createdate"    />
-        <result property="feecbackType"    column="feecback_type"    />
+        <result property="feedbackType"    column="feedback_type"    />
+        <result property="mentorId"    column="mentor_id"    />
+        <result property="successorId"    column="successor_id"    />
+        <result property="parentId"    column="parent_id"    />
+        <result property="planId"    column="plan_id"    />
+        <result property="feedbackYear"    column="feedback_year"    />
+        <result property="feedbackSeason"    column="feedback_season"    />
+        <result property="feedbackMonth"    column="feedback_month"    />
+        <result property="successorFeedback"    column="successor_feedback"    />
+        <result property="mentorFeedback"    column="mentor_feedback"    />
+        <result property="feedbackScore"    column="feedback_score"    />
+        <result property="feedbackStatus"    column="feedback_status"    />
+        <result property="meetingDate"    column="meeting_date"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTStFeedbackVo">
-        select d.id, d.successor_comment, d.updater_code, d.updatedate, d.creater_code, d.createdate, d.feecback_type ,s.dept_name from t_st_feedback d
-      left join sys_dept s on s.dept_id = d.dept_id
+        select
+            d.id,
+            d.feedback_type,
+            d.mentor_id,
+            d.successor_id,
+            d.parent_id,
+            d.plan_id,
+            d.feedback_year,
+            d.feedback_season,
+            d.feedback_month,
+            d.successor_feedback,
+            d.mentor_feedback,
+            d.feedback_score,
+            d.feedback_status,
+            d.meeting_date
+        from
+            t_st_feedback d
     </sql>
 
     <select id="selectTStFeedbackList" parameterType="TStFeedback" resultMap="TStFeedbackResult">
         <include refid="selectTStFeedbackVo"/>
         <where>  
-            <if test="successorComment != null  and successorComment != ''"> and successor_comment = #{successorComment}</if>
-            <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
-            <if test="updatedate != null "> and updatedate = #{updatedate}</if>
-            <if test="createrCode != null  and createrCode != ''"> and creater_code = #{createrCode}</if>
-            <if test="createdate != null "> and createdate = #{createdate}</if>
-            <if test="feecbackType != null "> and feecback_type = #{feecbackType}</if>
-            and d.del_flag = 0
+            <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>
-        <!-- 数据范围过滤 -->
-        ${params.dataScope}
     </select>
     
     <select id="selectTStFeedbackById" parameterType="Long" resultMap="TStFeedbackResult">
@@ -44,33 +70,54 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into t_st_feedback
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
-            <if test="successorComment != null">successor_comment,</if>
-            <if test="updaterCode != null">updater_code,</if>
-            <if test="updatedate != null">updatedate,</if>
-            <if test="createrCode != null">creater_code,</if>
-            <if test="createdate != null">createdate,</if>
-            <if test="feecbackType != null">feecback_type,</if>
+            <if test="feedbackType != null">feedback_type,</if>
+            <if test="mentorId != null">mentor_id,</if>
+            <if test="successorId != null">successor_id,</if>
+            <if test="parentId != null">parent_id,</if>
+            <if test="planId != null">plan_id,</if>
+            <if test="feedbackYear != null">feedback_year,</if>
+            <if test="feedbackSeason != null">feedback_season,</if>
+            <if test="feedbackMonth != null">feedback_month,</if>
+            <if test="successorFeedback != null">successor_feedback,</if>
+            <if test="mentorFeedback != null">mentor_feedback,</if>
+            <if test="feedbackScore != null">feedback_score,</if>
+            <if test="feedbackStatus != null">feedback_status,</if>
+            <if test="meetingDate != null">meeting_date,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
-            <if test="successorComment != null">#{successorComment},</if>
-            <if test="updaterCode != null">#{updaterCode},</if>
-            <if test="updatedate != null">#{updatedate},</if>
-            <if test="createrCode != null">#{createrCode},</if>
-            <if test="createdate != null">#{createdate},</if>
-            <if test="feecbackType != null">#{feecbackType},</if>
+            <if test="feedbackType != null">#{feedbackType},</if>
+            <if test="mentorId != null">#{mentorId},</if>
+            <if test="successorId != null">#{successorId},</if>
+            <if test="parentId != null">#{parentId},</if>
+            <if test="planId != null">#{planId},</if>
+            <if test="feedbackYear != null">#{feedbackYear},</if>
+            <if test="feedbackSeason != null">#{feedbackSeason},</if>
+            <if test="feedbackMonth != null">#{feedbackMonth},</if>
+            <if test="successorFeedback != null">#{successorFeedback},</if>
+            <if test="mentorFeedback != null">#{mentorFeedback},</if>
+            <if test="feedbackScore != null">#{feedbackScore},</if>
+            <if test="feedbackStatus != null">#{feedbackStatus},</if>
+            <if test="meetingDate != null">#{meetingDate},</if>
          </trim>
     </insert>
 
     <update id="updateTStFeedback" parameterType="TStFeedback">
         update t_st_feedback
         <trim prefix="SET" suffixOverrides=",">
-            <if test="successorComment != null">successor_comment = #{successorComment},</if>
-            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
-            <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="createrCode != null">creater_code = #{createrCode},</if>
-            <if test="createdate != null">createdate = #{createdate},</if>
-            <if test="feecbackType != null">feecback_type = #{feecbackType},</if>
+            <if test="feedbackType != null">feedback_type = #{feedbackType},</if>
+            <if test="mentorId != null">mentor_id = #{mentorId},</if>
+            <if test="successorId != null">successor_id = #{successorId},</if>
+            <if test="parentId != null">parent_id = #{parentId},</if>
+            <if test="planId != null">plan_id = #{planId},</if>
+            <if test="feedbackYear != null">feedback_year = #{feedbackYear},</if>
+            <if test="feedbackSeason != null">feedback_season = #{feedbackSeason},</if>
+            <if test="feedbackMonth != null">feedback_month = #{feedbackMonth},</if>
+            <if test="successorFeedback != null">successor_feedback = #{successorFeedback},</if>
+            <if test="mentorFeedback != null">mentor_feedback = #{mentorFeedback},</if>
+            <if test="feedbackScore != null">feedback_score = #{feedbackScore},</if>
+            <if test="feedbackStatus != null">feedback_status = #{feedbackStatus},</if>
+            <if test="meetingDate != null">meeting_date = #{meetingDate},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.training.spec.mapper.TStFeedbackPRMapper">
-    
-    <resultMap type="TStFeedbackPR" id="TStFeedbackPRResult">
-        <result property="id"    column="id"    />
-        <result property="monthlyFeedbackId"    column="monthly_feedback_id"    />
-        <result property="planId"    column="plan_id"    />
-        <result property="deptName" column="dept_name" />
-    </resultMap>
-
-    <sql id="selectTStFeedbackPRVo">
-        select d.id, d.FEEDBACK_ID, d.plan_id ,s.dept_name from t_st_feedback_p_r d
-      left join sys_dept s on s.dept_id = d.dept_id
-    </sql>
-
-    <select id="selectTStFeedbackPRList" parameterType="TStFeedbackPR" resultMap="TStFeedbackPRResult">
-        <include refid="selectTStFeedbackPRVo"/>
-        <where>  
-            <if test="monthlyFeedbackId != null "> and monthly_feedback_id = #{monthlyFeedbackId}</if>
-            <if test="planId != null "> and plan_id = #{planId}</if>
-            and d.del_flag = 0
-        </where>
-        <!-- 数据范围过滤 -->
-        ${params.dataScope}
-    </select>
-    
-    <select id="selectTStFeedbackPRById" parameterType="Long" resultMap="TStFeedbackPRResult">
-        <include refid="selectTStFeedbackPRVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertTStFeedbackPR" parameterType="TStFeedbackPR">
-        insert into t_st_feedback_p_r
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="monthlyFeedbackId != null">monthly_feedback_id,</if>
-            <if test="planId != null">plan_id,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="monthlyFeedbackId != null">#{monthlyFeedbackId},</if>
-            <if test="planId != null">#{planId},</if>
-         </trim>
-    </insert>
-
-    <update id="updateTStFeedbackPR" parameterType="TStFeedbackPR">
-        update t_st_feedback_p_r
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="monthlyFeedbackId != null">monthly_feedback_id = #{monthlyFeedbackId},</if>
-            <if test="planId != null">plan_id = #{planId},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <update id="deleteTStFeedbackPRById" parameterType="Long">
-        update t_st_feedback_p_r set del_flag = 2 where id = #{id}
-    </update>
-
-    <update id="deleteTStFeedbackPRByIds" parameterType="String">
-        update t_st_feedback_p_r set del_flag = 2 where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </update>
-    
-</mapper>

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

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.training.spec.mapper.TStPlanFeedbackMapper">
-    
-    <resultMap type="TStPlanFeedback" id="TStPlanFeedbackResult">
-        <result property="id"    column="id"    />
-        <result property="planId"    column="plan_id"    />
-        <result property="question"    column="question"    />
-        <result property="answer"    column="answer"    />
-        <result property="deptName" column="dept_name" />
-    </resultMap>
-
-    <sql id="selectTStPlanFeedbackVo">
-        select id,plan_id,QUESTION1,QUESTION2,QUESTION3,ANSWER1,ANSWER2,ANSWER3 from t_st_plan_feedback
-    </sql>
-
-    <select id="selectTStPlanFeedbackList" parameterType="TStPlanFeedback" resultMap="TStPlanFeedbackResult">
-        <include refid="selectTStPlanFeedbackVo"/>
-        <where>  
-            <if test="planId != null "> and plan_id = #{planId}</if>
-            <if test="question != null  and question != ''"> and question = #{question}</if>
-            <if test="answer != null  and answer != ''"> and answer = #{answer}</if>
-            and d.del_flag = 0
-        </where>
-        <!-- 数据范围过滤 -->
-        ${params.dataScope}
-    </select>
-    
-    <select id="selectTStPlanFeedbackById" parameterType="Long" resultMap="TStPlanFeedbackResult">
-        <include refid="selectTStPlanFeedbackVo"/>
-        where plan_id = #{id}
-    </select>
-        
-    <insert id="insertTStPlanFeedback" parameterType="TStPlanFeedback">
-        <selectKey keyProperty="id" resultType="long" order="BEFORE">
-            SELECT seq_t_st_plan_feedback.NEXTVAL as id FROM DUAL
-        </selectKey>
-        insert into t_st_plan_feedback
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="planId != null">plan_id,</if>
-            <if test="question1 != null">question1,</if>
-            <if test="question2 != null">question2,</if>
-            <if test="question3 != null">question3,</if>
-            <if test="answer1 != null">answer1,</if>
-            <if test="answer2 != null">answer2,</if>
-            <if test="answer3 != null">answer3,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="planId != null">#{planId},</if>
-            <if test="question1 != null">#{question1},</if>
-            <if test="question2 != null">#{question2},</if>
-            <if test="question3 != null">#{question3},</if>
-            <if test="answer1 != null">#{answer1},</if>
-            <if test="answer2 != null">#{answer2},</if>
-            <if test="answer3 != null">#{answer3},</if>
-         </trim>
-    </insert>
-
-    <update id="updateTStPlanFeedback" parameterType="TStPlanFeedback">
-        update t_st_plan_feedback
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="planId != null">plan_id = #{planId},</if>
-            <if test="question != null">question = #{question},</if>
-            <if test="answer != null">answer = #{answer},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <update id="deleteTStPlanFeedbackById" parameterType="Long">
-        update t_st_plan_feedback set del_flag = 2 where id = #{id}
-    </update>
-
-    <update id="deleteTStPlanFeedbackByIds" parameterType="String">
-        update t_st_plan_feedback set del_flag = 2 where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </update>
-    
-</mapper>

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

@@ -36,6 +36,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join T_ST_SUCCESSOR suc on d.STAFF_ID = suc.STAFF_ID
     </sql>
 
+    <!-- 查询月度培训计划列表 -->
+    <select id="selectMonthlyTStPlanList" parameterType="TStFeedback" resultMap="TStPlanResult">
+        <include refid="selectTStPlanVo"/>
+        <where>
+            d.staff_id = #{successorId}
+            <if test="feedbackYear != null  and feedbackYear != '' and feedbackMonth != null  and feedbackMonth != '' ">
+                and
+                (
+                    <!-- 本年度开始的计划 月份大于开始月份 -->
+                    (extract(year from d.start_date) = #{feedbackYear} and extract(month from d.start_date) &gt;= #{feedbackMonth})
+                    or
+                    <!-- 第二年度开始的计划 月份小于结束月份 -->
+                    (extract(year from d.end_date) = #{feedbackYear} and extract(month from d.start_date) &lt;= #{feedbackMonth})
+                )
+            </if>
+            and d.del_flag = 0
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
+        </where>
+    </select>
+
     <select id="selectTStPlanList" parameterType="TStPlan" resultMap="TStPlanResult">
         <include refid="selectTStPlanVo"/>
         <where>
@@ -50,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
+        ${params.dataScope}
     </select>
 
     <select id="selectTStPlanById" parameterType="Long" resultMap="TStPlanResult">
@@ -118,7 +140,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="studyState != null">study_state = #{studyState},</if>
             <if test="score != null">
                 score = #{score},
-                <!-- 王子文 2022年4月22日 添加 -->
                 <!-- 导师反馈的同时更新实际完成培训日期为当前日期 -->
                 date_of_completion = SYSDATE,
             </if>

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

@@ -1,5 +1,14 @@
 import request from '@/utils/request'
 
+// 学员查询月度反馈列表
+export function listSuccessorMonthlyFeedback(query) {
+  return request({
+    url: '/spec/feedback/list/successor/month',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询专项培训反馈列表
 export function listFeedback(query) {
   return request({

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

@@ -377,7 +377,7 @@
 </template>
 
 <script>
-import { getFeedback, addFeedback } from "@/api/training/spec/feedback";
+import { getFeedback, addFeedback } from "@/api/training/spec/planfeedback";
 import { getPlan, delPlan, addPlan, updatePlan, exportPlan, importTemplate, listPlanByStaffId } from "@/api/training/spec/plan";
 import { allFileList, delCommonfile } from "@/api/common/commonfile";
 import { treeselect } from "@/api/system/dept";