|
@@ -285,6 +285,9 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
|
|
|
//把用户预约的数据和默认数据组合在一起
|
|
|
userMockSubscribeList2.forEach(userMockSubscribe -> {
|
|
|
UserMockSubscribeVo userMockSubscribeVo = iMockMajorSubjectTimeService.listByEachExamId(userMockSubscribe.getEachExamId());
|
|
|
+ if (Validator.isNotEmpty(userMockSubscribe.getHandStatus())){
|
|
|
+ userMockSubscribeVo.setHandStatus(userMockSubscribe.getHandStatus());
|
|
|
+ }
|
|
|
LambdaQueryWrapper<MockMajorSubjectTime> lqw = Wrappers.lambdaQuery();
|
|
|
lqw.eq(MockMajorSubjectTime::getMockMajorSubjectId, userMockSubscribe.getMockMajorSubjectId());
|
|
|
lqw.orderByDesc(MockMajorSubjectTime::getId).last("limit 1");
|