修改为openCollege

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

@@ -12,7 +12,6 @@ import com.qmth.eds.common.entity.ExamAssign;
 import com.qmth.eds.common.util.Result;
 import com.qmth.eds.common.util.ResultUtil;
 import com.qmth.eds.service.CloudMarkingScoreService;
-import com.qmth.eds.service.CommonService;
 import com.qmth.eds.service.ExamAssignService;
 import io.swagger.annotations.*;
 import org.springframework.util.CollectionUtils;
@@ -44,9 +43,6 @@ public class ExamAssignController {
     @Resource
     private ExamAssignService examAssignService;
 
-    @Resource
-    CommonService commonService;
-
     @Resource
     CloudMarkingScoreService cloudMarkingScoreService;
 
@@ -86,13 +82,13 @@ public class ExamAssignController {
     public Result assignResultPreview(@ApiParam(value = "学期id", required = true) @RequestParam Long semesterId,
                                       @ApiParam(value = "考试id", required = true) @RequestParam Long examTypeId,
                                       @ApiParam(value = "科目代码", required = true) @RequestParam String courseCode,
-                                      @ApiParam(value = "开课学院", required = true) @RequestParam String kkCollegeName,
-                                      @ApiParam(value = "考查学院", required = false) @RequestParam(required = false) String kcCollegeName,
+                                      @ApiParam(value = "开课学院", required = true) @RequestParam String openCollege,
+                                      @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,
                                       @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                                       @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        return ResultUtil.ok(examAssignService.assignResultPreview(new Page<>(pageNumber, pageSize), semesterId, examTypeId, courseCode, kkCollegeName, kcCollegeName, clazzId, teacherCode));
+        return ResultUtil.ok(examAssignService.assignResultPreview(new Page<>(pageNumber, pageSize), semesterId, examTypeId, courseCode, openCollege, kcCollege, clazzId, teacherCode));
     }
 
     @ApiOperation(value = "计算结果对比")
@@ -101,10 +97,9 @@ public class ExamAssignController {
     public Result contrast(@ApiParam(value = "学期id", required = true) @RequestParam Long semesterId,
                            @ApiParam(value = "考试id", required = true) @RequestParam Long examTypeId,
                            @ApiParam(value = "科目代码", required = true) @RequestParam String courseCode,
-                           @ApiParam(value = "开课学院", required = true) @RequestParam String kkCollegeName,
+                           @ApiParam(value = "开课学院", required = true) @RequestParam String openCollege,
                            @ApiParam(value = "及格分", required = true) @RequestParam BigDecimal passScore) {
-        List<String> cloudMarkSubjectCodeList = commonService.findCloudMarkSubjectCode(semesterId, examTypeId, courseCode);
-        List<StudentMarkResult> studentMarkResultList = cloudMarkingScoreService.queryStudentMark(semesterId, examTypeId, kkCollegeName, cloudMarkSubjectCodeList);
+        List<StudentMarkResult> studentMarkResultList = cloudMarkingScoreService.queryStudentMark(semesterId, examTypeId, openCollege, courseCode);
         AssignContrastResult assignContrastResult = null;
         if (!CollectionUtils.isEmpty(studentMarkResultList)) {
             BigDecimal assignBeforeSumScore = new BigDecimal(0), assignAfterSumScore = new BigDecimal(0), sumCount = new BigDecimal(studentMarkResultList.size());

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

@@ -13,7 +13,6 @@ import com.qmth.eds.common.enums.ExceptionResultEnum;
 import com.qmth.eds.common.util.Result;
 import com.qmth.eds.common.util.ResultUtil;
 import com.qmth.eds.common.util.ServletUtil;
-import com.qmth.eds.service.CommonService;
 import com.qmth.eds.service.ExamSyncStudentService;
 import com.qmth.eds.service.SysUserService;
 import com.qmth.eds.service.TeachcloudCommonService;
@@ -42,9 +41,6 @@ public class SysController {
     @Resource
     TeachcloudCommonService teachcloudCommonService;
 
-    @Resource
-    CommonService commonService;
-
     @Resource
     ExamSyncStudentService examSyncStudentService;
 
@@ -112,9 +108,8 @@ public class SysController {
     public Result examineCollegeList(@ApiParam(value = "学期id", required = true) @RequestParam Long semesterId,
                                      @ApiParam(value = "考试id", required = true) @RequestParam Long examTypeId,
                                      @ApiParam(value = "科目代码", required = true) @RequestParam String courseCode,
-                                     @ApiParam(value = "开课学院", required = true) @RequestParam String kkCollegeName) {
-        List<String> cloudMarkSubjectCodeList = commonService.findCloudMarkSubjectCode(semesterId, examTypeId, courseCode);
-        List<ExamSyncStudent> examSyncStudentList = examSyncStudentService.queryByExamineCollegeList(semesterId, examTypeId, cloudMarkSubjectCodeList, kkCollegeName, null, null);
+                                     @ApiParam(value = "开课学院", required = true) @RequestParam String openCollege) {
+        List<ExamSyncStudent> examSyncStudentList = examSyncStudentService.queryByExamineCollegeList(semesterId, examTypeId, courseCode, openCollege, null, null);
         Set<ExamineCollegeResult> examineCollegeResultList = null;
         if (!CollectionUtils.isEmpty(examSyncStudentList)) {
             examineCollegeResultList = new LinkedHashSet<>(examSyncStudentList.size());
@@ -133,10 +128,9 @@ public class SysController {
     public Result clazzList(@ApiParam(value = "学期id", required = true) @RequestParam Long semesterId,
                             @ApiParam(value = "考试id", required = true) @RequestParam Long examTypeId,
                             @ApiParam(value = "科目代码", required = true) @RequestParam String courseCode,
-                            @ApiParam(value = "开课学院", required = true) @RequestParam String kkCollegeName,
-                            @ApiParam(value = "考查学院名称", required = true) @RequestParam String kcCollegeName) {
-        List<String> cloudMarkSubjectCodeList = commonService.findCloudMarkSubjectCode(semesterId, examTypeId, courseCode);
-        List<ExamSyncStudent> examSyncStudentList = examSyncStudentService.queryByExamineCollegeList(semesterId, examTypeId, cloudMarkSubjectCodeList, kkCollegeName, kcCollegeName, null);
+                            @ApiParam(value = "开课学院", required = true) @RequestParam String openCollege,
+                            @ApiParam(value = "考查学院名称", required = true) @RequestParam String kcCollege) {
+        List<ExamSyncStudent> examSyncStudentList = examSyncStudentService.queryByExamineCollegeList(semesterId, examTypeId, courseCode, openCollege, kcCollege, null);
         Set<ClazzResult> clazzResultList = null;
         if (!CollectionUtils.isEmpty(examSyncStudentList)) {
             clazzResultList = new LinkedHashSet<>(examSyncStudentList.size());
@@ -156,11 +150,10 @@ public class SysController {
     public Result teacherList(@ApiParam(value = "学期id", required = true) @RequestParam Long semesterId,
                               @ApiParam(value = "考试id", required = true) @RequestParam Long examTypeId,
                               @ApiParam(value = "科目代码", required = true) @RequestParam String courseCode,
-                              @ApiParam(value = "开课学院", required = true) @RequestParam String kkCollegeName,
-                              @ApiParam(value = "考查学院名称", required = true) @RequestParam String kcCollegeName,
+                              @ApiParam(value = "开课学院", required = true) @RequestParam String openCollege,
+                              @ApiParam(value = "考查学院名称", required = true) @RequestParam String kcCollege,
                               @ApiParam(value = "班级id", required = true) @RequestParam String clazzId) {
-        List<String> cloudMarkSubjectCodeList = commonService.findCloudMarkSubjectCode(semesterId, examTypeId, courseCode);
-        List<ExamSyncStudent> examSyncStudentList = examSyncStudentService.queryByExamineCollegeList(semesterId, examTypeId, cloudMarkSubjectCodeList, kkCollegeName, kcCollegeName, clazzId);
+        List<ExamSyncStudent> examSyncStudentList = examSyncStudentService.queryByExamineCollegeList(semesterId, examTypeId, courseCode, openCollege, kcCollege, clazzId);
         Set<TeacherResult> teacherResultList = null;
         if (!CollectionUtils.isEmpty(examSyncStudentList)) {
             teacherResultList = new LinkedHashSet<>(examSyncStudentList.size());

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

@@ -18,17 +18,6 @@ public interface CloudMarkingScoreMapper extends BaseMapper<CloudMarkingScore> {
 
     IPage<CloudMarkingScoreDto> pageData(@Param("page") Page<CloudMarkingScoreDto> page, @Param("collegeId") Long collegeId, @Param("semesterId") Long semesterId, @Param("examTypeId") Long examTypeId, @Param("examId") String examId);
 
-    /**
-     * 根据科目代码查询
-     *
-     * @param schoolId
-     * @param semesterId
-     * @param examTypeId
-     * @param courseCode
-     * @return
-     */
-    List<String> queryBySyncCourseCode(@Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examTypeId") Long examTypeId, @Param("courseCode") String courseCode);
-
     List<ExamSyncStudentDto> listExamSyncStudentDtos(@Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examTypeId") Long examTypeId, @Param("courseCode") String courseCode, @Param("openCollege") String openCollege);
 
     /**
@@ -38,14 +27,14 @@ public interface CloudMarkingScoreMapper extends BaseMapper<CloudMarkingScore> {
      * @param orgId
      * @param semesterId
      * @param examTypeId
-     * @param kkCollegeName
-     * @param cloudMarkSubjectCodeList
+     * @param openCollege
+     * @param courseCode
      * @return
      */
     List<StudentMarkResult> queryStudentMark(@Param("schoolId") Long schoolId,
                                              @Param("orgId") Long orgId,
                                              @Param("semesterId") Long semesterId,
                                              @Param("examTypeId") Long examTypeId,
-                                             @Param("kkCollegeName") String kkCollegeName,
-                                             @Param("cloudMarkSubjectCodeList") List<String> cloudMarkSubjectCodeList);
+                                             @Param("openCollege") String openCollege,
+                                             @Param("courseCode") String courseCode);
 }

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

@@ -28,8 +28,8 @@ public interface ExamAssignMapper extends BaseMapper<ExamAssign> {
      * @param semesterId
      * @param examTypeId
      * @param courseCode
-     * @param kkCollegeName
-     * @param kcCollegeName
+     * @param openCollege
+     * @param kcCollege
      * @param clazzId
      * @param teacherCode
      * @return
@@ -38,6 +38,6 @@ public interface ExamAssignMapper extends BaseMapper<ExamAssign> {
                                                          @Param("semesterId") Long semesterId,
                                                          @Param("examTypeId") Long examTypeId,
                                                          @Param("courseCode") String courseCode,
-                                                         @Param("kkCollegeName") String kkCollegeName,
-                                                         @Param("kcCollegeName") String kcCollegeName, @Param("clazzId") String clazzId, @Param("teacherCode") String teacherCode);
+                                                         @Param("openCollege") String openCollege,
+                                                         @Param("kcCollege") String kcCollege, @Param("clazzId") String clazzId, @Param("teacherCode") String teacherCode);
 }

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

@@ -18,12 +18,12 @@ public interface ExamSyncStudentMapper extends BaseMapper<ExamSyncStudent> {
      * @param semesterId
      * @param orgId
      * @param examTypeId
-     * @param cloudMarkSubjectCodeList
-     * @param kkCollegeName
-     * @param kcCollegeName
+     * @param courseCode
+     * @param openCollege
+     * @param kcCollege
      * @param clazzId
      * @return
      */
-    List<ExamSyncStudent> queryByExamineCollegeList(@Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("orgId") Long orgId, @Param("examTypeId") Long examTypeId, @Param("cloudMarkSubjectCodeList") List<String> cloudMarkSubjectCodeList
-            , @Param("kkCollegeName") String kkCollegeName, @Param("kcCollegeName") String kcCollegeName, @Param("clazzId") String clazzId);
+    List<ExamSyncStudent> queryByExamineCollegeList(@Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("orgId") Long orgId, @Param("examTypeId") Long examTypeId, @Param("courseCode") String courseCode
+            , @Param("openCollege") String openCollege, @Param("kcCollege") String kcCollege, @Param("clazzId") String clazzId);
 }

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

@@ -18,17 +18,6 @@ public interface CloudMarkingScoreService extends IService<CloudMarkingScore> {
 
     IPage<CloudMarkingScoreDto> pageData(Long collegeId, Long semesterId, Long examTypeId, String examId, Integer pageNumber, Integer pageSize);
 
-    /**
-     * 根据科目代码查询
-     *
-     * @param schoolId
-     * @param semesterId
-     * @param examTypeId
-     * @param courseCode
-     * @return
-     */
-    List<String> queryBySyncCourseCode(Long schoolId, Long semesterId, Long examTypeId, String courseCode);
-
     List<ExamSyncStudentDto> listExamSyncStudentDtos(Long schoolId, Long semesterId, Long examTypeId, String courseCode, String openCollege);
 
     /**
@@ -36,12 +25,12 @@ public interface CloudMarkingScoreService extends IService<CloudMarkingScore> {
      *
      * @param semesterId
      * @param examTypeId
-     * @param kkCollegeName
-     * @param cloudMarkSubjectCodeList
+     * @param openCollege
+     * @param courseCode
      * @return
      */
     List<StudentMarkResult> queryStudentMark(Long semesterId,
                                              Long examTypeId,
-                                             String kkCollegeName,
-                                             List<String> cloudMarkSubjectCodeList);
+                                             String openCollege,
+                                             String courseCode);
 }

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

@@ -75,14 +75,4 @@ public interface CommonService {
      * @return
      */
     String getSysSettingValue(Long schoolId, String code);
-
-    /**
-     * 查询云阅卷科目代码
-     *
-     * @param semesterId
-     * @param examTypeId
-     * @param courseCode
-     * @return
-     */
-    List<String> findCloudMarkSubjectCode(Long semesterId, Long examTypeId, String courseCode);
 }

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

@@ -27,8 +27,8 @@ public interface ExamAssignService extends IService<ExamAssign> {
      * @param semesterId
      * @param examTypeId
      * @param courseCode
-     * @param kkCollegeName
-     * @param kcCollegeName
+     * @param openCollege
+     * @param kcCollege
      * @param clazzId
      * @param teacherCode
      * @return
@@ -37,8 +37,8 @@ public interface ExamAssignService extends IService<ExamAssign> {
                                                          Long semesterId,
                                                          Long examTypeId,
                                                          String courseCode,
-                                                         String kkCollegeName,
-                                                         String kcCollegeName, String clazzId, String teacherCode);
+                                                         String openCollege,
+                                                         String kcCollege, String clazzId, String teacherCode);
 
     Map contrast(Long semesterId, Long examTypeId, String courseCode);
 

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

@@ -5,7 +5,6 @@ import com.qmth.eds.common.entity.ExamSyncStudent;
 import com.qmth.eds.common.entity.ExamSyncTotal;
 
 import java.util.List;
-import java.util.Set;
 
 /**
  * 考试类型表 服务类
@@ -19,11 +18,11 @@ public interface ExamSyncStudentService extends IService<ExamSyncStudent> {
      *
      * @param semesterId
      * @param examTypeId
-     * @param cloudMarkSubjectCodeList
-     * @param kkCollegeName
-     * @param kcCollegeName
+     * @param courseCode
+     * @param openCollege
+     * @param kcCollege
      * @param clazzId
      * @return
      */
-    List<ExamSyncStudent> queryByExamineCollegeList(Long semesterId, Long examTypeId, List<String> cloudMarkSubjectCodeList, String kkCollegeName, String kcCollegeName, String clazzId);
+    List<ExamSyncStudent> queryByExamineCollegeList(Long semesterId, Long examTypeId, String courseCode, String openCollege, String kcCollege, String clazzId);
 }

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

@@ -41,20 +41,6 @@ public class CloudMarkingScoreServiceImpl extends ServiceImpl<CloudMarkingScoreM
         return this.baseMapper.pageData(page, collegeId, semesterId, examTypeId, examId);
     }
 
-    /**
-     * 根据科目代码查询
-     *
-     * @param schoolId
-     * @param semesterId
-     * @param examTypeId
-     * @param courseCode
-     * @return
-     */
-    @Override
-    public List<String> queryBySyncCourseCode(Long schoolId, Long semesterId, Long examTypeId, String courseCode) {
-        return cloudMarkingScoreMapper.queryBySyncCourseCode(schoolId, semesterId, examTypeId, courseCode);
-    }
-
     @Override
     public List<ExamSyncStudentDto> listExamSyncStudentDtos(Long schoolId, Long semesterId, Long examTypeId, String courseCode, String openCollege) {
         return this.baseMapper.listExamSyncStudentDtos(schoolId, semesterId, examTypeId, courseCode, openCollege);
@@ -65,14 +51,14 @@ public class CloudMarkingScoreServiceImpl extends ServiceImpl<CloudMarkingScoreM
      *
      * @param semesterId
      * @param examTypeId
-     * @param kkCollegeName
-     * @param cloudMarkSubjectCodeList
+     * @param openCollege
+     * @param courseCode
      * @return
      */
     @Override
-    public List<StudentMarkResult> queryStudentMark(Long semesterId, Long examTypeId, String kkCollegeName, List<String> cloudMarkSubjectCodeList) {
+    public List<StudentMarkResult> queryStudentMark(Long semesterId, Long examTypeId, String openCollege, String courseCode) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        return cloudMarkingScoreMapper.queryStudentMark(schoolId, sysUser.getOrgId(), semesterId, examTypeId, kkCollegeName, cloudMarkSubjectCodeList);
+        return cloudMarkingScoreMapper.queryStudentMark(schoolId, sysUser.getOrgId(), semesterId, examTypeId, openCollege, courseCode);
     }
 }

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

@@ -50,12 +50,6 @@ public class CommonServiceImpl implements CommonService {
     @Resource
     SysRoleService sysRoleService;
 
-    @Resource
-    CloudMarkingScoreService cloudMarkingScoreService;
-
-    @Resource
-    ExamSyncStudentService examSyncStudentService;
-
     /**
      * 获取用户菜单
      *
@@ -241,20 +235,4 @@ public class CommonServiceImpl implements CommonService {
         }
         return simpleObject.getValue();
     }
-
-    /**
-     * 查询云阅卷科目代码
-     *
-     * @param semesterId
-     * @param examTypeId
-     * @param courseCode
-     * @return
-     */
-    @Override
-    public List<String> findCloudMarkSubjectCode(Long semesterId, Long examTypeId, String courseCode) {
-        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        //先查询云阅卷科目代码
-        List<String> courseCodeList = cloudMarkingScoreService.queryBySyncCourseCode(schoolId, semesterId, examTypeId, courseCode);
-        return !CollectionUtils.isEmpty(courseCodeList) ? courseCodeList : Collections.emptyList();
-    }
 }

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

@@ -108,7 +108,8 @@ public class ExamAssignServiceImpl extends ServiceImpl<ExamAssignMapper, ExamAss
      * @param semesterId
      * @param examTypeId
      * @param courseCode
-     * @param kkCollegeName
+     * @param openCollege
+     * @param kcCollege
      * @param clazzId
      * @param teacherCode
      * @return
@@ -117,10 +118,10 @@ public class ExamAssignServiceImpl extends ServiceImpl<ExamAssignMapper, ExamAss
     public IPage<AssignResultPreviewResult> assignResultPreview(IPage<Map> iPage,
                                                                 Long semesterId,
                                                                 Long examTypeId,
-                                                                String courseCode, String kkCollegeName, String kcCollegeName, String clazzId, String teacherCode) {
+                                                                String courseCode, String openCollege, String kcCollege, String clazzId, String teacherCode) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        return examAssignMapper.assignResultPreview(iPage, schoolId, sysUser.getOrgId(), semesterId, examTypeId, courseCode, kkCollegeName, kcCollegeName, clazzId, teacherCode);
+        return examAssignMapper.assignResultPreview(iPage, schoolId, sysUser.getOrgId(), semesterId, examTypeId, courseCode, openCollege, kcCollege, clazzId, teacherCode);
     }
 
     @Override

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

@@ -58,16 +58,16 @@ public class ExamSyncStudentServiceImpl extends ServiceImpl<ExamSyncStudentMappe
      *
      * @param semesterId
      * @param examTypeId
-     * @param cloudMarkSubjectCodeList
-     * @param kkCollegeName
-     * @param kcCollegeName
+     * @param courseCode
+     * @param openCollege
+     * @param kcCollege
      * @param clazzId
      * @return
      */
     @Override
-    public List<ExamSyncStudent> queryByExamineCollegeList(Long semesterId, Long examTypeId, List<String> cloudMarkSubjectCodeList, String kkCollegeName, String kcCollegeName, String clazzId) {
+    public List<ExamSyncStudent> queryByExamineCollegeList(Long semesterId, Long examTypeId, String courseCode, String openCollege, String kcCollege, String clazzId) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        return examSyncStudentMapper.queryByExamineCollegeList(schoolId, semesterId, sysUser.getOrgId(), examTypeId, cloudMarkSubjectCodeList, kkCollegeName, kcCollegeName, clazzId);
+        return examSyncStudentMapper.queryByExamineCollegeList(schoolId, semesterId, sysUser.getOrgId(), examTypeId, courseCode, openCollege, kcCollege, clazzId);
     }
 }

src/main/resources/mapper/CloudMarkingScoreMapper.xml

@@ -39,27 +39,6 @@
         </where>
     </select>
 
-    <select id="queryBySyncCourseCode" resultType="java.lang.String">
-        select
-            ecm.cloud_marking_course_code
-        from
-            exam_course_mapping ecm
-        <where>
-            <if test="schoolId != null and schoolId != ''">
-                and ecm.school_id = #{schoolId}
-            </if>
-            <if test="semesterId != null and semesterId != ''">
-                and ecm.semester_id = #{semesterId}
-            </if>
-            <if test="examTypeId != null and examTypeId != ''">
-                and ecm.exam_type_id = #{examTypeId}
-            </if>
-            <if test="courseCode != null and courseCode != ''">
-                and ecm.sync_course_code = #{courseCode}
-            </if>
-        </where>
-    </select>
-
     <select id="listExamSyncStudentDtos" resultType="com.qmth.eds.bean.dto.ExamSyncStudentDto">
         SELECT
             cms.id cloudMarkingScoreId,
@@ -125,14 +104,11 @@
             <if test="examTypeId != null and examTypeId != ''">
                 and t.exam_type_id = #{examTypeId}
             </if>
-            <if test="cloudMarkSubjectCodeList != null and cloudMarkSubjectCodeList != '' and cloudMarkSubjectCodeList.size > 0">
-                and t.subject_code in
-                <foreach collection="cloudMarkSubjectCodeList" item="subjectCode" index="index" open="(" close=")" separator=",">
-                    #{subjectCode}
-                </foreach>
+            <if test="courseCode != null and courseCode != ''">
+                and ess.kch = #{courseCode}
             </if>
-            <if test="kkCollegeName != null and kkCollegeName != ''">
-                and ess.kkbm = #{kkCollegeName}
+            <if test="openCollege != null and openCollege != ''">
+                and ess.kkbm = #{openCollege}
             </if>
         </where>
     </select>

src/main/resources/mapper/ExamAssignMapper.xml

@@ -49,8 +49,8 @@
             <if test="orgId != null and orgId != ''">
                 and cms.school_id = #{orgId}
             </if>
-            <if test="kcCollegeName != null and kcCollegeName != ''">
-                and ess.jgmc = #{kcCollegeName}
+            <if test="kcCollege != null and kcCollege != ''">
+                and ess.jgmc = #{kcCollege}
             </if>
             <if test="semesterId != null and semesterId != ''">
                 and cms.semester_id = #{semesterId}
@@ -58,8 +58,11 @@
             <if test="examTypeId != null and examTypeId != ''">
                 and cms.exam_type_id = #{examTypeId}
             </if>
-            <if test="kkCollegeName != null and kkCollegeName != ''">
-                and ess.kkbm = #{kkCollegeName}
+            <if test="courseCode != null and courseCode != ''">
+                and ess.kch = #{courseCode}
+            </if>
+            <if test="openCollege != null and openCollege != ''">
+                and ess.kkbm = #{openCollege}
             </if>
             <if test="clazzId != null and clazzId != ''">
                 and ess.jxb_id = #{clazzId}

src/main/resources/mapper/ExamSyncStudentMapper.xml

@@ -21,17 +21,14 @@
             <if test="examTypeId != null and examTypeId != ''">
                 and cms.exam_type_id = #{examTypeId}
             </if>
-            <if test="cloudMarkSubjectCodeList != null and cloudMarkSubjectCodeList != '' and cloudMarkSubjectCodeList.size > 0">
-                and cms.subject_code in
-                <foreach collection="cloudMarkSubjectCodeList" item="subjectCode" index="index" open="(" close=")" separator=",">
-                    #{subjectCode}
-                </foreach>
+            <if test="courseCode != null and courseCode != ''">
+                and ess.kch = #{courseCode}
             </if>
-            <if test="kkCollegeName != null and kkCollegeName != ''">
-                and ess.kkbm = #{kkCollegeName}
+            <if test="openCollege != null and openCollege != ''">
+                and ess.kkbm = #{openCollege}
             </if>
-            <if test="kcCollegeName != null and kcCollegeName != ''">
-                and ess.jgmc = #{kcCollegeName}
+            <if test="kcCollege != null and kcCollege != ''">
+                and ess.jgmc = #{kcCollege}
             </if>
             <if test="clazzId != null and clazzId != ''">
                 and ess.jxb_id = #{clazzId}