评价计划调整

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

@@ -72,4 +72,7 @@ public class AddAssessmentTemplatePlanDto implements Serializable {
     @ApiModelProperty("就读方式(xjr_dictionary_item[stduy_status])")
     private String stduyStatus;
 
+    @ApiModelProperty("是否需要班主任确认(0:否 1:是)")
+    private Integer isNeedConfirm;
+
 }

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

@@ -30,9 +30,10 @@
         t1.assessment_template_id,t3.is_confirm,t3.submit_status FROM assessment_template_plan t1
         LEFT JOIN assessment_template t2 ON t1.assessment_template_id = t2.id
         LEFT JOIN assessment_plan_answer_student t3 ON t3.assessment_template_plan_id = t1.id
-        left join base_student_school_roll t4 on t3.student_user_id = t4.user_id
+        LEFT JOIN base_student_school_roll t4 ON t3.student_user_id = t4.user_id
+        LEFT JOIN assessment_plan_answer_class t5 ON t5.assessment_template_plan_id = t1.id AND t4.class_id = t5.class_id
         WHERE t1.delete_mark = 0 AND t1.status = 1 AND t3.student_user_id = #{dto.studentUserId}
-        and t3.is_confirm = t1.is_need_confirm and t1.stduy_status = t4.stduy_status
+        and t5.is_confirm = t1.is_need_confirm and t1.stduy_status like concat('%', t4.stduy_status, '%')
         <if test="dto.name != null and dto.name != ''">
             and t1.name like concat('%', #{dto.name}, '%')
         </if>