|
@@ -130,7 +130,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
|
|
|
User user = iUserService.getOne(new LambdaQueryWrapper<User>()
|
|
|
.eq(User::getIdCard,info.getIdCard()).last("limit 1"));
|
|
|
if(Validator.isEmpty(user)){
|
|
|
- throw new CustomException("学员:"+info.getUserName()+"-"+info.getIdCard()+"不存在没有符合导出的数据,,请先处理再继续操作");
|
|
|
+ throw new CustomException("学员:"+info.getIdCard()+"不存在没有符合导出的数据,,请先处理再继续操作");
|
|
|
}
|
|
|
}
|
|
|
return list;
|
|
@@ -142,7 +142,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
|
|
|
User user = iUserService.getOne(new LambdaQueryWrapper<User>()
|
|
|
.eq(User::getIdCard,info.getIdCard()).last("limit 1"));
|
|
|
if(Validator.isEmpty(user)){
|
|
|
- throw new CustomException("学员:"+info.getUserName()+"-"+info.getIdCard()+"不存在,请先处理再继续操作");
|
|
|
+ throw new CustomException("学员:"+info.getIdCard()+"不存在,请先处理再继续操作");
|
|
|
}
|
|
|
UserSubscribe userSubscribe = this.getOne(new LambdaQueryWrapper<UserSubscribe>()
|
|
|
.eq(UserSubscribe::getSubscribeStatus,1)
|
|
@@ -150,7 +150,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
|
|
|
.eq(UserSubscribe::getApplySiteAddress,bo.getApplySiteAddress())
|
|
|
.eq(UserSubscribe::getUserId,user.getUserId()).last("limit 1"));
|
|
|
if(Validator.isEmpty(userSubscribe)){
|
|
|
- throw new CustomException("学员:"+info.getUserName()+"-"+info.getIdCard()+"没有符合导出的数据,请先处理再继续操作");
|
|
|
+ throw new CustomException("学员:"+info.getIdCard()+"没有符合导出的数据,请先处理再继续操作");
|
|
|
}
|
|
|
}
|
|
|
return bo.getList();
|
|
@@ -316,7 +316,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
|
|
|
}
|
|
|
update.setExamStatus(bo.getExamStatus());
|
|
|
update.setRemark(bo.getRemark());
|
|
|
- update.setBeforeId(bo.getBeforeId());
|
|
|
+ // update.setBeforeId(bo.getBeforeId());
|
|
|
update.setBeforeStatus(bo.getBeforeStatus());
|
|
|
if (bo.getBeforeStatus() != null && bo.getBeforeStatus().equals(1)){
|
|
|
if(Validator.isEmpty(userSubscribeVo.getBeforeStatus())||userSubscribeVo.getBeforeStatus().equals(0)){
|
|
@@ -396,7 +396,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
|
|
|
}
|
|
|
update.setExamStatus(editBo.getExamStatus());
|
|
|
update.setRemark(editBo.getRemark());
|
|
|
- update.setBeforeId(editBo.getBeforeId());
|
|
|
+ // update.setBeforeId(editBo.getBeforeId());
|
|
|
update.setBeforeStatus(editBo.getBeforeStatus());
|
|
|
if (editBo.getBeforeStatus() != null && editBo.getBeforeStatus().equals(1)){
|
|
|
if(Validator.isEmpty(userSubscribeVo.getBeforeStatus())||userSubscribeVo.getBeforeStatus().equals(0)){
|