From 156862a0c56be1ce89c929e34d73b41d2aacfbcb Mon Sep 17 00:00:00 2001 From: wyn <1074145239@qq.com> Date: Fri, 5 Jun 2026 15:44:53 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E6=8C=87=E5=AE=9A=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=88=B6=E5=AE=9A=E8=AF=BE=E7=A8=8B=E7=9A=84?= =?UTF-8?q?=E8=AF=81=E4=B9=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/controller/ClassController.java | 9 --- .../common/service/ClassEntityService.java | 4 +- .../service/impl/ClassEntityServiceImpl.java | 30 ++++++++++ .../controller/UserCertificateController.java | 55 +++++++++++++++++++ 4 files changed, 88 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/peanut/modules/common/controller/ClassController.java b/src/main/java/com/peanut/modules/common/controller/ClassController.java index 67a51f4..c83ad8a 100644 --- a/src/main/java/com/peanut/modules/common/controller/ClassController.java +++ b/src/main/java/com/peanut/modules/common/controller/ClassController.java @@ -494,12 +494,6 @@ public class ClassController { } } } -// @RequestMapping("/createCertificateNo") -// public R createCertificateNo() { -// String certificateNo = classEntityService.getNextCertificateNo("B", ""); -// log.info("========certificateNo========="+certificateNo); -// return R.ok(certificateNo); -// } //结班 @RequestMapping("/closeClass") @Transactional @@ -646,7 +640,4 @@ public class ClassController { List userCertificate = userCertificateService.list(wrapper); return R.ok().put("userCertificate",userCertificate); } - - - } diff --git a/src/main/java/com/peanut/modules/common/service/ClassEntityService.java b/src/main/java/com/peanut/modules/common/service/ClassEntityService.java index 64f7279..c8b1031 100644 --- a/src/main/java/com/peanut/modules/common/service/ClassEntityService.java +++ b/src/main/java/com/peanut/modules/common/service/ClassEntityService.java @@ -105,7 +105,9 @@ public interface ClassEntityService extends IService { List userScoreList(Map params); - List> classCourseInfoClassId(int classId,int courseId); + Map getClassCourseInfoByClassId(int classId, int courseId); + + List> classCourseInfoClassId(int classId, int courseId); R closeClass(Map params); diff --git a/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java index 1664a45..60b9bbb 100644 --- a/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java +++ b/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java @@ -1692,7 +1692,37 @@ public class ClassEntityServiceImpl extends ServiceImpl getClassCourseInfoByClassId(int classId, int courseId) { + ClassEntity classEntity = this.baseMapper.selectById(classId); + MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); + wrapper.selectAll(CourseEntity.class); + wrapper.leftJoin(ClassCourse.class, ClassCourse::getCourseId, CourseEntity::getId); + wrapper.leftJoin(ClassModel.class, ClassModel::getId, ClassCourse::getModelId); + wrapper.eq(ClassModel::getId, classEntity.getModelId()); + if (courseId!=0){ + wrapper.eq(CourseEntity::getId,courseId); + } + CourseEntity course = courseDao.selectOne(wrapper); + + Map candk = new HashMap<>(); + MPJLambdaWrapper w = new MPJLambdaWrapper<>(); + w.leftJoin(CourseCatalogueChapterVideoEntity.class,CourseCatalogueChapterVideoEntity::getChapterId,CourseCatalogueChapterEntity::getId); + w.eq(CourseCatalogueChapterEntity::getCourseId,course.getId()); + w.selectSum(CourseCatalogueChapterVideoEntity::getDuration); + Map map = courseCatalogueChapterDao.selectJoinMap(w); + double duration = Double.parseDouble(map.get("duration").toString()); + double minute = duration/60; + double keshi = Math.ceil(minute/45); + candk.put("courseId",course.getId()); + candk.put("courseTitle",course.getTitle()); + candk.put("courseETitle",course.getEtitle()); + candk.put("titleAbbr",course.getTitleAbbr()); + candk.put("keshi",keshi); + + return candk; + } @Override public List> classCourseInfoClassId(int classId,int courseId) { List> res = new ArrayList<>(); diff --git a/src/main/java/com/peanut/modules/master/controller/UserCertificateController.java b/src/main/java/com/peanut/modules/master/controller/UserCertificateController.java index e12ca73..2c55064 100644 --- a/src/main/java/com/peanut/modules/master/controller/UserCertificateController.java +++ b/src/main/java/com/peanut/modules/master/controller/UserCertificateController.java @@ -1,5 +1,6 @@ package com.peanut.modules.master.controller; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.wrapper.MPJLambdaWrapper; @@ -38,6 +39,10 @@ public class UserCertificateController { private CourseMedicalService courseMedicalService; @Autowired private CourseToMedicalService courseToMedicalService; + @Autowired + private MyUserService userService; + @Autowired + private ClassEntityService classEntityService; //小班自考证书列表 @RequestMapping("/userClassAndZKCertificateList") @@ -278,6 +283,56 @@ public class UserCertificateController { } + @RequestMapping("/createCertificateNo") + public R createCertificateNo(@RequestBody Map params){ + ClassEntity classEntity = classEntityService.getById(params.get("classId").toString()); + String type = params.get("type").toString(); + List certificateNoList = new ArrayList<>(); + Map classCourseInfo = classEntityService.getClassCourseInfoByClassId(classEntity.getId(),0); + String pinyin = classCourseInfo.get("titleAbbr").toString(); + String tels = params.get("tels").toString(); + List telList = Arrays.asList(tels.split(",")); + List userList = userService.list(new LambdaQueryWrapper() + .in(MyUserEntity::getTel, telList)); + + for (int i=0;i