Exam/pengchen-exam-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #106: (hyc -> master)

Browse Source 
Merge Request: 【修改】试卷任务出试卷 知识点由名称改为id

Created By: @华允传
Accepted By: @华允传
URL: https://g-iswv8783.coding.net/p/education/d/pengchen-exam-java/git/merge/106?initial=true
This commit is contained in:
华允传
2025-06-09 11:27:30 +08:00
committed by Coding
parent a6bb713239 2716a51950
commit de31e4b30a
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperServiceImpl.java
View File

@@ -175,14 +175,14 @@ public class EducationPaperServiceImpl implements IEducationPaperService
//获取试卷方案对象 //获取试卷方案对象
String pointNames = educationPaperScheme.getPointNames(); String pointNames = educationPaperScheme.getPointNames();
//知识点id //知识点id
List<String> pointList ; List<String> pointList = null;
//知识点名称 //知识点名称
List<String> pointName =new ArrayList<>(); List<String> pointName =new ArrayList<>();
if (pointNames!=null){ if (pointNames!=null){
pointList = Arrays.asList(pointNames.split(",")); pointList = Arrays.asList(pointNames.split(","));
if (pointList!=null){ // if (pointList!=null){
pointName= educationPaperTaskMapper.selectPointByid(pointList); // pointName= educationPaperTaskMapper.selectPointByid(pointList);
} // }
} }
String keywords = educationPaperScheme.getKeywords(); String keywords = educationPaperScheme.getKeywords();
List<String> keywordList =new ArrayList<>(); List<String> keywordList =new ArrayList<>();
@@ -195,7 +195,7 @@ public class EducationPaperServiceImpl implements IEducationPaperService
//根据方案，去查找 试题表,返回试题id //根据方案，去查找 试题表,返回试题id
Long requiredTenantId = TenantContextHolder.getRequiredTenantId(); Long requiredTenantId = TenantContextHolder.getRequiredTenantId();
List<String> quId = educationPaperMapper.selectQuByPaperScheme(pointName,keywordList,educationPaperScheme,taskSpecialty,requiredTenantId); List<String> quId = educationPaperMapper.selectQuByPaperScheme(pointList,keywordList,educationPaperScheme,taskSpecialty,requiredTenantId);
//把第i张卷子方案的试题全加一起 //把第i张卷子方案的试题全加一起
examQuestionIds.addAll(quId); examQuestionIds.addAll(quId);
@@ -378,14 +378,14 @@ public class EducationPaperServiceImpl implements IEducationPaperService
//获取试卷方案对象 //获取试卷方案对象
String pointNames = educationPaperScheme.getPointNames(); String pointNames = educationPaperScheme.getPointNames();
//知识点id //知识点id
List<String> pointList ; List<String> pointList =null;
//知识点名称 //知识点名称
List<String> pointName =new ArrayList<>(); List<String> pointName =new ArrayList<>();
if (pointNames!=null){ if (pointNames!=null){
pointList = Arrays.asList(pointNames.split(",")); pointList = Arrays.asList(pointNames.split(","));
if (pointList!=null){ // if (pointList!=null){
pointName= educationPaperTaskMapper.selectPointByid(pointList); // pointName= educationPaperTaskMapper.selectPointByid(pointList);
} // }
} }
String keywords = educationPaperScheme.getKeywords(); String keywords = educationPaperScheme.getKeywords();
List<String> keywordList =new ArrayList<>(); List<String> keywordList =new ArrayList<>();
@@ -398,7 +398,7 @@ public class EducationPaperServiceImpl implements IEducationPaperService
//根据方案，去查找 试题表,返回试题id //根据方案，去查找 试题表,返回试题id
Long requiredTenantId = TenantContextHolder.getRequiredTenantId(); Long requiredTenantId = TenantContextHolder.getRequiredTenantId();
List<String> quId = educationPaperMapper.selectQuByPaperScheme(pointName,keywordList,educationPaperScheme,taskSpecialty,requiredTenantId); List<String> quId = educationPaperMapper.selectQuByPaperScheme(pointList,keywordList,educationPaperScheme,taskSpecialty,requiredTenantId);
//把第i张卷子方案的试题全加一起 //把第i张卷子方案的试题全加一起
examQuestionIds.addAll(quId); examQuestionIds.addAll(quId);

10
exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperTaskServiceImpl.java
View File

@@ -252,10 +252,10 @@ public class EducationPaperTaskServiceImpl implements IEducationPaperTaskService
List<String> pointId = param.getPointIds(); List<String> pointId = param.getPointIds();
System.out.println(pointId + "pointd"); System.out.println(pointId + "pointd");
//根据知识点的id查找对应的sp_name //根据知识点的id查找对应的sp_name
List<String> pointNames = new ArrayList<>(); // List<String> pointNames = new ArrayList<>();
if (pointId != null&&pointId.size()>0) { // if (pointId != null&&pointId.size()>0) {
pointNames = educationPaperTaskMapper.selectPointByid(pointId); // pointNames = educationPaperTaskMapper.selectPointByid(pointId);
} // }
//难度 //难度
String quLevel = param.getQuLevel(); String quLevel = param.getQuLevel();
if ("3".equals(quLevel)) { if ("3".equals(quLevel)) {
@@ -272,7 +272,7 @@ public class EducationPaperTaskServiceImpl implements IEducationPaperTaskService
// System.out.println(keywords+"keywords"); // System.out.println(keywords+"keywords");
// System.out.println(quLevel+"quLevel"); // System.out.println(quLevel+"quLevel");
// System.out.println(spName+"spName"); // System.out.println(spName+"spName");
return educationPaperTaskMapper.getQuCount(taskSpecialty, spName, quLevel, pointNames, keywords,requiredTenantId); return educationPaperTaskMapper.getQuCount(taskSpecialty, spName, quLevel, pointId, keywords,requiredTenantId);
} }
@Override @Override