|
|
@@ -241,11 +241,11 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
|
|
|
.selectAs(XjrUser::getName, CalssQuantitativeAssessmentPageVo::getHeadTeacherName)
|
|
|
.selectAs(BaseClass::getId, CalssQuantitativeAssessmentPageVo::getClassId)
|
|
|
.selectAs(BaseClass::getName, CalssQuantitativeAssessmentPageVo::getClassName)
|
|
|
- .select("SELECT COUNT(DISTINCT(a1.id)) as student_num FROM xjr_user a1" +
|
|
|
+ .select("(SELECT COUNT(DISTINCT(a1.id)) FROM xjr_user a1" +
|
|
|
" LEFT JOIN base_student_school_roll a2 ON a1.id = a2.user_id" +
|
|
|
" WHERE a1.delete_mark = 0 AND a2.delete_mark = 0" +
|
|
|
" AND a2.class_id = t1.id" +
|
|
|
- " AND a2.archives_status = 'FB2901' ")
|
|
|
+ " AND a2.archives_status = 'FB2901') as student_num")
|
|
|
.selectAs(BaseClass::getIsGraduate, CalssQuantitativeAssessmentPageVo::getClassStatus)
|
|
|
.leftJoin(XjrUser.class, XjrUser::getId, BaseClass::getTeacherId)
|
|
|
.eq(dto.getGradeId() != null, BaseClass::getGradeId, dto.getGradeId())
|
|
|
@@ -450,11 +450,11 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
|
|
|
.selectAs(XjrUser::getName, CalssQuantitativeAssessmentPageVo::getHeadTeacherName)
|
|
|
.selectAs(BaseClass::getId, CalssQuantitativeAssessmentPageVo::getClassId)
|
|
|
.selectAs(BaseClass::getName, CalssQuantitativeAssessmentPageVo::getClassName)
|
|
|
- .select("SELECT COUNT(DISTINCT(a1.id)) as student_num FROM xjr_user a1" +
|
|
|
+ .select("(SELECT COUNT(DISTINCT(a1.id)) FROM xjr_user a1" +
|
|
|
" LEFT JOIN base_student_school_roll a2 ON a1.id = a2.user_id" +
|
|
|
" WHERE a1.delete_mark = 0 AND a2.delete_mark = 0" +
|
|
|
" AND a2.class_id = t1.id" +
|
|
|
- " AND a2.archives_status = 'FB2901' ")
|
|
|
+ " AND a2.archives_status = 'FB2901') as student_num")
|
|
|
.selectAs(BaseClass::getIsGraduate, CalssQuantitativeAssessmentPageVo::getClassStatus)
|
|
|
.leftJoin(XjrUser.class, XjrUser::getId, BaseClass::getTeacherId)
|
|
|
.eq(dto.getGradeId() != null, BaseClass::getGradeId, dto.getGradeId())
|