fanxp il y a 2 ans
Parent
commit
a4a5ca9f6b

+ 0 - 6
src/main/java/com/xjrsoft/module/student/controller/BaseStudentAssessmentInspectionController.java

@@ -57,12 +57,6 @@ public class BaseStudentAssessmentInspectionController {
 
 
     private final IBaseStudentAssessmentInspectionService baseStudentAssessmentInspectionService;
-    private final IBaseStudentAssessmentClassRelationService baseStudentAssessmentClassRelationService;
-    private final IBaseStudentAssessmentStudentRelationService baseStudentAssessmentStudentRelationService;
-    private final BaseStudentAssessmentProjectMapper baseStudentAssessmentProjectMapper;
-    private final BaseStudentAssessmentCategoryMapper baseStudentAssessmentCategoryMapper;
-    private final XjrUserMapper xjrUserMapper;
-    private final BaseClassMapper baseClassMapper;
 
     @GetMapping(value = "/page")
     @ApiOperation(value = "学生班级巡查考核列表(分页)")

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

@@ -44,6 +44,9 @@ public class BaseStudentAssessmentInspectionVo {
     @ApiModelProperty("考核用户(xjr_user)")
     private String assessmentUserName;
 
+    @ApiModelProperty("登记人")
+    private String createUserName;
+
     @ApiModelProperty("原因")
     private String reason;
 

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

@@ -25,7 +25,7 @@
 
     <select id="getInfo" resultType="com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionVo">
         select t.id,t.score,t.score_type,t.assessment_date,t.reason,t1.name as assessment_category_name,t2.name as assessment_project_name,
-        t3.name as semester_name,t4.name as grade_name,t5.name as assessment_user_name,t6.name as score_type_cn,t.file_id
+        t3.name as semester_name,t4.name as grade_name,t5.name as assessment_user_name,t6.name as score_type_cn,t.file_id,t7.name as create_user_name
         from base_student_assessment_inspection t
         left join base_student_assessment_category t1 on (t1.id = t.base_student_assessment_category_id)
         left join base_student_assessment_project t2 on (t2.id = t.base_student_assessment_project_id)
@@ -33,6 +33,7 @@
         left join base_grade t4 on t.grade_id=t4.id
         left join xjr_user t5 on t.assessment_user_id=t5.id
         left join xjr_dictionary_detail t6 on t6.code=t.score_type
+        left join xjr_user t7 on t.create_user_id=t7.id
         where t.id=#{id} and t.delete_mark=0 and t1.delete_mark=0  and t2.delete_mark=0  and t3.delete_mark=0 and t.status=1;
     </select>