Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/main/resources/mapper/student/BaseStudentAssessmentInspectionMapper.xml

src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentAssessmentInspectionServiceImpl.java

@@ -199,12 +199,17 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
             result.setScore(result.getScore() * -1);
         }
 
+        MPJLambdaWrapper<BaseStudentAssessmentStudentRelation> baseStudentAssessmentStudentRelationWrapper = new MPJLambdaWrapper<>();
+        baseStudentAssessmentStudentRelationWrapper
+                .select(BaseStudentAssessmentStudentRelation::getId)
+                .selectAs(XjrUser::getName,BaseStudentAssessmentStudentRelation::getName)
+                .selectAs(XjrUser::getCredentialNumber,BaseStudentAssessmentStudentRelation::getStudentId)
+                .eq(BaseStudentAssessmentStudentRelation::getBaseStudentAssessmentInspectionId, result.getBaseStudentAssessmentInspectionId())
+                .eq(BaseStudentAssessmentStudentRelation::getClassId, result.getClassId())
+                .leftJoin(XjrUser.class, XjrUser::getId, BaseStudentAssessmentStudentRelation::getUserId)
+        ;
         // 获取学生信息
-        List<BaseStudentAssessmentStudentRelation> baseStudentAssessmentStudentRelations = assessmentStudentRelationMapper.selectList(
-                Wrappers.<BaseStudentAssessmentStudentRelation>query().lambda()
-                        .eq(BaseStudentAssessmentStudentRelation::getBaseStudentAssessmentInspectionId, result.getBaseStudentAssessmentInspectionId())
-                        .eq(BaseStudentAssessmentStudentRelation::getClassId, result.getClassId())
-        );
+        List<BaseStudentAssessmentStudentRelation> baseStudentAssessmentStudentRelations = assessmentStudentRelationMapper.selectList(baseStudentAssessmentStudentRelationWrapper);
         result.setStudentList(baseStudentAssessmentStudentRelations);
         result.setStudentCount(baseStudentAssessmentStudentRelations.size());
 

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;
 }

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;
 }

src/main/resources/mapper/student/BaseStudentAssessmentInspectionMapper.xml

@@ -69,10 +69,14 @@
             SELECT count(*) FROM base_student_assessment_student_relation WHERE
             base_student_assessment_inspection_id = t1.id and class_id = t.class_id and delete_mark = 0
         ) as student_count,t1.assessment_type
+            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,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 +99,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,t8.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 t8 on (t8.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
@@ -278,7 +283,7 @@
         from base_student_assessment_student_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
-        where t2.code = 'awards_and_honors' and t.delete_mark = 0
+        where t1.base_student_assessment_category_id = 1754412347985760256
         and t.class_id in
         <foreach item="classId" index="index" collection="dto.classIdList" open="(" close=")" separator=",">
             #{classId}