Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

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

@@ -145,7 +145,7 @@ public class ExamOrderController extends BaseController {
     }
 
 
-    @ApiOperation(value = "/获取订单状态及订单信息")
+    @ApiOperation(value = "获取订单状态及订单信息")
     @GetMapping(value = "/paymentResult")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "orderNo", value = "订单编号", required = true, dataType = "String")})
@@ -189,7 +189,7 @@ public class ExamOrderController extends BaseController {
         return msg;
     }
 
-    @ApiOperation(value = "/关闭订单")
+    @ApiOperation(value = "关闭订单")
     @PostMapping("/closeOrder")
     public HttpResponseResult closeOrder(String orderNo){
         return succeed(examRegistrationPaymentService.closeOrder(orderNo));

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

@@ -125,6 +125,14 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 		if(organs.size()!=organIds.size()){
 			throw new BizException("合作单位信息错误");
 		}
+
+		SysConfig baseUrlConfig = sysConfigService.findByParamName(SysConfigService.BASE_API_URL);
+		String baseUrl="";
+		if(Objects.nonNull(baseUrlConfig)){
+			baseUrl=baseUrlConfig.getParanValue();
+		}
+		baseUrl = baseUrl+"/#/signUp?";
+
 		Map<Integer, Organization> idOrganMap = organs.stream().collect(Collectors.toMap(Organization::getId, o -> o));
 		List<ExamOrganizationRelation> organizationRelations=new ArrayList<>();
 		for (Integer organId : organIds) {
@@ -146,6 +154,9 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 			og.setTotalRegistrationStudentNum(BigDecimal.ZERO.intValue());
 			og.setTotalPaymentAmount(BigDecimal.ZERO);
 			og.setTotalTransAmount(BigDecimal.ZERO);
+			String registrationUrl = baseUrl + "examId=" + examId + "&organId=" + organId;
+			String registShortUrl = shortUrlService.createShortUrl(registrationUrl);
+			og.setUrl(registShortUrl);
 			organizationRelations.add(og);
 		}
 		examOrganizationRelationDao.batchInsert(organizationRelations);
@@ -178,23 +189,13 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 			throw new BizException("考级项目已关闭");
 		}
 
-		SysConfig baseUrlConfig = sysConfigService.findByParamName(SysConfigService.BASE_API_URL);
-		String baseUrl="";
-		if(Objects.nonNull(baseUrlConfig)){
-			baseUrl=baseUrlConfig.getParanValue();
-		}
-		baseUrl = baseUrl+"/#/signUp?";
-
 		List<ExamOrganizationRelation> needUpdate=new ArrayList<>();
 		for (ExamOrganizationRelation examOrgan : examOrgans) {
 			if(YesOrNoEnum.YES.equals(examOrgan.getSendUrlFlag())){
 				continue;
 			}
 			needUpdate.add(examOrgan);
-			String registrationUrl = baseUrl + "examId=" + examOrgan.getExaminationBasicId() + "&organId=" + examOrgan.getOrganId();
-			String registShortUrl = shortUrlService.createShortUrl(registrationUrl);
 
-			examOrgan.setUrl(registShortUrl);
 			examOrgan.setSendUrlFlag(YesOrNoEnum.YES);
 
 			SysUser student = sysUserFeignService.queryUserById(examOrgan.getOrganId());
@@ -202,7 +203,7 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 			userPhoneMap.put(examOrgan.getOrganId(), student.getPhone());
 
 			SysMessageParams sysMessageParams=new SysMessageParams(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.EXAM_REGISTRATION_URL_PUSH,
-					userPhoneMap, null, 0, null, null, registShortUrl);
+					userPhoneMap, null, 0, null, null, examOrgan.getUrl());
 			sysMessageFeignService.batchSendMessage(sysMessageParams);
 		}
 

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

@@ -305,7 +305,7 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
         order.setOrderNo(orderNo);
         examRegistrationPaymentService.insert(order);
 
-        ExaminationBasic examinationBasic = examinationBasicDao.get(order.getExaminationBasicId().longValue());
+        ExaminationBasic examinationBasic = examinationBasicDao.get(order.getExaminationBasicId());
         if (examinationBasic == null || !examinationBasic.getStatus().equals(ExamStatusEnum.APPLYING)) {
             throw new BizException("项目不在报名中，请核对");
         }

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

@@ -135,7 +135,7 @@
 				AND er.level_=#{level}
 			</if>
 			<if test="examStartTime!=null and examEndTime!=null">
-				AND DATE_FORMAT(eb.expect_exam_start_time_, '%Y-%d-%m') BETWEEN #{examStartTime} AND #{examEndTime}
+				AND DATE_FORMAT(eb.actual_exam_start_time_, '%Y-%m-%d') BETWEEN #{examStartTime} AND #{examEndTime}
 			</if>
 			<if test="isFinishedExam!=null">
 				AND ser.is_finished_exam_=#{isFinishedExam}
@@ -147,8 +147,11 @@
 				AND eb.status_='RESULT_CONFIRM'
 			</if>
 			<if test="resultConfirm!=null and resultConfirm==0">
-				AND eb.status_!='RESULT_CONFIRM'
+				AND eb.status_='EXAM_END'
 			</if>
+			<!--<if test="resultConfirm==null">-->
+				<!--AND eb.status_ IN ('EXAM_END','RESULT_CONFIRM')-->
+			<!--</if>-->
 		</where>
 	</sql>