diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperServiceImpl.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperServiceImpl.java index d8d43570..737d6b1b 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperServiceImpl.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperServiceImpl.java @@ -175,14 +175,14 @@ public class EducationPaperServiceImpl implements IEducationPaperService //获取试卷方案对象 String pointNames = educationPaperScheme.getPointNames(); //知识点id - List pointList ; + List pointList = null; //知识点名称 List pointName =new ArrayList<>(); if (pointNames!=null){ pointList = Arrays.asList(pointNames.split(",")); - if (pointList!=null){ - pointName= educationPaperTaskMapper.selectPointByid(pointList); - } +// if (pointList!=null){ +// pointName= educationPaperTaskMapper.selectPointByid(pointList); +// } } String keywords = educationPaperScheme.getKeywords(); List keywordList =new ArrayList<>(); @@ -195,7 +195,7 @@ public class EducationPaperServiceImpl implements IEducationPaperService //根据方案,去查找 试题表,返回试题id Long requiredTenantId = TenantContextHolder.getRequiredTenantId(); - List quId = educationPaperMapper.selectQuByPaperScheme(pointName,keywordList,educationPaperScheme,taskSpecialty,requiredTenantId); + List quId = educationPaperMapper.selectQuByPaperScheme(pointList,keywordList,educationPaperScheme,taskSpecialty,requiredTenantId); //把第i张卷子方案的试题全加一起 examQuestionIds.addAll(quId); @@ -378,14 +378,14 @@ public class EducationPaperServiceImpl implements IEducationPaperService //获取试卷方案对象 String pointNames = educationPaperScheme.getPointNames(); //知识点id - List pointList ; + List pointList =null; //知识点名称 List pointName =new ArrayList<>(); if (pointNames!=null){ pointList = Arrays.asList(pointNames.split(",")); - if (pointList!=null){ - pointName= educationPaperTaskMapper.selectPointByid(pointList); - } +// if (pointList!=null){ +// pointName= educationPaperTaskMapper.selectPointByid(pointList); +// } } String keywords = educationPaperScheme.getKeywords(); List keywordList =new ArrayList<>(); @@ -398,7 +398,7 @@ public class EducationPaperServiceImpl implements IEducationPaperService //根据方案,去查找 试题表,返回试题id Long requiredTenantId = TenantContextHolder.getRequiredTenantId(); - List quId = educationPaperMapper.selectQuByPaperScheme(pointName,keywordList,educationPaperScheme,taskSpecialty,requiredTenantId); + List quId = educationPaperMapper.selectQuByPaperScheme(pointList,keywordList,educationPaperScheme,taskSpecialty,requiredTenantId); //把第i张卷子方案的试题全加一起 examQuestionIds.addAll(quId); 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 84b3ed14..411dc079 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 @@ -252,10 +252,10 @@ public class EducationPaperTaskServiceImpl implements IEducationPaperTaskService List pointId = param.getPointIds(); System.out.println(pointId + "pointd"); //根据知识点的id查找对应的sp_name - List pointNames = new ArrayList<>(); - if (pointId != null&&pointId.size()>0) { - pointNames = educationPaperTaskMapper.selectPointByid(pointId); - } +// List pointNames = new ArrayList<>(); +// if (pointId != null&&pointId.size()>0) { +// pointNames = educationPaperTaskMapper.selectPointByid(pointId); +// } //难度 String quLevel = param.getQuLevel(); if ("3".equals(quLevel)) { @@ -272,7 +272,7 @@ public class EducationPaperTaskServiceImpl implements IEducationPaperTaskService // System.out.println(keywords+"keywords"); // System.out.println(quLevel+"quLevel"); // System.out.println(spName+"spName"); - return educationPaperTaskMapper.getQuCount(taskSpecialty, spName, quLevel, pointNames, keywords,requiredTenantId); + return educationPaperTaskMapper.getQuCount(taskSpecialty, spName, quLevel, pointId, keywords,requiredTenantId); } @Override diff --git a/exam-module-infra/exam-module-infra-api/src/main/java/pc/exam/pp/module/infra/enums/ErrorCodeConstants.java b/exam-module-infra/exam-module-infra-api/src/main/java/pc/exam/pp/module/infra/enums/ErrorCodeConstants.java index 53333f63..1723caf7 100644 --- a/exam-module-infra/exam-module-infra-api/src/main/java/pc/exam/pp/module/infra/enums/ErrorCodeConstants.java +++ b/exam-module-infra/exam-module-infra-api/src/main/java/pc/exam/pp/module/infra/enums/ErrorCodeConstants.java @@ -70,7 +70,7 @@ public interface ErrorCodeConstants { // ========== 试卷人员 1-001-301-000 ========== ErrorCode DEMO03_PAPER_STUDENT_EXISTS = new ErrorCode(1_001_301_001, "请选择学生"); - + // ========== 试卷参数 1-001-401-000 ========== ErrorCode DEMO03_PAPER_SESSION_EXISTS = new ErrorCode(1_001_401_001, "请开启考场设置!");