fix bug

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TSyncExamStudentScoreServiceImpl.java

@@ -168,8 +168,10 @@ public class TSyncExamStudentScoreServiceImpl extends ServiceImpl<TSyncExamStude
                     }
                     jsonImageTrajectoryPathArray.add(dirTargetJpgName.toString());
                 }
-                jsonObject.put(SystemConstant.PATH, jsonImageTrajectoryPathArray.toJSONString());
-                tSyncExamStudentScore.setTrajectoryUrls(jsonObject.toJSONString());
+                if (Objects.nonNull(jsonImageTrajectoryPathArray) && jsonImageTrajectoryPathArray.size() > 0) {
+                    jsonObject.put(SystemConstant.PATH, jsonImageTrajectoryPathArray.toJSONString());
+                    tSyncExamStudentScore.setTrajectoryUrls(jsonObject.toJSONString());
+                }
             } else {
                 JSONObject jsonObject = JSONObject.parseObject(tSyncExamStudentScore.getTrajectoryUrls());
                 String ossType = (String) jsonObject.get(SystemConstant.TYPE);
@@ -186,7 +188,9 @@ public class TSyncExamStudentScoreServiceImpl extends ServiceImpl<TSyncExamStude
                     }
                 }
             }
-            tSyncExamStudentScore.setTrajectoryFileList(fileTargetList);
+            if (Objects.nonNull(fileTargetList) && fileTargetList.size() > 0) {
+                tSyncExamStudentScore.setTrajectoryFileList(fileTargetList);
+            }
         } catch (Exception e) {
             e.printStackTrace();
             tSyncExamStudentScore.setErrorInfo();

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/service/impl/PushLogicServiceImpl.java

@@ -1,25 +1,32 @@
 package com.qmth.distributed.print.business.templete.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.qmth.distributed.print.business.entity.ExamPrintPlan;
+import com.qmth.distributed.print.business.entity.ExamStudent;
 import com.qmth.distributed.print.business.entity.TSyncExamStudentScore;
-import com.qmth.distributed.print.business.service.ExamPrintPlanService;
+import com.qmth.distributed.print.business.service.ExamStudentService;
 import com.qmth.distributed.print.business.service.TSyncExamStudentScoreService;
 import com.qmth.distributed.print.business.templete.service.PushLogicService;
 import com.qmth.teachcloud.common.bean.result.SyncCountResult;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicClazz;
-import com.qmth.teachcloud.common.entity.SysOrg;
+import com.qmth.teachcloud.common.entity.BasicMajor;
+import com.qmth.teachcloud.common.entity.BasicStudent;
 import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.service.*;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.service.BasicClazzService;
+import com.qmth.teachcloud.common.service.BasicMajorService;
+import com.qmth.teachcloud.common.service.BasicStudentService;
+import com.qmth.teachcloud.common.service.SysUserService;
 import com.qmth.teachcloud.common.sync.StmmsUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.LinkedMultiValueMap;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * @Description: 同步推送处理逻辑接口实现类
@@ -33,26 +40,23 @@ public class PushLogicServiceImpl implements PushLogicService {
     @Resource
     private SysUserService sysUserService;
 
-    @Resource
-    private SysUserRoleService sysUserRoleService;
-
     @Resource
     StmmsUtils stmmsUtils;
 
     @Resource
-    private PushUserTrackService pushUserTrackService;
+    BasicClazzService basicClazzService;
 
     @Resource
-    SysOrgService sysOrgService;
+    TSyncExamStudentScoreService tSyncExamStudentScoreService;
 
     @Resource
-    BasicClazzService basicClazzService;
+    BasicStudentService basicStudentService;
 
     @Resource
-    ExamPrintPlanService examPrintPlanService;
+    ExamStudentService examStudentService;
 
     @Resource
-    TSyncExamStudentScoreService tSyncExamStudentScoreService;
+    BasicMajorService basicMajorService;
 
     @Override
     public Map<String, Object> executeUserPushLogic(Map<String, Object> map) throws IllegalAccessException {
@@ -77,82 +81,77 @@ public class PushLogicServiceImpl implements PushLogicService {
     public Map<String, Object> executeScorePushLogic(Map<String, Object> map) throws Exception {
         SysUser sysUser = (SysUser) map.get(SystemConstant.USER);
         Long schoolId = sysUser.getSchoolId();
-        Integer examId = (Integer) map.get("examId");
-        Long examIdLong = Long.parseLong(String.valueOf(examId));
-        String subjectCode = (String) map.get("subjectCode");
-        String college = (String) map.get("college");
-        String className = (String) map.get("className");
-        List<TSyncExamStudentScore> tSyncExamStudentScoreList = null;
-        List<String> errorTSyncExamStudentScoreList = null;
+        LinkedMultiValueMap<Long, Integer> semesterExamIdMap = (LinkedMultiValueMap<Long, Integer>) map.get("semesterExamIdMap");
+        List<TSyncExamStudentScore> tSyncExamStudentScoreList = new ArrayList<>();
+        List<String> errorTSyncExamStudentScoreList = new ArrayList<>();
+        AtomicInteger count = new AtomicInteger(0);
         try {
-            int totalCount = stmmsUtils.getStudentCount(schoolId, examId, null, null, null, subjectCode, college, className, null, true);
-            log.info("云阅卷：考试成绩考生数量查询接口调用，返回数量：{}", totalCount);
-            if (totalCount > 0) {
-                int pageSize = stmmsUtils.getDefaultPageSize();
-                int mod = totalCount % pageSize;
-                int pageNos = mod == 0 ? totalCount / pageSize : totalCount / pageSize + 1;
-                Map<String, SysOrg> orgMap = new HashMap<>();
-                Map<String, BasicClazz> clazzMap = new HashMap<>();
-                Long semesterId = examPrintPlanService.getOne(new QueryWrapper<ExamPrintPlan>().lambda().eq(ExamPrintPlan::getThirdRelateId, examIdLong)).getSemesterId();
-                tSyncExamStudentScoreList = new ArrayList<>();
-                errorTSyncExamStudentScoreList = new ArrayList<>();
-                for (int i = 1; i <= pageNos; i++) {
-                    List<Map> students = stmmsUtils.getStudentScore(schoolId, examId, null, null, null, subjectCode, college, className, null, true, i, pageSize);
-                    for (Map student : students) {
-                        try {
-                            Long orgId = null, clazzId = null, majorId = null;
-                            if (Objects.nonNull(student.get("college")) && Objects.equals("无", student.get("college"))) {
-                                //查学院id
-                                if (!orgMap.containsKey(student.get("college"))) {
-                                    SysOrg sysOrg = sysOrgService.getOne(new QueryWrapper<SysOrg>().lambda().eq(SysOrg::getSchoolId, schoolId).eq(SysOrg::getName, student.get("college")));
-                                    if (Objects.nonNull(sysOrg)) {
-                                        orgId = sysOrg.getId();
-                                        orgMap.put(sysOrg.getName(), sysOrg);
+            semesterExamIdMap.forEach((k, v) -> {
+                for (Integer examId : v) {
+                    int totalCount = stmmsUtils.getStudentCount(schoolId, examId, null, null, null, null, null, null, null, true);
+                    count.set(count.get() + totalCount);
+                    log.info("云阅卷：考试成绩考生数量查询接口调用，返回数量：{}", totalCount);
+                    if (totalCount > 0) {
+                        int pageSize = stmmsUtils.getDefaultPageSize();
+                        int mod = totalCount % pageSize;
+                        int pageNos = mod == 0 ? totalCount / pageSize : totalCount / pageSize + 1;
+                        for (int i = 1; i <= pageNos; i++) {
+                            List<Map> students = stmmsUtils.getStudentScore(schoolId, examId, null, null, null, null, null, null, null, true, i, pageSize);
+                            for (Map student : students) {
+                                try {
+                                    Long orgId = null, clazzId = null, majorId = null;
+                                    if (Objects.nonNull(student.get("studentCode")) && !Objects.equals("无", student.get("studentCode"))) {
+                                        //先查学生表
+                                        QueryWrapper<BasicStudent> basicStudentQueryWrapper = new QueryWrapper<>();
+                                        basicStudentQueryWrapper.lambda().eq(BasicStudent::getSchoolId, sysUser.getSchoolId())
+                                                .eq(BasicStudent::getStudentCode, student.get("studentCode"));
+                                        BasicStudent basicStudent = basicStudentService.getOne(basicStudentQueryWrapper);
+                                        if (Objects.isNull(basicStudent)) {//如果学生表为空，则查考生表
+                                            QueryWrapper<ExamStudent> examStudentQueryWrapper = new QueryWrapper<>();
+                                            examStudentQueryWrapper.lambda().eq(ExamStudent::getSchoolId, sysUser.getSchoolId())
+                                                    .eq(ExamStudent::getStudentCode, student.get("studentCode"));
+                                            ExamStudent examStudent = examStudentService.getOne(examStudentQueryWrapper);
+                                            Optional.ofNullable(examStudent).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未找到此考生信息"));
+                                            clazzId = Long.parseLong(examStudent.getClazzId());
+                                            if (Objects.nonNull(clazzId)) {
+                                                BasicClazz basicClazz = basicClazzService.getById(clazzId);
+                                                if (Objects.nonNull(basicClazz)) {
+                                                    majorId = basicClazz.getMajorId();
+                                                    BasicMajor basicMajor = basicMajorService.getById(majorId);
+                                                    orgId = basicMajor.getBelongOrgId();
+                                                }
+                                            }
+                                        } else {
+                                            orgId = basicStudent.getBelongOrgId();
+                                            clazzId = basicStudent.getClazzId();
+                                            majorId = basicStudent.getMajorId();
+                                        }
                                     }
-                                } else {
-                                    orgId = orgMap.get(student.get("college")).getId();
+                                    student.put(SystemConstant.SCHOOL_ID, schoolId);
+                                    student.put("semesterId", k);
+                                    student.put("orgId", orgId);
+                                    student.put("clazzId", clazzId);
+                                    student.put("majorId", majorId);
+                                    student.put("userId", sysUser.getId());
+                                    tSyncExamStudentScoreList.add(new TSyncExamStudentScore(student));
+                                } catch (Exception e) {
+                                    log.info("同步学生成绩信息失败:{}", e.getMessage());
+                                    e.printStackTrace();
+                                    errorTSyncExamStudentScoreList.add(student.get("name") + "," + student.get("examNumber") + "\r\n");
                                 }
                             }
-
-                            if (Objects.nonNull(student.get("className")) && Objects.equals("无", student.get("className"))) {
-                                //查班级和专业id
-                                if (!clazzMap.containsKey(student.get("className"))) {
-                                    BasicClazz basicClazz = basicClazzService.getOne(new QueryWrapper<BasicClazz>().lambda().eq(BasicClazz::getSchoolId, schoolId).eq(BasicClazz::getClazzName, student.get("className")));
-                                    if (Objects.nonNull(basicClazz)) {
-                                        clazzId = basicClazz.getId();
-                                        majorId = basicClazz.getMajorId();
-                                        clazzMap.put(basicClazz.getClazzName(), basicClazz);
-                                    }
-                                } else {
-                                    clazzId = clazzMap.get(student.get("className")).getId();
-                                    majorId = clazzMap.get(student.get("className")).getMajorId();
-                                }
-                            }
-                            student.put(SystemConstant.SCHOOL_ID, schoolId);
-                            student.put("semesterId", semesterId);
-                            student.put("orgId", orgId);
-                            student.put("clazzId", clazzId);
-                            student.put("majorId", majorId);
-                            student.put("userId", sysUser.getId());
-                            tSyncExamStudentScoreList.add(new TSyncExamStudentScore(student));
-                        } catch (Exception e) {
-                            log.info("同步学生成绩信息失败:{}", e.getMessage());
-                            e.printStackTrace();
-                            errorTSyncExamStudentScoreList.add(student.get("name") + "," + student.get("examNumber") + "\r\n");
+                        }
+                        if (tSyncExamStudentScoreList.size() > 0) {
+                            tSyncExamStudentScoreService.remove(new QueryWrapper<TSyncExamStudentScore>().lambda().eq(TSyncExamStudentScore::getSchoolId, schoolId).eq(TSyncExamStudentScore::getExamId, Long.parseLong(String.valueOf(examId))));
+                            tSyncExamStudentScoreService.saveOrUpdateBatch(tSyncExamStudentScoreList);
                         }
                     }
                 }
-                if (tSyncExamStudentScoreList.size() > 0) {
-                    tSyncExamStudentScoreService.remove(new QueryWrapper<TSyncExamStudentScore>().lambda().eq(TSyncExamStudentScore::getSchoolId, schoolId).eq(TSyncExamStudentScore::getExamId, examIdLong));
-                    tSyncExamStudentScoreService.saveOrUpdateBatch(tSyncExamStudentScoreList);
-                }
-            }
-            map.computeIfAbsent("count", v -> totalCount);
-            List<TSyncExamStudentScore> finalTSyncExamStudentScoreList = tSyncExamStudentScoreList;
-            map.computeIfAbsent("correct", v -> finalTSyncExamStudentScoreList.size());
+            });
+            map.computeIfAbsent("count", e -> count.get());
+            map.computeIfAbsent("correct", e -> tSyncExamStudentScoreList.size());
             if (Objects.nonNull(errorTSyncExamStudentScoreList) && errorTSyncExamStudentScoreList.size() > 0) {
-                List<String> finalErrorTSyncExamStudentScoreList = errorTSyncExamStudentScoreList;
-                map.computeIfAbsent("error", v -> "未同步成功数据" + finalErrorTSyncExamStudentScoreList.size() + "条:\r\n" + finalErrorTSyncExamStudentScoreList.toString());
+                map.computeIfAbsent("error", e -> "未同步成功数据" + errorTSyncExamStudentScoreList.size() + "条:\r\n" + errorTSyncExamStudentScoreList.toString());
             }
         } catch (Exception e) {
             log.info("云阅卷：接口调用失败：{}", e.getMessage());

distributed-print/src/main/java/com/qmth/distributed/print/api/TSyncExamStudentScoreController.java

@@ -18,8 +18,6 @@ import com.qmth.distributed.print.business.templete.execute.AsyncScoreExportServ
 import com.qmth.distributed.print.business.templete.execute.AsyncScorePushService;
 import com.qmth.teachcloud.common.config.DictionaryConfig;
 import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.entity.BasicClazz;
-import com.qmth.teachcloud.common.entity.SysOrg;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.entity.TBTask;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
@@ -32,6 +30,7 @@ import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import io.swagger.annotations.*;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -89,7 +88,7 @@ public class TSyncExamStudentScoreController {
     @ApiResponses({@ApiResponse(code = 200, message = "成绩查询信息", response = TSyncExamStudentScoreResult.class)})
     @RequestMapping(value = "/score/list", method = RequestMethod.POST)
     public Result list(@ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
-                       @ApiParam(value = "学院id", required = true) @RequestParam String orgId,
+                       @ApiParam(value = "学院id", required = false) @RequestParam(required = false) String orgId,
                        @ApiParam(value = "专业id", required = false) @RequestParam(required = false) String majorId,
                        @ApiParam(value = "班级id", required = false) @RequestParam(required = false) String clazzId,
                        @ApiParam(value = "课程编码", required = false) @RequestParam(required = false) String courseCode,
@@ -107,7 +106,7 @@ public class TSyncExamStudentScoreController {
     @ApiResponses({@ApiResponse(code = 200, message = "同步信息", response = TBTask.class)})
     @RequestMapping(value = "/score/export", method = RequestMethod.POST)
     public Result export(@ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
-                         @ApiParam(value = "学院id", required = true) @RequestParam String orgId,
+                         @ApiParam(value = "学院id", required = false) @RequestParam(required = false) String orgId,
                          @ApiParam(value = "专业id", required = false) @RequestParam(required = false) String majorId,
                          @ApiParam(value = "班级id", required = false) @RequestParam(required = false) String clazzId,
                          @ApiParam(value = "课程编码", required = false) @RequestParam(required = false) String courseCode) {
@@ -135,34 +134,21 @@ public class TSyncExamStudentScoreController {
     @ApiOperation(value = "成绩查询同步")
     @ApiResponses({@ApiResponse(code = 200, message = "同步异步任务信息", response = TBSyncTask.class)})
     @RequestMapping(value = "/score/sync", method = RequestMethod.POST)
-    public Result sync(@ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
-                       @ApiParam(value = "学院id", required = true) @RequestParam String orgId,
-                       @ApiParam(value = "班级id", required = false) @RequestParam(required = false) String clazzId,
-                       @ApiParam(value = "课程编码", required = false) @RequestParam(required = false) String courseCode) {
+    public Result sync(@ApiParam(value = "学期id", required = true) @RequestParam String semesterId) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         QueryWrapper<ExamPrintPlan> examPrintPlanQueryWrapper = new QueryWrapper<ExamPrintPlan>();
         examPrintPlanQueryWrapper.select(" DISTINCT third_relate_id ").eq("school_id", sysUser.getSchoolId())
-                .eq("semester_id", SystemConstant.convertIdToLong(semesterId))
-                .eq("org_id", SystemConstant.convertIdToLong(orgId));
+                .eq("semester_id", SystemConstant.convertIdToLong(semesterId));
         List<ExamPrintPlan> examPrintPlanList = examPrintPlanService.list(examPrintPlanQueryWrapper);
         if (Objects.isNull(examPrintPlanList) || examPrintPlanList.size() == 0) {
             throw ExceptionResultEnum.ERROR.exception("此学期学院下未找到需要同步的考试记录");
-        } else if (examPrintPlanList.size() > 1) {
-            throw ExceptionResultEnum.ERROR.exception("此学期学院下找到了多条考试记录");
         }
-        SysOrg sysOrg = sysOrgService.getById(SystemConstant.convertIdToLong(orgId));
-        Optional.ofNullable(sysOrg).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未找到此学院信息"));
-        BasicClazz basicClazz = null;
-        if (Objects.nonNull(clazzId)) {
-            basicClazz = basicClazzService.getById(SystemConstant.convertIdToLong(clazzId));
-            Optional.ofNullable(basicClazz).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未找到此班级信息"));
+        LinkedMultiValueMap<Long, Integer> semesterExamIdMap = new LinkedMultiValueMap<>();
+        for (ExamPrintPlan e : examPrintPlanList) {
+            semesterExamIdMap.add(Long.valueOf(semesterId), Integer.parseInt(String.valueOf(e.getThirdRelateId())));
         }
         Map<String, Object> map = printCommonService.savePush(PushTypeEnum.SCORE_PUSH);
-        map.computeIfAbsent("examId", v -> Integer.parseInt(String.valueOf(examPrintPlanList.get(0).getThirdRelateId())));
-        map.computeIfAbsent("subjectCode", v -> courseCode);
-        map.computeIfAbsent("college", v -> sysOrg.getName());
-        BasicClazz finalBasicClazz = basicClazz;
-        map.computeIfAbsent("className", v -> Objects.nonNull(finalBasicClazz) ? finalBasicClazz.getClazzName() : null);
+        map.computeIfAbsent("semesterExamIdMap", v -> semesterExamIdMap);
         asyncScorePushService.pushTask(map);
         TBSyncTask tbSyncTask = Objects.nonNull(map.get(SystemConstant.TB_SYNC_TASK)) ? (TBSyncTask) map.get(SystemConstant.TB_SYNC_TASK) : null;
         return Objects.nonNull(tbSyncTask) ? ResultUtil.ok(tbSyncTask.getId()) : ResultUtil.error("创建同步推送任务失败");
@@ -192,7 +178,7 @@ public class TSyncExamStudentScoreController {
     @ApiResponses({@ApiResponse(code = 200, message = "同步信息", response = TBTask.class)})
     @RequestMapping(value = "/score/batch_download", method = RequestMethod.POST)
     public Result batchDownload(@ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
-                                @ApiParam(value = "学院id", required = true) @RequestParam String orgId,
+                                @ApiParam(value = "学院id", required = false) @RequestParam(required = false) String orgId,
                                 @ApiParam(value = "专业id", required = false) @RequestParam(required = false) String majorId,
                                 @ApiParam(value = "班级id", required = false) @RequestParam(required = false) String clazzId,
                                 @ApiParam(value = "课程编码", required = false) @RequestParam(required = false) String courseCode) {

teachcloud-common/src/main/java/com/qmth/teachcloud/common/sync/StmmsUtils.java

@@ -457,27 +457,6 @@ public class StmmsUtils {
     public int getStudentCount(Long schoolId, Integer examId, String examCode, String examNumber, String studentCode, String subjectCode, String college, String className, String teacher, boolean withMarkTrack) {
         Map<String, Object> map = new HashMap<>();
         map.put("examId", validParam(String.valueOf(examId), null, true, "考试ID"));
-        if(Objects.nonNull(examCode)){
-            map.put("examCode", validParam(examCode, null, false, "考试编码"));
-        }
-        if(Objects.nonNull(examNumber)){
-            map.put("examNumber", validParam(examNumber, null, false, "准考证号"));
-        }
-        if(Objects.nonNull(studentCode)){
-            map.put("studentCode", validParam(studentCode, null, false, "学号"));
-        }
-        if(Objects.nonNull(subjectCode)){
-            map.put("subjectCode", validParam(subjectCode, null, false, "课程编码"));
-        }
-        if(Objects.nonNull(college)){
-            map.put("college", validParam(college, null, false, "学院"));
-        }
-        if(Objects.nonNull(className)){
-            map.put("className", validParam(className, null, false, "班级"));
-        }
-        if(Objects.nonNull(teacher)){
-            map.put("teacher", validParam(teacher, null, false, "教师"));
-        }
         map.put("withMarkTrack", validParam(withMarkTrack, true, false, "评分标记"));
 
         String hostUrl = dictionaryConfig.syncDataDomain().getHostUrl();
@@ -521,27 +500,6 @@ public class StmmsUtils {
     public List<Map> getStudentScore(Long schoolId, Integer examId, String examCode, String examNumber, String studentCode, String subjectCode, String college, String className, String teacher, boolean withMarkTrack, int pageNo, int pageSize) {
         Map<String, Object> map = new HashMap<>();
         map.put("examId", validParam(String.valueOf(examId), null, true, "考试ID"));
-        if(Objects.nonNull(examCode)){
-            map.put("examCode", validParam(examCode, null, false, "考试编码"));
-        }
-        if(Objects.nonNull(examNumber)){
-            map.put("examNumber", validParam(examNumber, null, false, "准考证号"));
-        }
-        if(Objects.nonNull(studentCode)){
-            map.put("studentCode", validParam(studentCode, null, false, "学号"));
-        }
-        if(Objects.nonNull(subjectCode)){
-            map.put("subjectCode", validParam(subjectCode, null, false, "课程编码"));
-        }
-        if(Objects.nonNull(college)){
-            map.put("college", validParam(college, null, false, "学院"));
-        }
-        if(Objects.nonNull(className)){
-            map.put("className", validParam(className, null, false, "班级"));
-        }
-        if(Objects.nonNull(teacher)){
-            map.put("teacher", validParam(teacher, null, false, "教师"));
-        }
         map.put("withMarkTrack", validParam(withMarkTrack, true, false, "评分标记"));
         map.put("pageNumber", validParam(String.valueOf(pageNo), null, true, "页码"));
         map.put("pageSize", validParam(String.valueOf(pageSize), null, true, "数量"));