1.1.0 update

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

@@ -137,8 +137,9 @@ 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 openCollege) {
-        List<ExamSyncStudent> examSyncStudentList = examSyncStudentService.queryByExamineCollegeList(semesterId, examTypeId, courseCode, openCollege, null, null);
+                                     @ApiParam(value = "开课学院", required = true) @RequestParam String openCollege,
+                                     @ApiParam(value = "开课学院", required = true) @RequestParam Long collegeId) {
+        List<ExamSyncStudent> examSyncStudentList = examSyncStudentService.queryByExamineCollegeList(semesterId, examTypeId, courseCode, openCollege, collegeId,null, null);
         Set<ExamineCollegeResult> examineCollegeResultList = null;
         if (!CollectionUtils.isEmpty(examSyncStudentList)) {
             examineCollegeResultList = new LinkedHashSet<>(examSyncStudentList.size());
@@ -159,7 +160,7 @@ public class SysController {
                             @ApiParam(value = "科目代码", required = true) @RequestParam String courseCode,
                             @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);
+        List<ExamSyncStudent> examSyncStudentList = examSyncStudentService.queryByExamineCollegeList(semesterId, examTypeId, courseCode, openCollege, null, kcCollege, null);
         Set<ClazzResult> clazzResultList = null;
         if (!CollectionUtils.isEmpty(examSyncStudentList)) {
             clazzResultList = new LinkedHashSet<>(examSyncStudentList.size());
@@ -182,7 +183,7 @@ public class SysController {
                               @ApiParam(value = "开课学院", required = true) @RequestParam String openCollege,
                               @ApiParam(value = "考查学院名称", required = true) @RequestParam String kcCollege,
                               @ApiParam(value = "班级id", required = true) @RequestParam String clazzId) {
-        List<ExamSyncStudent> examSyncStudentList = examSyncStudentService.queryByExamineCollegeList(semesterId, examTypeId, courseCode, openCollege, kcCollege, clazzId);
+        List<ExamSyncStudent> examSyncStudentList = examSyncStudentService.queryByExamineCollegeList(semesterId, examTypeId, courseCode, openCollege, null, kcCollege, clazzId);
         Set<TeacherResult> teacherResultList = null;
         if (!CollectionUtils.isEmpty(examSyncStudentList)) {
             teacherResultList = new LinkedHashSet<>(examSyncStudentList.size());

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

@@ -20,9 +20,10 @@ public interface ExamSyncStudentService extends IService<ExamSyncStudent> {
      * @param examTypeId
      * @param courseCode
      * @param openCollege
+     * @param collegeId
      * @param kcCollege
      * @param clazzId
      * @return
      */
-    List<ExamSyncStudent> queryByExamineCollegeList(Long semesterId, Long examTypeId, String courseCode, String openCollege, String kcCollege, String clazzId);
+    List<ExamSyncStudent> queryByExamineCollegeList(Long semesterId, Long examTypeId, String courseCode, String openCollege, Long collegeId, String kcCollege, String clazzId);
 }

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

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