From 5eb29a5eab52a99c22e8fee4c4df34ddb55b044c Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期三, 16 十月 2024 13:57:01 +0800
Subject: [PATCH] 增加题库搜索
---
exam-system/src/main/java/com/gkhy/exam/institutionalaccess/service/serviceImpl/ThQuestionBankServiceImpl.java | 15 ++++++++++++---
update.sql | 3 ++-
exam-system/src/main/java/com/gkhy/exam/institutionalaccess/model/query/ThQuestionBankQuery.java | 5 +++++
ruoyi-admin/src/test/java/com/ruoyi/CertTest.java | 4 ++--
4 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/institutionalaccess/model/query/ThQuestionBankQuery.java b/exam-system/src/main/java/com/gkhy/exam/institutionalaccess/model/query/ThQuestionBankQuery.java
index c6262a0..3cb4321 100644
--- a/exam-system/src/main/java/com/gkhy/exam/institutionalaccess/model/query/ThQuestionBankQuery.java
+++ b/exam-system/src/main/java/com/gkhy/exam/institutionalaccess/model/query/ThQuestionBankQuery.java
@@ -4,6 +4,11 @@
@Data
public class ThQuestionBankQuery {
+ //平台名称
private String institutionName;
+ //平台ID
+ private Long institutionId;
+ //题库名称
+ private String name;
}
diff --git a/exam-system/src/main/java/com/gkhy/exam/institutionalaccess/service/serviceImpl/ThQuestionBankServiceImpl.java b/exam-system/src/main/java/com/gkhy/exam/institutionalaccess/service/serviceImpl/ThQuestionBankServiceImpl.java
index ee42518..c616223 100644
--- a/exam-system/src/main/java/com/gkhy/exam/institutionalaccess/service/serviceImpl/ThQuestionBankServiceImpl.java
+++ b/exam-system/src/main/java/com/gkhy/exam/institutionalaccess/service/serviceImpl/ThQuestionBankServiceImpl.java
@@ -1,5 +1,6 @@
package com.gkhy.exam.institutionalaccess.service.serviceImpl;
+import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.exam.institutionalaccess.model.query.ThQuestionBankQuery;
@@ -7,6 +8,7 @@
import com.gkhy.exam.institutionalaccess.mapper.ThQuestionBankMapper;
import com.gkhy.exam.institutionalaccess.service.ThQuestionBankService;
import com.ruoyi.common.enums.coalmineEnums.DeleteStatusEnum;
+import com.ruoyi.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -18,9 +20,16 @@
private ThQuestionBankMapper questionBankMapper;
@Override
public List<ThQuestionBank> listByPage(ThQuestionBankQuery query) {
- List<ThQuestionBank> questionBanks = questionBankMapper.selectList(new LambdaQueryWrapper<ThQuestionBank>()
- .eq(ThQuestionBank::getDelFlag, DeleteStatusEnum.NO.getStatus())
- .orderByDesc(ThQuestionBank::getCreateTime));
+ LambdaQueryWrapper<ThQuestionBank> queryWrapper = new LambdaQueryWrapper<ThQuestionBank>()
+ .eq(ThQuestionBank::getDelFlag, DeleteStatusEnum.NO.getStatus());
+ if(!ObjectUtil.isEmpty(query.getInstitutionId())){
+ queryWrapper.eq(true,ThQuestionBank::getInstitutionId,query.getInstitutionId());
+ }
+ if(!StringUtils.isEmpty(query.getName())){
+ queryWrapper.like(true,ThQuestionBank::getName,"%"+query.getName()+"%");
+ }
+ queryWrapper.orderByDesc(ThQuestionBank::getCreateTime);
+ List<ThQuestionBank> questionBanks = questionBankMapper.selectList(queryWrapper);
return questionBanks;
}
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/CertTest.java b/ruoyi-admin/src/test/java/com/ruoyi/CertTest.java
index 0516153..55444d6 100644
--- a/ruoyi-admin/src/test/java/com/ruoyi/CertTest.java
+++ b/ruoyi-admin/src/test/java/com/ruoyi/CertTest.java
@@ -32,8 +32,8 @@
List<ThCertReqDTO>thCertDTOs=new ArrayList<>();
ThCertReqDTO thCertDTO = new ThCertReqDTO();
thCertDTO.setUuid(UUID.randomUUID().toString());
- thCertDTO.setName("张三");
- thCertDTO.setIdcard("123456789012345678");
+ thCertDTO.setName("王五");
+ thCertDTO.setIdcard("123456789012345679");
thCertDTO.setBatchUuid("1ef0b81f-dcb7-62a9-ad8f-63e252089bc8");
thCertDTO.setTrainOrgName("1234567890123");
thCertDTO.setCertTime(LocalDateTime.now());
diff --git a/update.sql b/update.sql
index 1dc3ec7..f86715e 100644
--- a/update.sql
+++ b/update.sql
@@ -2,7 +2,7 @@
ADD COLUMN `ip` varchar(30) NULL,
ADD COLUMN `mac` varchar(40) NULL;
-CREATE TABLE `swspkmas`.`tr_cert` (
+CREATE TABLE `swspkmas`.`th_cert` (
`id` bigint NOT NULL AUTO_INCREMENT,
`uuid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
@@ -33,6 +33,7 @@
CREATE TABLE `swspkmas`.`th_question_bank` (
`id` bigint NOT NULL AUTO_INCREMENT,
`uuid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+`name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`institution_id` bigint NOT NULL,
`institution_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`total_count` int NOT NULL COMMENT '题库题目总数量',
--
Gitblit v1.9.2