Bladeren bron

督导,查看所有班级的食堂考核

dzx 1 jaar geleden
bovenliggende
commit
827b21cc09

+ 9 - 0
src/main/java/com/xjrsoft/module/assessment/controller/AssessmentPlanAnswerController.java

@@ -72,6 +72,15 @@ public class AssessmentPlanAnswerController {
         return RT.ok(pageOutput);
     }
 
+    @GetMapping(value = "/all-class-page")
+    @ApiOperation(value="考核计划答题列表-所有班级(分页)")
+    @SaCheckPermission("assessmenttemplateplan:detail")
+    public RT<PageOutput<AssessmentPlanAnswerTeacherPageVo>> allClassPage(@Valid AssessmentPlanAnswerPageDto dto){
+        Page<AssessmentPlanAnswerTeacherPageVo> page = planService.getTeacherPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
+        PageOutput<AssessmentPlanAnswerTeacherPageVo> pageOutput = ConventPage.getPageOutput(page, AssessmentPlanAnswerTeacherPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
     @GetMapping(value = "/info")
     @ApiOperation(value="根据id查询考核计划信息")
     @SaCheckPermission("assessmenttemplateplan:detail")

+ 2 - 0
src/main/java/com/xjrsoft/module/assessment/dto/AddAssessmentTemplatePlanDto.java

@@ -73,5 +73,7 @@ public class AddAssessmentTemplatePlanDto implements Serializable {
     @ApiModelProperty("班级id")
     private List<Long> classIds;
 
+    @ApiModelProperty("学期id(base_semester)")
+    private Long baseSemesterId;
 
 }

+ 6 - 0
src/main/java/com/xjrsoft/module/assessment/entity/AssessmentTemplatePlan.java

@@ -104,6 +104,12 @@ public class AssessmentTemplatePlan implements Serializable {
     @ApiModelProperty("考核模板id(assessment_template)")
     private Long assessmentTemplateId;
 
+    /**
+     * 学期id(base_semester)
+     */
+    @ApiModelProperty("学期id(base_semester)")
+    private Long baseSemesterId;
+
     /**
      * 选人方式
      */

+ 4 - 1
src/main/resources/mapper/assessment/AssessmentTemplatePlanMapper.xml

@@ -55,7 +55,10 @@
         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 AND t4.teacher_id = #{dto.teacherId}
+        WHERE t1.delete_mark = 0 AND t1.status = 1
+        <if test="dto.teacherId != null">
+            AND t4.teacher_id = #{dto.teacherId}
+        </if>
         <if test="dto.name != null and dto.name != ''">
             and t1.name like concat('%', #{dto.name}, '%')
         </if>