DESKTOP-USV654P\pc 11 hónapja
szülő
commit
c86f8f7e1c

+ 3 - 0
src/main/java/com/xjrsoft/module/student/vo/BaseStudentAssessmentInspectionMobilePageVo.java

@@ -46,4 +46,7 @@ public class BaseStudentAssessmentInspectionMobilePageVo {
 
     @ApiModelProperty("类型")
     private  String assessmentType;
+    
+    @ApiModelProperty("考核项目")
+    private  String assessmentItemName;
 }

+ 3 - 0
src/main/java/com/xjrsoft/module/student/vo/BaseStudentAssessmentInspectionMobileVo.java

@@ -113,4 +113,7 @@ public class BaseStudentAssessmentInspectionMobileVo {
 
     @ApiModelProperty("类型")
     private  String assessmentType;
+
+    @ApiModelProperty("考核项目")
+    private  String assessmentItemName;
 }

+ 4 - 2
src/main/resources/mapper/student/BaseStudentAssessmentInspectionMapper.xml

@@ -68,11 +68,12 @@
         (
             SELECT count(*) FROM base_student_assessment_student_relation WHERE base_student_assessment_inspection_id =
             t1.id and class_id=t.class_id
-        ) as student_count,t1.assessment_type
+        ) as student_count,t1.assessment_type,t6.name as assessment_item_name
         from base_student_assessment_class_relation t
         left join base_student_assessment_inspection t1 on t1.id=t.base_student_assessment_inspection_id
         left join base_student_assessment_category t2 on (t2.id = t1.base_student_assessment_category_id)
         left join base_student_assessment_project t3 on (t3.id = t1.base_student_assessment_project_id)
+        left join base_student_assessment_item t6 on (t6.id = t1.base_student_assessment_item_id)
         left join xjr_dictionary_detail t4 on t4.code=t1.score_type
         left join base_class t5 on t5.id=t.class_id
         where t1.delete_mark = 0 and t.class_id in
@@ -95,11 +96,12 @@
 
     <select id="getMobileInfo" resultType="com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionMobileVo">
         select t.id,t.class_id,t.base_student_assessment_inspection_id,t1.score,t5.name as assessment_class_name,t2.name as assessment_category_name,t3.name as assessment_project_name,t1.assessment_date,t1.reason,
-        t6.name as assessment_user_name,t7.name as create_user_name,t1.create_date,t1.file_id,t1.score_type,t4.name as score_type_cn,t1.assessment_type
+        t6.name as assessment_user_name,t7.name as create_user_name,t1.create_date,t1.file_id,t1.score_type,t4.name as score_type_cn,t1.assessment_type,t6.name as assessment_item_name
         from base_student_assessment_class_relation t
         left join base_student_assessment_inspection t1 on t1.id=t.base_student_assessment_inspection_id
         left join base_student_assessment_category t2 on (t2.id = t1.base_student_assessment_category_id)
         left join base_student_assessment_project t3 on (t3.id = t1.base_student_assessment_project_id)
+        left join base_student_assessment_item t6 on (t6.id = t1.base_student_assessment_item_id)
         left join xjr_dictionary_detail t4 on t4.code=t1.score_type
         left join base_class t5 on t5.id=t.class_id
         left join xjr_user t6 on t1.assessment_user_id=t6.id