|
|
@@ -623,6 +623,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
|
|
|
throw new CustomException("数据错误");
|
|
|
}
|
|
|
bo.setGoodsId(orderGoods.getGoodsId());
|
|
|
+
|
|
|
CourseEducationType educationType = iCourseEducationTypeService.getOne(new LambdaQueryWrapper<CourseEducationType>().eq(CourseEducationType::getStatus, 1).eq(CourseEducationType::getEducationName,"继续教育").last("limit 1"));
|
|
|
CourseProjectType projectType = iCourseProjectTypeService.getOne(new LambdaQueryWrapper<CourseProjectType>().eq(CourseProjectType::getStatus, 1).eq(CourseProjectType::getEducationId,educationType.getId()).eq(CourseProjectType::getProjectName,"建造师").last("limit 1"));
|
|
|
CourseBusiness business = iCourseBusinessService.getOne(new LambdaQueryWrapper<CourseBusiness>().eq(CourseBusiness::getStatus, 1).eq(CourseBusiness::getProjectId,projectType.getId()).eq(CourseBusiness::getBusinessName,"二级").last("limit 1"));
|
|
|
@@ -659,8 +660,8 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
|
|
|
//判断结业
|
|
|
long nowTime = System.currentTimeMillis() / 1000;
|
|
|
ClassGradeUserQueryBo queryBo = new ClassGradeUserQueryBo();
|
|
|
- queryBo.setGradeId(bo.getGradeId());
|
|
|
- queryBo.setUserId(bo.getUserId());
|
|
|
+ queryBo.setGradeId(classGradeUser.getGradeId());
|
|
|
+ queryBo.setUserId(classGradeUser.getUserId());
|
|
|
ClassPeriodStudentVo classPeriodStudentVo = classGradeUserMapper.userPeriodStatus(queryBo);
|
|
|
if (Validator.isEmpty(classPeriodStudentVo.getClassStartTime())) {
|
|
|
//没设置永久有效
|