食堂评价调整

src/main/java/com/xjrsoft/module/assessment/controller/AssessmentPlanAnswerController.java

@@ -3,6 +3,7 @@ package com.xjrsoft.module.assessment.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xjrsoft.common.enums.RoleEnum;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
@@ -72,6 +73,7 @@ public class AssessmentPlanAnswerController {
     @SaCheckPermission("assessmenttemplateplan:detail")
     public RT<PageOutput<AssessmentPlanAnswerTeacherPageVo>> teacherPage(@Valid AssessmentPlanAnswerPageDto dto){
         dto.setTeacherId(StpUtil.getLoginIdAsLong());
+        dto.setIsHeadTeacher(1);
         Page<AssessmentPlanAnswerTeacherPageVo> page = planService.getTeacherPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
         PageOutput<AssessmentPlanAnswerTeacherPageVo> pageOutput = ConventPage.getPageOutput(page, AssessmentPlanAnswerTeacherPageVo.class);
         return RT.ok(pageOutput);
@@ -81,6 +83,11 @@ public class AssessmentPlanAnswerController {
     @ApiOperation(value="考核计划答题列表-所有班级(分页)")
     @SaCheckPermission("assessmenttemplateplan:detail")
     public RT<PageOutput<AssessmentPlanAnswerTeacherPageVo>> allClassPage(@Valid AssessmentPlanAnswerPageDto dto){
+
+        if(StpUtil.getRoleList().contains("CLASSTE")){
+            dto.setTeacherId(StpUtil.getLoginIdAsLong());
+            dto.setIsHeadTeacher(0);
+        }
         Page<AssessmentPlanAnswerTeacherPageVo> page = planService.getTeacherPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
         PageOutput<AssessmentPlanAnswerTeacherPageVo> pageOutput = ConventPage.getPageOutput(page, AssessmentPlanAnswerTeacherPageVo.class);
         return RT.ok(pageOutput);

src/main/java/com/xjrsoft/module/assessment/dto/AssessmentPlanAnswerPageDto.java

@@ -40,5 +40,8 @@ public class AssessmentPlanAnswerPageDto extends PageInput {
     @ApiModelProperty("是否确认(0:否 1:是)")
     private Integer isConfirm;
 
+    @ApiModelProperty("是否是班主任(0:否 1:是)")
+    private Integer isHeadTeacher;
+
 
 }

src/main/java/com/xjrsoft/module/assessment/vo/AssessmentPlanAnswerTeacherPageVo.java

@@ -70,4 +70,7 @@ public class AssessmentPlanAnswerTeacherPageVo {
 
     @ApiModelProperty("未提交数量")
     private Integer unsubmittedCount;
+
+    @ApiModelProperty("是否自己的班级(0:否 1:是)")
+    private Integer isMine;
 }

src/main/resources/mapper/assessment/AssessmentTemplatePlanMapper.xml

@@ -57,12 +57,13 @@
         where a1.delete_mark = 0 and a1.assessment_template_plan_id = t1.id and a2.class_id = t3.class_id and a1.submit_status = 1) as submitted_count,
         (select count(*) from assessment_plan_answer_student a1
         left join base_student_school_roll a2 on a1.student_user_id = a2.user_id
-        where a1.delete_mark = 0 and a1.assessment_template_plan_id = t1.id and a2.class_id = t3.class_id and a1.submit_status = 0) as unsubmitted_count FROM assessment_template_plan t1
+        where a1.delete_mark = 0 and a1.assessment_template_plan_id = t1.id and a2.class_id = t3.class_id and a1.submit_status = 0) as unsubmitted_count,
+        (t4.teacher_id = #{dto.teacherId}) AS is_mine FROM assessment_template_plan t1
         LEFT JOIN assessment_template t2 ON t1.assessment_template_id = t2.id
         LEFT JOIN assessment_plan_answer_class t3 ON t3.assessment_template_plan_id = t1.id
         LEFT JOIN base_class t4 ON t3.class_id = t4.id
         WHERE t1.delete_mark = 0 AND t1.status = 1
-        <if test="dto.teacherId != null">
+        <if test="dto.teacherId != null and dto.isHeadTeacher != null and dto.isHeadTeacher == 1">
             AND t4.teacher_id = #{dto.teacherId}
         </if>
         <if test="dto.name != null and dto.name != ''">