1.0.4 赋分成绩导出

src/main/java/com/qmth/eds/api/ExamAssignController.java

@@ -101,9 +101,11 @@ public class ExamAssignController {
                                       @ApiParam(value = "考查学院", required = false) @RequestParam(required = false) String kcCollege,
                                       @ApiParam(value = "班级id", required = false) @RequestParam(required = false) String clazzId,
                                       @ApiParam(value = "任课老师工号", required = false) @RequestParam(required = false) String teacherCode,
+                                      @ApiParam(value = "赋分分数段（开始)", required = false) @RequestParam(required = false) String minAssignScore,
+                                      @ApiParam(value = "赋分分数段（结束)", required = false) @RequestParam(required = false) String maxAssignScore,
                                       @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                                       @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        IPage<AssignResultPreviewResult> assignResultPreviewResultIPage = examAssignService.assignResultPreview(new Page<>(pageNumber, pageSize), semesterId, examTypeId, collegeId, courseCode, openCollege, kcCollege, clazzId, teacherCode);
+        IPage<AssignResultPreviewResult> assignResultPreviewResultIPage = examAssignService.assignResultPreview(new Page<>(pageNumber, pageSize), semesterId, examTypeId, collegeId, courseCode, openCollege, kcCollege, clazzId, teacherCode, minAssignScore, maxAssignScore);
         if (Objects.nonNull(assignResultPreviewResultIPage) && !CollectionUtils.isEmpty(assignResultPreviewResultIPage.getRecords())) {
             for (AssignResultPreviewResult a : assignResultPreviewResultIPage.getRecords()) {
                 a.setScoreDetail("客观题评分明细：" + a.getObjectiveScoreDetail() + "\r\n" + "主观题评分明细：" + a.getSubjectiveScoreDetail());

src/main/java/com/qmth/eds/mapper/ExamAssignMapper.java

@@ -32,6 +32,8 @@ public interface ExamAssignMapper extends BaseMapper<ExamAssign> {
      * @param kcCollege
      * @param clazzId
      * @param teacherCode
+     * @param minAssignScore
+     * @param maxAssignScore
      * @return
      */
     IPage<AssignResultPreviewResult> assignResultPreview(IPage<Map> iPage,
@@ -43,7 +45,9 @@ public interface ExamAssignMapper extends BaseMapper<ExamAssign> {
                                                          @Param("openCollege") String openCollege,
                                                          @Param("kcCollege") String kcCollege,
                                                          @Param("clazzId") String clazzId,
-                                                         @Param("teacherCode") String teacherCode);
+                                                         @Param("teacherCode") String teacherCode,
+                                                         @Param("minAssignScore") String minAssignScore,
+                                                         @Param("maxAssignScore") String maxAssignScore);
 
     ExamAssign getBySchoolIdAndSemesterIdAndExamTypeIdAndCourseCodeAndOpenCollege(@Param("collegeId") Long collegeId, @Param("semesterId") Long semesterId, @Param("examTypeId") Long examTypeId, @Param("courseCode") String courseCode, @Param("kkxy") String kkxy);
 }

src/main/java/com/qmth/eds/service/AsyncTaskService.java

@@ -27,7 +27,7 @@ public class AsyncTaskService {
     private ExamSyncTotalService examSyncTotalService;
 
     /**
-     * 同步试卷结构、分组信息、评卷员绑定关系
+     * 同步考务数据
      */
     public void syncExamData(ExamScheduleTask examScheduleTask, boolean isAuto) {
         // 记录日志

src/main/java/com/qmth/eds/service/ExamAssignService.java

@@ -32,6 +32,8 @@ public interface ExamAssignService extends IService<ExamAssign> {
      * @param kcCollege
      * @param clazzId
      * @param teacherCode
+     * @param minAssignScore
+     * @param maxAssignScore
      * @return
      */
     IPage<AssignResultPreviewResult> assignResultPreview(IPage<Map> iPage,
@@ -40,7 +42,7 @@ public interface ExamAssignService extends IService<ExamAssign> {
                                                          Long collegeId,
                                                          String courseCode,
                                                          String openCollege,
-                                                         String kcCollege, String clazzId, String teacherCode);
+                                                         String kcCollege, String clazzId, String teacherCode, String minAssignScore, String maxAssignScore);
 
     Map contrast(Long semesterId, Long examTypeId, String courseCode);
 

src/main/java/com/qmth/eds/service/impl/ExamAssignServiceImpl.java

@@ -1,8 +1,6 @@
 package com.qmth.eds.service.impl;
 
 import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.ExcelWriter;
-import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -133,6 +131,8 @@ public class ExamAssignServiceImpl extends ServiceImpl<ExamAssignMapper, ExamAss
      * @param kcCollege
      * @param clazzId
      * @param teacherCode
+     * @param minAssignScore
+     * @param maxAssignScore
      * @return
      */
     @Override
@@ -144,9 +144,11 @@ public class ExamAssignServiceImpl extends ServiceImpl<ExamAssignMapper, ExamAss
                                                                 String openCollege,
                                                                 String kcCollege,
                                                                 String clazzId,
-                                                                String teacherCode) {
+                                                                String teacherCode,
+                                                                String minAssignScore,
+                                                                String maxAssignScore) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        return examAssignMapper.assignResultPreview(iPage, schoolId, collegeId, semesterId, examTypeId, courseCode, openCollege, kcCollege, clazzId, teacherCode);
+        return examAssignMapper.assignResultPreview(iPage, schoolId, collegeId, semesterId, examTypeId, courseCode, openCollege, kcCollege, clazzId, teacherCode, minAssignScore, maxAssignScore);
     }
 
     @Override

src/main/resources/mapper/ExamAssignMapper.xml

@@ -72,6 +72,12 @@
             <if test="teacherCode != null and teacherCode != ''">
                 and ess.jgh = #{teacherCode}
             </if>
+            <if test="minAssignScore != null and minAssignScore != ''">
+                and cms.assign_score &gt;= #{minAssignScore}
+            </if>
+            <if test="maxAssignScore != null and maxAssignScore != ''">
+                and cms.assign_score &lt;= #{maxAssignScore}
+            </if>
         </where>
         group by
             ess.id,