生成证书时不用判断登录用户
This commit is contained in:
@@ -46,6 +46,8 @@ public class ClassController {
|
|||||||
private SysNoticeService sysNoticeService;
|
private SysNoticeService sysNoticeService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private ClassTaskService classTaskService;
|
private ClassTaskService classTaskService;
|
||||||
|
@Autowired
|
||||||
|
private MyUserService userService;
|
||||||
|
|
||||||
//班级模型列表
|
//班级模型列表
|
||||||
@RequestMapping("/getClassModelList")
|
@RequestMapping("/getClassModelList")
|
||||||
@@ -568,19 +570,15 @@ public class ClassController {
|
|||||||
//生成证书图片
|
//生成证书图片
|
||||||
@RequestMapping("/generateCertificateClass")
|
@RequestMapping("/generateCertificateClass")
|
||||||
public R generateCertificateClass(@RequestBody Map<String,Object> params) {
|
public R generateCertificateClass(@RequestBody Map<String,Object> params) {
|
||||||
MyUserEntity user = ShiroUtils.getUser();
|
UserCertificate userCertificate = userCertificateService.getById(params.get("id").toString());
|
||||||
|
MyUserEntity user = userService.getById(userCertificate.getUserId());
|
||||||
String photoUrl = user.getPhoto();//证书人照片
|
String photoUrl = user.getPhoto();//证书人照片
|
||||||
String realName = user.getName();//真实姓名
|
String realName = user.getName();//真实姓名
|
||||||
UserCertificate userCertificate = userCertificateService.getById(params.get("id").toString());
|
|
||||||
String type = userCertificate.getType();//证书类型A a证 B b证 ZK自考
|
String type = userCertificate.getType();//证书类型A a证 B b证 ZK自考
|
||||||
if ("ZK".equals(type)){
|
if ("ZK".equals(type)){
|
||||||
CourseEntity courseEntity = courseService.getById(userCertificate.getCourseId());
|
CourseEntity courseEntity = courseService.getById(userCertificate.getCourseId());
|
||||||
String courseTitle = userCertificate.getTitle();
|
String courseTitle = userCertificate.getTitle();
|
||||||
// ClassExamUser classExamUser = classExamUserService.getOne(new LambdaQueryWrapper<ClassExamUser>()
|
ClassExamUser classExamUser = classExamUserService.getUserHighExam(user.getId(),courseEntity.getId());
|
||||||
// .eq(ClassExamUser::getUserId,ShiroUtils.getUId())
|
|
||||||
// .eq(ClassExamUser::getRelationId,userCertificate.getCourseId()));
|
|
||||||
|
|
||||||
ClassExamUser classExamUser = classExamUserService.getUserHighExam(ShiroUtils.getUId());
|
|
||||||
String endYear = DateUtil.year(classExamUser.getEndTime())+"";
|
String endYear = DateUtil.year(classExamUser.getEndTime())+"";
|
||||||
String endMonth = DateUtil.month(classExamUser.getEndTime())+1+"";
|
String endMonth = DateUtil.month(classExamUser.getEndTime())+1+"";
|
||||||
String endDay = DateUtil.dayOfMonth(classExamUser.getEndTime())+"";
|
String endDay = DateUtil.dayOfMonth(classExamUser.getEndTime())+"";
|
||||||
|
|||||||
@@ -5,5 +5,5 @@ import com.peanut.modules.common.entity.ClassExamUser;
|
|||||||
|
|
||||||
public interface ClassExamUserService extends IService<ClassExamUser> {
|
public interface ClassExamUserService extends IService<ClassExamUser> {
|
||||||
|
|
||||||
ClassExamUser getUserHighExam(int uid);
|
ClassExamUser getUserHighExam(int uid,int courseId);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,9 +14,10 @@ import java.util.List;
|
|||||||
@Service("commonClassExamUserService")
|
@Service("commonClassExamUserService")
|
||||||
public class ClassExamUserServiceImpl extends ServiceImpl<ClassExamUserDao, ClassExamUser> implements ClassExamUserService {
|
public class ClassExamUserServiceImpl extends ServiceImpl<ClassExamUserDao, ClassExamUser> implements ClassExamUserService {
|
||||||
@Override
|
@Override
|
||||||
public ClassExamUser getUserHighExam(int uid) {
|
public ClassExamUser getUserHighExam(int uid,int courseId) {
|
||||||
LambdaQueryWrapper<ClassExamUser> classExamUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<ClassExamUser> classExamUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||||
classExamUserLambdaQueryWrapper.eq(ClassExamUser::getUserId,uid);
|
classExamUserLambdaQueryWrapper.eq(ClassExamUser::getUserId,uid);
|
||||||
|
classExamUserLambdaQueryWrapper.eq(ClassExamUser::getRelationId,courseId);
|
||||||
classExamUserLambdaQueryWrapper.orderByAsc(ClassExamUser::getScore);
|
classExamUserLambdaQueryWrapper.orderByAsc(ClassExamUser::getScore);
|
||||||
List<ClassExamUser> classExamUsers = this.getBaseMapper().selectList(classExamUserLambdaQueryWrapper);
|
List<ClassExamUser> classExamUsers = this.getBaseMapper().selectList(classExamUserLambdaQueryWrapper);
|
||||||
return classExamUsers.size()>0?classExamUsers.get(0):null;
|
return classExamUsers.size()>0?classExamUsers.get(0):null;
|
||||||
|
|||||||
Reference in New Issue
Block a user