新增班级和任课老师查询列表

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

@@ -5,9 +5,7 @@ import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.eds.bean.params.LoginParam;
-import com.qmth.eds.bean.result.EditResult;
-import com.qmth.eds.bean.result.ExamineCollegeResult;
-import com.qmth.eds.bean.result.LoginResult;
+import com.qmth.eds.bean.result.*;
 import com.qmth.eds.common.entity.CloudMarkingScore;
 import com.qmth.eds.common.entity.ExamSyncStudent;
 import com.qmth.eds.common.entity.SysUser;
@@ -116,6 +114,70 @@ public class SysController {
     public Result examineCollegeList(@ApiParam(value = "学期id") @RequestParam(required = false) Long semesterId,
                                      @ApiParam(value = "考试id") @RequestParam(required = false) Long examId,
                                      @ApiParam(value = "科目代码") @RequestParam(required = false) String subjectCode) {
+        List<ExamSyncStudent> examSyncStudentList = this.conditionCommonQuery(semesterId, examId, subjectCode);
+        List<ExamineCollegeResult> examineCollegeResultList = null;
+        if (!CollectionUtils.isEmpty(examSyncStudentList)) {
+            examineCollegeResultList = new ArrayList<>(examSyncStudentList.size());
+            for (ExamSyncStudent e : examSyncStudentList) {
+                if (Objects.nonNull(e.getJgmc()) && !Objects.equals(e.getJgmc().trim(), "")) {
+                    examineCollegeResultList.add(new ExamineCollegeResult(e.getJgmc(), e.getJgmc()));
+                }
+            }
+        }
+        return ResultUtil.ok(examineCollegeResultList);
+    }
+
+    @ApiOperation(value = "查询班级列表")
+    @PostMapping("/clazz/list")
+    @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = ClazzResult.class)})
+    public Result clazzList(@ApiParam(value = "学期id") @RequestParam(required = false) Long semesterId,
+                            @ApiParam(value = "考试id") @RequestParam(required = false) Long examId,
+                            @ApiParam(value = "科目代码") @RequestParam(required = false) String subjectCode) {
+        List<ExamSyncStudent> examSyncStudentList = this.conditionCommonQuery(semesterId, examId, subjectCode);
+        List<ClazzResult> clazzResultList = null;
+        if (!CollectionUtils.isEmpty(examSyncStudentList)) {
+            clazzResultList = new ArrayList<>(examSyncStudentList.size());
+            for (ExamSyncStudent e : examSyncStudentList) {
+                if ((Objects.nonNull(e.getJxbId()) && !Objects.equals(e.getJxbId().trim(), ""))
+                        && (Objects.nonNull(e.getJxbmc()) && !Objects.equals(e.getJxbmc().trim(), ""))) {
+                    clazzResultList.add(new ClazzResult(e.getJxbId(), e.getJxbmc()));
+                }
+            }
+        }
+        return ResultUtil.ok(clazzResultList);
+    }
+
+    @ApiOperation(value = "查询任课老师列表")
+    @PostMapping("/teacher/list")
+    @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = TeacherResult.class)})
+    public Result teacherList(@ApiParam(value = "学期id") @RequestParam(required = false) Long semesterId,
+                              @ApiParam(value = "考试id") @RequestParam(required = false) Long examId,
+                              @ApiParam(value = "科目代码") @RequestParam(required = false) String subjectCode) {
+        List<ExamSyncStudent> examSyncStudentList = this.conditionCommonQuery(semesterId, examId, subjectCode);
+        List<TeacherResult> teacherResultList = null;
+        if (!CollectionUtils.isEmpty(examSyncStudentList)) {
+            teacherResultList = new ArrayList<>(examSyncStudentList.size());
+            for (ExamSyncStudent e : examSyncStudentList) {
+                if ((Objects.nonNull(e.getJgh()) && !Objects.equals(e.getJgh().trim(), ""))
+                        && (Objects.nonNull(e.getXm()) && !Objects.equals(e.getXm().trim(), ""))) {
+                    teacherResultList.add(new TeacherResult(e.getJgh(), e.getXm()));
+                }
+            }
+        }
+        return ResultUtil.ok(teacherResultList);
+    }
+
+    /**
+     * 查询条件公用
+     *
+     * @param semesterId
+     * @param examId
+     * @param subjectCode
+     * @return
+     */
+    private List<ExamSyncStudent> conditionCommonQuery(Long semesterId,
+                                                       Long examId,
+                                                       String subjectCode) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         QueryWrapper<CloudMarkingScore> cloudMarkingScoreQueryWrapper = new QueryWrapper<>();
@@ -136,14 +198,6 @@ public class SysController {
             subjectCodeSet = new HashSet<>(cloudMarkingScoreList.size());
             subjectCodeSet = cloudMarkingScoreList.stream().map(s -> s.getSubjectCode()).collect(Collectors.toSet());
         }
-        List<ExamSyncStudent> examSyncStudentList = examSyncStudentService.queryByExamineCollegeList(schoolId, sysUser.getOrgId(), examId, subjectCode, subjectCodeSet);
-        List<ExamineCollegeResult> examineCollegeResultList = null;
-        if (!CollectionUtils.isEmpty(examSyncStudentList)) {
-            examineCollegeResultList = new ArrayList<>(examSyncStudentList.size());
-            for (ExamSyncStudent e : examSyncStudentList) {
-                examineCollegeResultList.add(new ExamineCollegeResult(e.getJgmc(), e.getJgmc()));
-            }
-        }
-        return ResultUtil.ok(examineCollegeResultList);
+        return examSyncStudentService.queryByExamineCollegeList(schoolId, sysUser.getOrgId(), examId, subjectCode, subjectCodeSet);
     }
 }

src/main/java/com/qmth/eds/bean/result/ClazzResult.java

@@ -0,0 +1,46 @@
+package com.qmth.eds.bean.result;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 班级result
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2023/5/23
+ */
+public class ClazzResult implements Serializable {
+
+    @ApiModelProperty(value = "id")
+    String id;
+
+    @ApiModelProperty(value = "名称")
+    String name;
+
+    public ClazzResult() {
+
+    }
+
+    public ClazzResult(String id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

src/main/java/com/qmth/eds/bean/result/TeacherResult.java

@@ -0,0 +1,46 @@
+package com.qmth.eds.bean.result;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 任课老师result
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2023/5/23
+ */
+public class TeacherResult implements Serializable {
+
+    @ApiModelProperty(value = "工号")
+    String code;
+
+    @ApiModelProperty(value = "名称")
+    String name;
+
+    public TeacherResult() {
+
+    }
+
+    public TeacherResult(String code, String name) {
+        this.code = id;
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}