班级考核巡查调整

src/main/java/com/xjrsoft/module/student/dto/BaseStudentAssessmentInspectionPageDto.java

@@ -38,4 +38,7 @@ public class BaseStudentAssessmentInspectionPageDto extends PageInput {
 
     @ApiModelProperty("考核人")
     private String assessmentUserName;
+
+    @ApiModelProperty("考核对象")
+    private String assessmentType;
 }

src/main/java/com/xjrsoft/module/student/vo/BaseStudentAssessmentInspectionPageVo.java

@@ -51,4 +51,10 @@ public class BaseStudentAssessmentInspectionPageVo {
 
     @ApiModelProperty("影响班级考核的学生人数")
     private Integer studentCount;
+
+    @ApiModelProperty("状态(1:启用 0:作废)")
+    private Integer enabledMark;
+
+    @ApiModelProperty("考核对象")
+    private String assessmentType;
 }

src/main/java/com/xjrsoft/module/student/vo/BaseStudentAssessmentInspectionVo.java

@@ -63,4 +63,10 @@ public class BaseStudentAssessmentInspectionVo {
 
     @ApiModelProperty("班级信息")
     private List<BaseStudentAssessmentClassListVo> classList;
+
+    @ApiModelProperty("状态(1:启用 0:作废)")
+    private Integer enabledMark;
+
+    @ApiModelProperty("考核对象")
+    private String assessmentType;
 }

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

@@ -11,14 +11,14 @@
         ) AS assessment_class_names,
         (
         (LENGTH(class_student_user_ids) - LENGTH(REPLACE(class_student_user_ids, ',', '')))
-        ) + 1 AS student_count
+        ) + 1 AS student_count,t.enabled_mark,t.assessment_type
         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)
         LEFT JOIN base_semester t3 ON t.base_semester_id=t3.id
-        LEFT JOIN base_grade t4 ON t.grade_id=t4.id
-        LEFT JOIN xjr_user t5 ON t.create_user_id=t5.id
-        LEFT JOIN xjr_dictionary_detail t6 ON t6.code=t.score_type
+        LEFT JOIN base_grade t4 ON t.grade_id = t4.id
+        LEFT JOIN xjr_user t5 ON t.create_user_id = t5.id
+        LEFT JOIN xjr_dictionary_detail t6 ON t6.code= t.score_type
         WHERE  t.delete_mark = 0 AND t1.delete_mark = 0  AND t2.delete_mark = 0  AND t3.delete_mark = 0
         <if test="dto.projectIds != null and dto.projectIds.size() > 0">
             and t.base_student_assessment_project_id in
@@ -41,6 +41,9 @@
         <if test="dto.assessmentUserName != null and dto.assessmentUserName != ''">
             and t5.name like concat('%',#{dto.assessmentUserName},'%')
         </if>
+        <if test="dto.assessmentType != null and dto.assessmentType != ''">
+            and t.assessment_type like concat('%',#{dto.assessmentType},'%')
+        </if>
     </select>
 
     <select id="getInfo" resultType="com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionVo">