|
|
@@ -798,6 +798,8 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
|
|
|
.last("limit 1"));
|
|
|
if (ObjectUtils.isNull(userSubscribe)){
|
|
|
goodsUserVo.setSubscribeSign(1);
|
|
|
+ }else if (userSubscribe.getSubscribeStatus() == 1 && userSubscribe.getExamStatus() == 0){
|
|
|
+ goodsUserVo.setSubscribeSign(4);
|
|
|
}else if (ObjectUtils.isNotNull(userSubscribe.getResult()) && userSubscribe.getResult() == 0){
|
|
|
goodsUserVo.setSubscribeSign(3);
|
|
|
}
|
|
|
@@ -818,6 +820,12 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
|
|
|
String format = String.format("%s-%s", twoAddBo.getStartTime(), twoAddBo.getEndTime());
|
|
|
examApplyGoodsVo.setApplyTime(time);
|
|
|
examApplyGoodsVo.setApplyMoment(format);
|
|
|
+ //预约人数
|
|
|
+ int count = iUserSubscribeService.count(new LambdaQueryWrapper<UserSubscribe>()
|
|
|
+ .eq(UserSubscribe::getSubscribeStatus, 1)
|
|
|
+ .eq(UserSubscribe::getExamStatus, 0)
|
|
|
+ .eq(UserSubscribe::getApplyId, examApplyGoodsVo.getApplyId()));
|
|
|
+ examApplyGoodsVo.setSubscribeNum(count);
|
|
|
}
|
|
|
}
|
|
|
switch (examApply.getApplyNature()){
|