From 9179cfe9895b7d5d7d186e1ff1084f2cf9b84257 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=BB=B4=E7=82=B3?= Date: Wed, 23 Apr 2025 18:25:22 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=85=B1=E7=94=A8=EF=BC=8C=E6=94=B9=E5=90=8D?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...xamKnowledgePoints.java => ExamPaperKnowledgePoints.java} | 2 +- .../exam/dal/mysql/paper/EducationPaperTaskMapper.java | 5 +++-- .../exam/service/paper/EducationPaperTaskServiceImpl.java | 2 +- .../exam/service/paper/IEducationPaperTaskService.java | 5 +++-- .../main/resources/mapper/exam/EducationPaperTaskMapper.xml | 3 +-- 5 files changed, 9 insertions(+), 8 deletions(-) rename exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/{ExamKnowledgePoints.java => ExamPaperKnowledgePoints.java} (97%) diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/ExamKnowledgePoints.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/ExamPaperKnowledgePoints.java similarity index 97% rename from exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/ExamKnowledgePoints.java rename to exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/ExamPaperKnowledgePoints.java index 47709c51..b8fc813f 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/ExamKnowledgePoints.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/ExamPaperKnowledgePoints.java @@ -10,7 +10,7 @@ import pc.exam.pp.module.exam.controller.admin.paper.vo.TreeEntity; * @author pengchen * @date 2025-03-24 */ -public class ExamKnowledgePoints extends TreeEntity +public class ExamPaperKnowledgePoints extends TreeEntity { private static final long serialVersionUID = 1L; diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/paper/EducationPaperTaskMapper.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/paper/EducationPaperTaskMapper.java index 8a5b9eac..f1ca96a6 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/paper/EducationPaperTaskMapper.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/paper/EducationPaperTaskMapper.java @@ -10,8 +10,9 @@ import pc.exam.pp.framework.mybatis.core.mapper.BaseMapperX; import pc.exam.pp.framework.mybatis.core.query.LambdaQueryWrapperX; import pc.exam.pp.framework.tenant.core.aop.TenantIgnore; import pc.exam.pp.module.exam.controller.admin.paper.vo.PaperTaskPageVo; -import pc.exam.pp.module.exam.dal.dataobject.ExamKnowledgePoints; + import pc.exam.pp.module.exam.dal.dataobject.EducationPaperTask; +import pc.exam.pp.module.exam.dal.dataobject.ExamPaperKnowledgePoints; /** * 试卷任务Mapper接口 @@ -88,7 +89,7 @@ public interface EducationPaperTaskMapper extends BaseMapperX getKeywords(); - List getPoints(@Param("id") Long id); + List getPoints(@Param("id") Long id); Integer getQuCount(@Param("taskSpecialty") String taskSpecialty ,@Param("spName") String spName diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperTaskServiceImpl.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperTaskServiceImpl.java index 5def6122..a0f3b087 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperTaskServiceImpl.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperTaskServiceImpl.java @@ -160,7 +160,7 @@ public class EducationPaperTaskServiceImpl implements IEducationPaperTaskService } @Override - public List getPoints(String name) { + public List getPoints(String name) { Long id= educationPaperTaskMapper.getPointIdByName(name); return educationPaperTaskMapper.getPoints(id); } diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/IEducationPaperTaskService.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/IEducationPaperTaskService.java index 3fb249af..b453de46 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/IEducationPaperTaskService.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/IEducationPaperTaskService.java @@ -5,8 +5,9 @@ import pc.exam.pp.framework.common.pojo.PageResult; import pc.exam.pp.module.exam.controller.admin.paper.dto.SchemeParam; import pc.exam.pp.module.exam.controller.admin.paper.dto.TempDto; import pc.exam.pp.module.exam.controller.admin.paper.vo.PaperTaskPageVo; -import pc.exam.pp.module.exam.dal.dataobject.ExamKnowledgePoints; + import pc.exam.pp.module.exam.dal.dataobject.EducationPaperTask; +import pc.exam.pp.module.exam.dal.dataobject.ExamPaperKnowledgePoints; import java.util.List; @@ -73,7 +74,7 @@ public interface IEducationPaperTaskService List getKeywords(); - List getPoints(String name); + List getPoints(String name); Integer getQuCount(SchemeParam param); diff --git a/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/EducationPaperTaskMapper.xml b/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/EducationPaperTaskMapper.xml index ddcb700d..34be8113 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/EducationPaperTaskMapper.xml +++ b/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/EducationPaperTaskMapper.xml @@ -18,7 +18,7 @@ - + @@ -26,7 +26,6 @@ - From 0b2829f40d01caccf69860f038f3176aa14a5416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=BB=B4=E7=82=B3?= Date: Thu, 24 Apr 2025 14:42:04 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=B8=8D=E5=90=8C=E7=9A=84=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=EF=BC=8C=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=90=8C?= =?UTF-8?q?=E7=9A=84=E4=B8=93=E4=B8=9A=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../specialty/vo/SpecialtListByUserReqVo.java | 15 +++++++++++++++ .../dal/mysql/specialty/ExamSpecialtyMapper.java | 16 ++++++++++++++++ .../mapper/specialty/ExamSpecialtyMapper.xml | 13 +++++++++++++ .../controller/admin/user/UserController.java | 12 ++++++++++++ .../system/service/user/AdminUserService.java | 8 ++++++++ 5 files changed, 64 insertions(+) create mode 100644 exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/specialty/vo/SpecialtListByUserReqVo.java diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/specialty/vo/SpecialtListByUserReqVo.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/specialty/vo/SpecialtListByUserReqVo.java new file mode 100644 index 00000000..5fa23770 --- /dev/null +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/specialty/vo/SpecialtListByUserReqVo.java @@ -0,0 +1,15 @@ +package pc.exam.pp.module.exam.controller.admin.specialty.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 专业列表 Request VO") +@Data +public class SpecialtListByUserReqVo { + + @Schema(description = "用户类型", example = "xxxx") + private String userType; + +} diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/specialty/ExamSpecialtyMapper.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/specialty/ExamSpecialtyMapper.java index 631178f3..ba9b1284 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/specialty/ExamSpecialtyMapper.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/specialty/ExamSpecialtyMapper.java @@ -1,11 +1,13 @@ package pc.exam.pp.module.exam.dal.mysql.specialty; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import pc.exam.pp.framework.mybatis.core.mapper.BaseMapperX; import pc.exam.pp.module.exam.controller.admin.specialty.vo.SpecialtListReqVo; import pc.exam.pp.module.exam.controller.admin.specialty.vo.SpecialtyQueryVo; import pc.exam.pp.module.exam.dal.dataobject.specialty.ExamSpecialty; import java.util.List; +import java.util.Set; /** * 客户端Mapper接口 @@ -40,6 +42,20 @@ public interface ExamSpecialtyMapper extends BaseMapperX */ public List selectExamSpecialtyListVo(SpecialtListReqVo reqVo); + /** + * 查询所有数据信息 + * + * @return 数据集合 + */ + public List selectExamSpecialtyAll(); + + /** + * 通过ID查询数据数据信息 + * + * @return 数据集合 + */ + public List selectExamSpecialtyByids(@Param("ids") Set ids); + /** * 查询部分数据信息 * diff --git a/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/specialty/ExamSpecialtyMapper.xml b/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/specialty/ExamSpecialtyMapper.xml index 76dbf730..8ea8e2ba 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/specialty/ExamSpecialtyMapper.xml +++ b/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/specialty/ExamSpecialtyMapper.xml @@ -28,6 +28,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + +