Browse Source

班级量化考核调整

dzx 11 months ago
parent
commit
01b69c61b3

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

@@ -43,7 +43,6 @@ import java.io.IOException;
 import java.util.Date;
 import java.util.List;
 
-import static com.alibaba.fastjson.JSONPatch.OperationType.remove;
 
 /**
  * @title: 学生班级巡查考核

+ 6 - 0
src/main/java/com/xjrsoft/module/student/dto/QuantitativeAssessmentSingleScoreDto.java

@@ -37,4 +37,10 @@ public class QuantitativeAssessmentSingleScoreDto implements Serializable {
 
     @ApiModelProperty(value = "考核类别code")
     private String categoryCode;
+
+    @ApiModelProperty("年份")
+    private Integer year;
+
+    @ApiModelProperty("月份")
+    private Integer month;
 }

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

@@ -45,6 +45,7 @@
         <if test="dto.teacherId != null">
             and t7.teacher_id = #{dto.teacherId}
         </if>
+        order by t.id desc
     </select>
 
     <select id="getInfo" resultType="com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionVo">
@@ -78,7 +79,7 @@
         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 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 t1.enabled_mark = 1 and t.class_id in
         <foreach item="classId" index="index" collection="dto.classIds" open="(" close=")" separator=",">
@@ -96,6 +97,7 @@
         <if test="dto.endDate != null and dto.endDate != ''">
             and t1.assessment_date &lt;= #{dto.endDate}
         </if>
+        order by t1.id desc
     </select>
 
     <select id="getMobileInfo" resultType="com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionMobileVo">