流程任务节点显示模式调整

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

@@ -148,7 +148,7 @@ public class AssessmentPlanAnswerController {
     @PostMapping(value="send-msg")
     @ApiOperation(value = "推送微信通知")
     @SaCheckPermission("assessmenttemplateplan:send-msg")
-    public RT<Boolean> questionResult(@RequestParam AssessmentTemplatePlanSureDto dto){
+    public RT<Boolean> questionResult(@Valid @RequestBody AssessmentTemplatePlanSureDto dto){
         Boolean sendMsg = planService.sendMsg(dto);
         return RT.ok(sendMsg);
     }

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

@@ -25,4 +25,7 @@ public class AssessmentPlanAnswerStudentDto extends PageInput {
     @ApiModelProperty("状态(0:未填写 1:已填写)")
     private Integer submitStatus;
 
+    @ApiModelProperty("班主任id")
+    private Long teacherId;
+
 }

src/main/java/com/xjrsoft/module/assessment/service/impl/AssessmentTemplatePlanServiceImpl.java

@@ -358,6 +358,10 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
 
     @Override
     public List<AssessmentPlanAnswerStudentVo> getAnswerStudent(AssessmentPlanAnswerStudentDto dto) {
+        List<String> roleList = StpUtil.getRoleList();
+        if(roleList.size() == 2 && roleList.contains("CLASSTE") && roleList.contains("TEACHER")){
+            dto.setTeacherId(StpUtil.getLoginIdAsLong());
+        }
         return templatePlanMapper.getAnswerStudent(dto);
     }
 

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

@@ -104,10 +104,14 @@
         SELECT t1.student_user_id,t2.name,t1.submit_status,t1.assessment_template_plan_id FROM assessment_plan_answer_student t1
         LEFT JOIN xjr_user t2 ON t1.student_user_id = t2.id
         LEFT JOIN base_student_school_roll t3 ON t1.student_user_id = t3.user_id
+        LEFT JOIN base_class t4 ON t3.class_id = t4.id
         WHERE t1.delete_mark = 0 AND t1.assessment_template_plan_id = #{dto.assessmentTemplatePlanId}
         <if test="dto.keyword != null and dto.keyword != ''">
             and t2.name like concat('%', #{dto.keyword}, '%')
         </if>
+        <if test="dto.teacherId != null">
+            AND t4.teacher_id = #{dto.teacherId}
+        </if>
     </select>
 
     <select id="getSemesterClass" resultType="java.lang.Long">