update

edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/entity/ExamRoom.java

@@ -15,7 +15,7 @@ public class ExamRoom {
 	private Long id;
 
 	@ApiModelProperty(value = "考级项目编号")
-	private Integer examinationBasicId;
+	private Long examinationBasicId;
 	
 	@ApiModelProperty(value = "考试模式")
 	private ExamModeEnum examMode;
@@ -75,11 +75,11 @@ public class ExamRoom {
 		return this.id;
 	}
 
-	public Integer getExaminationBasicId() {
+	public Long getExaminationBasicId() {
 		return examinationBasicId;
 	}
 
-	public void setExaminationBasicId(Integer examinationBasicId) {
+	public void setExaminationBasicId(Long examinationBasicId) {
 		this.examinationBasicId = examinationBasicId;
 	}
 

edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/entity/ExamRoomStudentRelation.java

@@ -12,7 +12,7 @@ public class ExamRoomStudentRelation {
 	private Long id;
 
 	@ApiModelProperty(value = "考级项目编号")
-	private Integer examinationBasicId;
+	private Long examinationBasicId;
 
 	@ApiModelProperty(value = "学员报名编号")
 	private Long examRegistrationId;
@@ -47,13 +47,13 @@ public class ExamRoomStudentRelation {
 	public Long getId(){
 		return this.id;
 	}
-			
-	public void setExaminationBasicId(Integer examinationBasicId){
-		this.examinationBasicId = examinationBasicId;
+
+	public Long getExaminationBasicId() {
+		return examinationBasicId;
 	}
-	
-	public Integer getExaminationBasicId(){
-		return this.examinationBasicId;
+
+	public void setExaminationBasicId(Long examinationBasicId) {
+		this.examinationBasicId = examinationBasicId;
 	}
 
 	public Long getExamRegistrationId() {

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamOrderController.java

@@ -11,7 +11,6 @@ import com.keao.edu.thirdparty.adapay.Payment;
 import com.keao.edu.thirdparty.yqpay.Msg;
 import com.keao.edu.user.dto.ExamPaymentInfo;
 import com.keao.edu.user.dto.ExamRegistrationPaymentDto;
-import com.keao.edu.user.dto.StudentExamPaymentDto;
 import com.keao.edu.user.entity.Employee;
 import com.keao.edu.user.entity.ExamRegistrationPayment;
 import com.keao.edu.user.enums.TransStatusEnum;
@@ -63,7 +62,7 @@ public class ExamOrderController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "examinationBasicId", value = "项目id", required = true, dataType = "Integer")})
     @GetMapping(value = "/getExamIngOrder")
-    public HttpResponseResult<ExamRegistrationPayment> getExamIngOrder(Integer examinationBasicId) {
+    public HttpResponseResult<ExamRegistrationPayment> getExamIngOrder(Long examinationBasicId) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         return succeed(examRegistrationPaymentService.getExamIngOrder(examinationBasicId, sysUser.getId()));
     }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamRoomController.java

@@ -113,7 +113,7 @@ public class ExamRoomController extends BaseController {
 
     @ApiOperation("获取考场统计信息")
     @GetMapping(value = "/getExamRoomStatisticsInfo")
-    public HttpResponseResult<ExamRoomStatisticsDto> getExamRoomStatisticsInfo(Integer examId){
+    public HttpResponseResult<ExamRoomStatisticsDto> getExamRoomStatisticsInfo(Long examId){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         return succeed(examRoomService.getExamRoomStatisticsInfo(sysUser.getId(), examId));
     }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamTeacherSalaryController.java

@@ -52,7 +52,7 @@ public class ExamTeacherSalaryController extends BaseController {
 
     @ApiOperation("新增考级教师")
     @PostMapping(value = "/addExamTeacherSalary")
-    public HttpResponseResult addExamTeacherSalary(Integer examId, String teacherIdsStr) {
+    public HttpResponseResult addExamTeacherSalary(Long examId, String teacherIdsStr) {
         examTeacherSalaryService.addExamTeacherSalary(examId, teacherIdsStr);
         return succeed();
     }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/ExamOrganizationRelationDao.java

@@ -56,7 +56,7 @@ public interface ExamOrganizationRelationDao extends BaseDAO<Long, ExamOrganizat
      */
     List<ExamOrganizationRelation> getWithExam(@Param("examId") Integer examId);
 
-    List<ExamOrganizationRelation> getWithExams(@Param("examIds") List<Integer> examIds);
+    List<ExamOrganizationRelation> getWithExams(@Param("examIds") List<Long> examIds);
 
     /**
      * @param examId:
@@ -104,6 +104,6 @@ public interface ExamOrganizationRelationDao extends BaseDAO<Long, ExamOrganizat
      * @param OrganId
      * @return
      */
-    ExamOrganizationRelation getExamOrganizationRelation(@Param("examId") Integer examId, @Param("OrganId") Integer OrganId);
+    ExamOrganizationRelation getExamOrganizationRelation(@Param("examId") Long examId, @Param("OrganId") Integer OrganId);
 
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/ExamRegistrationDao.java

@@ -36,7 +36,7 @@ public interface ExamRegistrationDao extends BaseDAO<Long, ExamRegistration> {
      * @date 2020.06.30
      */
     int countInExamRoomStudentNum(@Param("organIds") List<Integer> organIds,
-                                  @Param("examId") Integer examId);
+                                  @Param("examId") Long examId);
 
     /**
      * @param organIds:
@@ -47,7 +47,7 @@ public interface ExamRegistrationDao extends BaseDAO<Long, ExamRegistration> {
      * @date 2020.06.30
      */
     int countTotalRegistrationStudentNumWithExam(@Param("organIds") List<Integer> organIds,
-                                                 @Param("examId") Integer examId);
+                                                 @Param("examId") Long examId);
 
     /**
      * @param selfOrganId: 本级合作单位编号
@@ -70,7 +70,7 @@ public interface ExamRegistrationDao extends BaseDAO<Long, ExamRegistration> {
      * @author Joburgess
      * @date 2020.07.02
      */
-    List<ExamRegistration> getWithExamAndStudents(@Param("examId") Integer examId,
+    List<ExamRegistration> getWithExamAndStudents(@Param("examId") Long examId,
                                                   @Param("studentIds") List<Integer> studentIds);
 
     /**

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/ExamRegistrationPaymentDao.java

@@ -2,11 +2,9 @@ package com.keao.edu.user.dao;
 
 import com.keao.edu.common.dal.BaseDAO;
 import com.keao.edu.user.dto.ExamRegistrationPaymentDto;
-import com.keao.edu.user.dto.StudentExamPaymentDto;
 import com.keao.edu.user.entity.ExamRegistrationPayment;
 import com.keao.edu.user.enums.TransStatusEnum;
 import org.apache.ibatis.annotations.Param;
-import org.apache.poi.ss.formula.functions.T;
 
 import java.util.Date;
 import java.util.List;
@@ -21,7 +19,7 @@ public interface ExamRegistrationPaymentDao extends BaseDAO<Long, ExamRegistrati
      * @param userId
      * @return
      */
-    ExamRegistrationPayment getExamIngOrder(@Param("examinationBasicId") Integer examinationBasicId, @Param("userId") Integer userId);
+    ExamRegistrationPayment getExamIngOrder(@Param("examinationBasicId") Long examinationBasicId, @Param("userId") Integer userId);
 
     /**
      * 根据订单号获取订单

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/ExamRoomDao.java

@@ -54,7 +54,7 @@ public interface ExamRoomDao extends BaseDAO<Long, ExamRoom> {
      * @return java.util.List<com.keao.edu.user.api.entity.ExamRoom>
      */
     List<ExamRoom> getWithExam(@Param("organIds") List<Integer> organIds,
-                                @Param("examId") Integer examId);
+                                @Param("examId") Long examId);
 
     int updateSL(ExamRoom examRoom);
 
@@ -77,6 +77,6 @@ public interface ExamRoomDao extends BaseDAO<Long, ExamRoom> {
      * @param subjectId:
      * @return java.util.List<com.keao.edu.user.api.entity.ExamRoom>
      */
-    List<ExamRoom> getWithExamAndSubject(@Param("examId") Integer examId,
+    List<ExamRoom> getWithExamAndSubject(@Param("examId") Long examId,
                                          @Param("subjectId") Integer subjectId);
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/ExamRoomStudentRelationDao.java

@@ -68,7 +68,7 @@ public interface ExamRoomStudentRelationDao extends BaseDAO<Long, ExamRoomStuden
      * @param studentId
      * @return
      */
-    List<ExamRoomStudentRelation> getExamRoomStudentRelations(@Param("basicId") Integer basicId, @Param("roomId") String roomId, @Param("studentId") Integer studentId);
+    List<ExamRoomStudentRelation> getExamRoomStudentRelations(@Param("basicId") Long basicId, @Param("roomId") String roomId, @Param("studentId") Integer studentId);
 
     /**
      * @describe 获取报名学员所在教室

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/ExamTeacherSalaryDao.java

@@ -28,7 +28,7 @@ public interface ExamTeacherSalaryDao extends BaseDAO<Long, ExamTeacherSalary> {
      * @param examId:
      * @return java.util.List<com.keao.edu.user.entity.ExamTeacherSalary>
      */
-    List<ExamTeacherSalary> queryWithExam(@Param("examId") Integer examId);
+    List<ExamTeacherSalary> queryWithExam(@Param("examId") Long examId);
 
     /**
      * @describe 获取指定考级项目下教师的基本信息
@@ -47,7 +47,7 @@ public interface ExamTeacherSalaryDao extends BaseDAO<Long, ExamTeacherSalary> {
      * @param teacherIds:
      * @return java.util.List<com.keao.edu.user.entity.ExamTeacherSalary>
      */
-    List<ExamTeacherSalary> getWithExamAndTeacher(@Param("examId") Integer examId,
+    List<ExamTeacherSalary> getWithExamAndTeacher(@Param("examId") Long examId,
                                                   @Param("teacherIds") List<Integer> teacherIds);
 
     /**

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/ExaminationBasicDao.java

@@ -25,6 +25,6 @@ public interface ExaminationBasicDao extends BaseDAO<Long, ExaminationBasic> {
      */
     List<ExaminationBasic> getNeedUpdateStatusExams();
 
-    List<ExaminationBasicDto> getExams(@Param("examIds") List<Integer> examIds);
+    List<ExaminationBasicDto> getExams(@Param("examIds") List<Long> examIds);
 	
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/ExamCertification.java

@@ -14,7 +14,7 @@ public class ExamCertification {
 	private Long examRegistrationId;
 
 	@ApiModelProperty(value = "考级项目编号")
-	private Integer examinationBasicId;
+	private Long examinationBasicId;
 
 	@ApiModelProperty(value = "学生编号")
 	private Integer studentId;
@@ -58,15 +58,15 @@ public class ExamCertification {
 	public Long getId(){
 		return this.id;
 	}
-			
-	public void setExaminationBasicId(Integer examinationBasicId){
-		this.examinationBasicId = examinationBasicId;
+
+	public Long getExaminationBasicId() {
+		return examinationBasicId;
 	}
-	
-	public Integer getExaminationBasicId(){
-		return this.examinationBasicId;
+
+	public void setExaminationBasicId(Long examinationBasicId) {
+		this.examinationBasicId = examinationBasicId;
 	}
-			
+
 	public void setStudentId(Integer studentId){
 		this.studentId = studentId;
 	}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/ExamManualLedger.java

@@ -19,7 +19,7 @@ public class ExamManualLedger {
 	private Organization organization;
 
 	@ApiModelProperty(value = "考级项目编号")
-	private Integer examinationBasicId;
+	private Long examinationBasicId;
 	
 	@ApiModelProperty(value = "转账方向")
 	private TransDirectionEnum transDirection;
@@ -59,12 +59,12 @@ public class ExamManualLedger {
 		this.organId = organId;
 	}
 
-	public void setExaminationBasicId(Integer examinationBasicId){
-		this.examinationBasicId = examinationBasicId;
+	public Long getExaminationBasicId() {
+		return examinationBasicId;
 	}
-	
-	public Integer getExaminationBasicId(){
-		return this.examinationBasicId;
+
+	public void setExaminationBasicId(Long examinationBasicId) {
+		this.examinationBasicId = examinationBasicId;
 	}
 
 	public Organization getOrganization() {

edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/ExamMusicTheory.java

@@ -11,7 +11,7 @@ public class ExamMusicTheory {
 	private Integer id;
 	
 	/**  */
-	private Integer examinationBasicId;
+	private Long examinationBasicId;
 	
 	/** 等级 */
 	private Integer level;
@@ -35,15 +35,15 @@ public class ExamMusicTheory {
 	public Integer getId(){
 		return this.id;
 	}
-			
-	public void setExaminationBasicId(Integer examinationBasicId){
-		this.examinationBasicId = examinationBasicId;
+
+	public Long getExaminationBasicId() {
+		return examinationBasicId;
 	}
-	
-	public Integer getExaminationBasicId(){
-		return this.examinationBasicId;
+
+	public void setExaminationBasicId(Long examinationBasicId) {
+		this.examinationBasicId = examinationBasicId;
 	}
-			
+
 	public void setLevel(Integer level){
 		this.level = level;
 	}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/ExamRegistration.java

@@ -1,6 +1,5 @@
 package com.keao.edu.user.entity;
 
-import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.user.api.entity.Student;
 import com.keao.edu.user.enums.StudentRegistrationStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
@@ -16,7 +15,7 @@ public class ExamRegistration {
 	private Integer id;
 	
 	@ApiModelProperty(value = "考级项目编号")
-	private Integer examinationBasicId;
+	private Long examinationBasicId;
 
 	@ApiModelProperty(value = "考级项目详情")
 	private ExaminationBasic examinationBasic;
@@ -133,12 +132,12 @@ public class ExamRegistration {
 		this.subject = subject;
 	}
 
-	public void setExaminationBasicId(Integer examinationBasicId){
-		this.examinationBasicId = examinationBasicId;
+	public Long getExaminationBasicId() {
+		return examinationBasicId;
 	}
-	
-	public Integer getExaminationBasicId(){
-		return this.examinationBasicId;
+
+	public void setExaminationBasicId(Long examinationBasicId) {
+		this.examinationBasicId = examinationBasicId;
 	}
 
 	public ExaminationBasic getExaminationBasic() {

edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/ExamRegistrationPayment.java

@@ -18,7 +18,7 @@ public class ExamRegistrationPayment {
 	private Integer studentId;
 
 	@ApiModelProperty(value = "报考项目编号")
-	private Integer examinationBasicId;
+	private Long examinationBasicId;
 
 	@ApiModelProperty(value = "订单号（系统自动生成）")
 	private String orderNo;
@@ -80,15 +80,15 @@ public class ExamRegistrationPayment {
 	public Integer getStudentId(){
 		return this.studentId;
 	}
-			
-	public void setExaminationBasicId(Integer examinationBasicId){
-		this.examinationBasicId = examinationBasicId;
+
+	public Long getExaminationBasicId() {
+		return examinationBasicId;
 	}
-	
-	public Integer getExaminationBasicId(){
-		return this.examinationBasicId;
+
+	public void setExaminationBasicId(Long examinationBasicId) {
+		this.examinationBasicId = examinationBasicId;
 	}
-			
+
 	public void setOrderNo(String orderNo){
 		this.orderNo = orderNo;
 	}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/ExamTeacherSalary.java

@@ -16,7 +16,7 @@ public class ExamTeacherSalary {
 	private Long id;
 
 	@ApiModelProperty(value = "考级项目编号")
-	private Integer examinationBasicId;
+	private Long examinationBasicId;
 
 	@ApiModelProperty(value = "考试类型")
 	private ExamModeEnum examMode;
@@ -71,14 +71,14 @@ public class ExamTeacherSalary {
 		this.settlementType = settlementType;
 	}
 
-	public void setExaminationBasicId(Integer examinationBasicId){
-		this.examinationBasicId = examinationBasicId;
+	public Long getExaminationBasicId() {
+		return examinationBasicId;
 	}
-	
-	public Integer getExaminationBasicId(){
-		return this.examinationBasicId;
+
+	public void setExaminationBasicId(Long examinationBasicId) {
+		this.examinationBasicId = examinationBasicId;
 	}
-			
+
 	public void setTeacherId(Integer teacherId){
 		this.teacherId = teacherId;
 	}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/ExaminationBasic.java

@@ -14,7 +14,7 @@ import java.util.List;
 public class ExaminationBasic {
 
 	@ApiModelProperty(value = "考级项目编号")
-	private Integer id;
+	private Long id;
 	
 	@ApiModelProperty(value = "项目名称")
 	private String name;
@@ -78,7 +78,7 @@ public class ExaminationBasic {
 	public ExaminationBasic() {
 	}
 
-	public ExaminationBasic(Integer id, String name) {
+	public ExaminationBasic(Long id, String name) {
 		this.id = id;
 		this.name = name;
 	}
@@ -91,14 +91,14 @@ public class ExaminationBasic {
 		this.memo = memo;
 	}
 
-	public void setId(Integer id){
-		this.id = id;
+	public Long getId() {
+		return id;
 	}
-	
-	public Integer getId(){
-		return this.id;
+
+	public void setId(Long id) {
+		this.id = id;
 	}
-			
+
 	public void setName(String name){
 		this.name = name;
 	}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/StudentExamResult.java

@@ -15,7 +15,7 @@ public class StudentExamResult {
 	private Long examRegistrationId;
 	
 	@ApiModelProperty(value = "考级项目编号")
-	private Integer examinationBasicId;
+	private Long examinationBasicId;
 
 	@ApiModelProperty(value = "考级项目")
 	private ExaminationBasic examinationBasic;
@@ -97,14 +97,14 @@ public class StudentExamResult {
 		this.isFinishedExam = isFinishedExam;
 	}
 
-	public void setExaminationBasicId(Integer examinationBasicId){
-		this.examinationBasicId = examinationBasicId;
+	public Long getExaminationBasicId() {
+		return examinationBasicId;
 	}
-	
-	public Integer getExaminationBasicId(){
-		return this.examinationBasicId;
+
+	public void setExaminationBasicId(Long examinationBasicId) {
+		this.examinationBasicId = examinationBasicId;
 	}
-			
+
 	public void setStudentId(Integer studentId){
 		this.studentId = studentId;
 	}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/ExamRegistrationPaymentService.java

@@ -4,13 +4,9 @@ import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.common.service.BaseService;
 import com.keao.edu.user.dto.ExamPaymentInfo;
 import com.keao.edu.user.dto.ExamRegistrationPaymentDto;
-import com.keao.edu.user.dto.StudentExamPaymentDto;
-import com.keao.edu.user.entity.ExamRegistration;
 import com.keao.edu.user.entity.ExamRegistrationPayment;
 import com.keao.edu.user.page.ExamRegistrationPaymentQueryInfo;
-import com.keao.edu.user.page.ExamRegistrationQueryInfo;
 
-import java.util.List;
 import java.util.Map;
 
 public interface ExamRegistrationPaymentService extends BaseService<Long, ExamRegistrationPayment> {
@@ -22,7 +18,7 @@ public interface ExamRegistrationPaymentService extends BaseService<Long, ExamRe
      * @param userId
      * @return
      */
-    ExamRegistrationPayment getExamIngOrder(Integer examinationBasicId, Integer userId);
+    ExamRegistrationPayment getExamIngOrder(Long examinationBasicId, Integer userId);
 
     /**
      * 根据订单号获取订单

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/ExamRoomService.java

@@ -70,7 +70,7 @@ public interface ExamRoomService extends BaseService<Long, ExamRoom> {
      * @param examId:
      * @return com.keao.edu.user.dto.ExamRoomStatisticsDto
      */
-    ExamRoomStatisticsDto getExamRoomStatisticsInfo(Integer organId, Integer examId);
+    ExamRoomStatisticsDto getExamRoomStatisticsInfo(Integer organId, Long examId);
 
     /**
      * @describe 教师教室冲突检测

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/ExamTeacherSalaryService.java

@@ -20,7 +20,7 @@ public interface ExamTeacherSalaryService extends BaseService<Long, ExamTeacherS
      * @param examId:
      * @return void
      */
-    void teacherSalarySettlementWithExam(Integer examId);
+    void teacherSalarySettlementWithExam(Long examId);
 
     /**
      * @describe
@@ -48,7 +48,7 @@ public interface ExamTeacherSalaryService extends BaseService<Long, ExamTeacherS
      * @param teacherIdsStr:
      * @return void
      */
-    void addExamTeacherSalary(Integer examId, String teacherIdsStr);
+    void addExamTeacherSalary(Long examId, String teacherIdsStr);
 
     /**
      * @describe 获取指定考级项目可排考教师

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamCertificationServiceImpl.java

@@ -48,7 +48,7 @@ public class ExamCertificationServiceImpl extends BaseServiceImpl<Long, ExamCert
 			pageInfo.setTotal(count);
 			params.put("offset", pageInfo.getOffset());
 			dataList = JSON.parseArray(JSON.toJSONString(this.getDAO().queryPage(params)),ExamCertificationDto.class);
-			List<Integer> basicIds = dataList.stream().map(e -> e.getExaminationBasicId()).collect(Collectors.toList());
+			List<Long> basicIds = dataList.stream().map(e -> e.getExaminationBasicId()).collect(Collectors.toList());
 			List<Integer> studentIds = dataList.stream().map(e -> e.getStudentId()).collect(Collectors.toList());
 			List<Integer> subjectIds = dataList.stream().map(e -> e.getSubjectId()).collect(Collectors.toList());
 			Map<Integer, String> basicNameMap = this.getMap("examination_basic", "id_", "name_", basicIds, Integer.class, String.class);
@@ -69,4 +69,4 @@ public class ExamCertificationServiceImpl extends BaseServiceImpl<Long, ExamCert
 		pageInfo.setRows(dataList);
 		return pageInfo;
 	}
-}
+}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRegistrationPaymentServiceImpl.java

@@ -56,7 +56,7 @@ public class ExamRegistrationPaymentServiceImpl extends BaseServiceImpl<Long, Ex
     }
 
     @Override
-    public ExamRegistrationPayment getExamIngOrder(Integer examinationBasicId, Integer userId) {
+    public ExamRegistrationPayment getExamIngOrder(Long examinationBasicId, Integer userId) {
         return examRegistrationPaymentDao.getExamIngOrder(examinationBasicId, userId);
     }
 

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRegistrationServiceImpl.java

@@ -166,7 +166,7 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
             pageInfo.setTotal(count);
             params.put("offset", pageInfo.getOffset());
             dataList = examRegistrationDao.queryExamRegist(params);
-            List<Integer> examIds = dataList.stream().filter(e -> Objects.nonNull(e.getOrganId())).map(ExamRegistration::getExaminationBasicId).collect(Collectors.toList());
+            List<Long> examIds = dataList.stream().filter(e -> Objects.nonNull(e.getOrganId())).map(ExamRegistration::getExaminationBasicId).collect(Collectors.toList());
             Map<Integer, String> examIdNameMap = this.getMap("examination_basic", "id_", "name_", examIds, Integer.class, String.class);
 
             List<Integer> organIds = dataList.stream().filter(e -> Objects.nonNull(e.getOrganId())).map(ExamRegistration::getOrganId).collect(Collectors.toList());
@@ -242,7 +242,7 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
             params.put("offset", pageInfo.getOffset());
             dataList = examRegistrationDao.queryExamList(params);
             List<Integer> subjectIds = dataList.stream().map(e -> e.getSubjectId()).collect(Collectors.toList());
-            List<Integer> basicIds = dataList.stream().map(e -> e.getExaminationBasicId()).collect(Collectors.toList());
+            List<Long> basicIds = dataList.stream().map(e -> e.getExaminationBasicId()).collect(Collectors.toList());
             List<Integer> registrationIds = dataList.stream().map(e -> e.getId()).collect(Collectors.toList());
             Map<Integer, String> subjectNameMap = this.getMap("subject", "id_", "name_", subjectIds, Integer.class, String.class);
             Map<Integer, String> examNameMap = this.getMap("examination_basic", "id_", "name_", basicIds, Integer.class, String.class);

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRoomServiceImpl.java

@@ -239,7 +239,7 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 	}
 
 	@Override
-	public ExamRoomStatisticsDto getExamRoomStatisticsInfo(Integer organId, Integer examId) {
+	public ExamRoomStatisticsDto getExamRoomStatisticsInfo(Integer organId, Long examId) {
 		ExamRoomStatisticsDto examRoomStatisticsInfo=new ExamRoomStatisticsDto();
 
         List<Integer> childOrganIds = organizationService.getChildOrganIds(organId, true);

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRoomStudentRelationServiceImpl.java

@@ -167,10 +167,25 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 
 	@Override
 	public PageInfo<ExamRoomStudentRelationDto> findExamRoomStudents(ExamRoomStudentRelationQueryInfo queryInfo) {
+		if(Objects.nonNull(queryInfo.getInRoom())&&Objects.isNull(queryInfo.getExamRoomId())){
+			throw new BizException("请指定考场");
+		}
+
 		PageInfo<ExamRoomStudentRelationDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
 		Map<String, Object> params = new HashMap<String, Object>();
 		MapUtil.populateMap(params, queryInfo);
 
+		if(Objects.nonNull(queryInfo.getExamRoomId())){
+			ExamRoom examRoom = examRoomDao.get(queryInfo.getExamRoomId());
+			if(Objects.isNull(examRoom)){
+				throw new BizException("考场不存在");
+			}
+			if(!examRoom.getExaminationBasicId().equals(queryInfo.getExamId())){
+				throw new BizException("考场信息异常");
+			}
+			params.put("subjectIds", examRoom.getSubjectIdList());
+		}
+
 		List<Integer> nextLevelOrganIds = organizationService.getChildOrganIds(queryInfo.getOrganId(), true);
 		params.put("organIds", nextLevelOrganIds);
 

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamTeacherSalaryServiceImpl.java

@@ -43,7 +43,7 @@ public class ExamTeacherSalaryServiceImpl extends BaseServiceImpl<Long, ExamTeac
 	}
 
 	@Override
-	public void teacherSalarySettlementWithExam(Integer examId) {
+	public void teacherSalarySettlementWithExam(Long examId) {
 		List<ExamRoom> examRooms = examRoomDao.getWithExam(null, examId);
 		if(CollectionUtils.isEmpty(examRooms)){
 			return;
@@ -98,9 +98,9 @@ public class ExamTeacherSalaryServiceImpl extends BaseServiceImpl<Long, ExamTeac
 			pageInfo.setTotal(count);
 			params.put("offset", pageInfo.getOffset());
 			dataList = examTeacherSalaryDao.queryExamTeacherSalary(params);
-			List<Integer> examIds = dataList.stream().map(ExamTeacherSalaryDto::getExaminationBasicId).collect(Collectors.toList());
+			List<Long> examIds = dataList.stream().map(ExamTeacherSalaryDto::getExaminationBasicId).collect(Collectors.toList());
 			List<ExaminationBasicDto> exams = examinationBasicDao.getExams(examIds);
-			Map<Integer, ExaminationBasicDto> idExamMap = exams.stream().collect(Collectors.toMap(ExaminationBasicDto::getId, e -> e));
+			Map<Long, ExaminationBasicDto> idExamMap = exams.stream().collect(Collectors.toMap(ExaminationBasicDto::getId, e -> e));
 			for (ExamTeacherSalaryDto examTeacherSalaryDto : dataList) {
 				examTeacherSalaryDto.setExaminationBasic(idExamMap.get(examTeacherSalaryDto.getExaminationBasicId()));
 			}
@@ -122,7 +122,7 @@ public class ExamTeacherSalaryServiceImpl extends BaseServiceImpl<Long, ExamTeac
 	}
 
 	@Override
-	public void addExamTeacherSalary(Integer examId, String teacherIdsStr) {
+	public void addExamTeacherSalary(Long examId, String teacherIdsStr) {
 		if(Objects.isNull(examId)){
 			throw new BizException("请指定考级项目");
 		}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExaminationBasicServiceImpl.java

@@ -134,7 +134,7 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
             pageInfo.setTotal(count);
             params.put("offset", pageInfo.getOffset());
             dataList = examinationBasicDao.findExaminationBasics(params);
-            List<Integer> examIds = dataList.stream().map(ExaminationBasicDto::getId).collect(Collectors.toList());
+            List<Long> examIds = dataList.stream().map(ExaminationBasicDto::getId).collect(Collectors.toList());
             List<ExamOrganizationRelation> examOrgans = new ArrayList<>();
             if (!CollectionUtils.isEmpty(examIds)) {
                 examOrganizationRelationDao.getWithExams(examIds);

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/StudentExamResultServiceImpl.java

@@ -56,7 +56,7 @@ public class StudentExamResultServiceImpl extends BaseServiceImpl<Long, StudentE
 			pageInfo.setTotal(count);
 			params.put("offset", pageInfo.getOffset());
 			dataList = studentExamResultDao.queryStudentExamResult(params);
-			List<Integer> examIds = dataList.stream().map(StudentExamResult::getExaminationBasicId).collect(Collectors.toList());
+			List<Long> examIds = dataList.stream().map(StudentExamResult::getExaminationBasicId).collect(Collectors.toList());
 			List<Integer> studentIds = dataList.stream().map(StudentExamResult::getStudentId).collect(Collectors.toList());
 			List<Integer> subjectIds = dataList.stream().map(e -> e.getExamRegistration().getSubjectId()).collect(Collectors.toList());
 			List<Integer> organIds = dataList.stream().map(e -> e.getExamRegistration().getOrganId()).collect(Collectors.toList());
@@ -65,7 +65,7 @@ public class StudentExamResultServiceImpl extends BaseServiceImpl<Long, StudentE
 			Map<Integer, String> organIdNameMap = this.getMap("organization", "id_", "name_", organIds, Integer.class, String.class);
 
 			List<ExaminationBasicDto> exams = examinationBasicDao.getExams(examIds);
-			Map<Integer, ExaminationBasicDto> idExamMap = exams.stream().collect(Collectors.toMap(ExaminationBasic::getId, e -> e));
+			Map<Long, ExaminationBasicDto> idExamMap = exams.stream().collect(Collectors.toMap(ExaminationBasic::getId, e -> e));
 
 			for (StudentExamResult s : dataList) {
 				Student student=new Student(s.getStudentId(), studentIdNameMap.get(s.getStudentId()));

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/StudentServiceImpl.java

@@ -9,18 +9,16 @@ import com.keao.edu.common.service.impl.BaseServiceImpl;
 import com.keao.edu.im.api.client.ImFeignService;
 import com.keao.edu.im.api.entity.ImResult;
 import com.keao.edu.im.api.entity.ImUserModel;
+import com.keao.edu.user.api.entity.Student;
 import com.keao.edu.user.dao.StudentDao;
 import com.keao.edu.user.dao.StudentExamResultDao;
 import com.keao.edu.user.dao.SysUserDao;
-import com.keao.edu.user.api.entity.Student;
 import com.keao.edu.user.dto.StudentExamPaymentDto;
 import com.keao.edu.user.entity.Organization;
-import com.keao.edu.user.enums.YesOrNoEnum;
 import com.keao.edu.user.page.StudentApplyQueryInfo;
 import com.keao.edu.user.service.OrganizationService;
 import com.keao.edu.user.service.StudentService;
 import com.keao.edu.util.collection.MapUtil;
-import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -131,7 +129,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             pageInfo.setTotal(count);
             params.put("offset", pageInfo.getOffset());
             dataList = studentDao.queryApplyList(params);
-            List<Integer> basicIds = dataList.stream().map(e -> e.getExamRegistration().getExaminationBasicId()).collect(Collectors.toList());
+            List<Long> basicIds = dataList.stream().map(e -> e.getExamRegistration().getExaminationBasicId()).collect(Collectors.toList());
             Map<Integer, String> basicNameMap = this.getMap("examination_basic", "id_", "name_", basicIds, Integer.class, String.class);
             Map<Integer, String> organNameMap = this.getMap("organization", "id_", "name_", basicIds, Integer.class, String.class);
             Map<Integer, String> subjectNameMap = this.getMap("subject", "id_", "name_", basicIds, Integer.class, String.class);

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamRoomStudentRelationMapper.xml

@@ -121,7 +121,7 @@
 				AND er.examination_basic_id_ = #{examId}
 			</if>
 			<if test="inRoom!=null and inRoom==0">
-				AND ersr.id_ IS NULL
+				AND ersr.id_ IS NULL AND FIND_IN_SET(er.subject_id_, #{subjectIds})
 			</if>
 			<if test="inRoom!=null and inRoom==1">
 				AND ersr.exam_room_id_ =#{examRoomId}