修正 fillExclude 标志计算错误

ie-admin/src/main/java/com/ruoyi/web/service/PaperService.java

@@ -61,11 +61,11 @@ public class PaperService {
         this.learnKnowledgeTreeMapper = learnKnowledgeTreeMapper;
         this.learnCultureKnowledgeMapper = learnCultureKnowledgeMapper;
         this.dzSubjectMapper = dzSubjectMapper;
-        // buildAllPapers(2026, 909, false);
+        // buildAllPapers(2026, 913, false);
         // buildSimulatedPaperForUniversity(20950L, 11L, 78L, 2);
         // buildSimulatedPaperForUniversity(20962L, 11L, 156L, 2);
         // test2();
-        // testCulture(2026, 911, false);
+        // testCulture(2026, 911, true);
         // corrQuestions();
     }
 
@@ -182,7 +182,7 @@ public class PaperService {
         uCond.put("ids", universityDirectedMap.keySet());
         Map<Long, BBusiWishUniversities> universityMap = bBusiWishUniversitiesMapper.selectBBusiWishUniversitiesListSimpleByIds(uCond).stream().collect(Collectors.toMap(BBusiWishUniversities::getId, Function.identity()));
         List<Long> dkIdList = Lists.newArrayList();
-        Set<Long> validIdSet = Sets.newHashSet(593L); // 693L
+        Set<Long> validIdSet = Sets.newHashSet(907L,908L,879L,769L,770L); // 911/912(907,908,879,769,770),913(907L,908L,879L,769L,770L:845L,846L,907L,908L,674L,879L,896L,769L,770L,709L,710L)
         for(Long universityId : universityDirectedMap.keySet()) {
             BBusiWishUniversities universities = universityMap.get(universityId);
             if(null == universities) {
@@ -213,7 +213,7 @@ public class PaperService {
 
         List<Long> errorIdList = Lists.newArrayList();
         Map uCond = new HashMap();
-        Set<Long> validIdSet = Sets.newHashSet(); // 372L 910
+        Set<Long> validIdSet = Sets.newHashSet(372L); // 372L 910; 372L,335L,356L,362L 911
         uCond.put("ids", cultureKnowledgeList.stream().map(LearnCultureKnowledge::getUniversityId).collect(Collectors.toSet()));
         Map<Long, BBusiWishUniversities> universityMap = bBusiWishUniversitiesMapper.selectBBusiWishUniversitiesListSimpleByIds(uCond).stream().collect(Collectors.toMap(BBusiWishUniversities::getId, Function.identity()));
         Map<Long, String> subjectMap = dzSubjectMapper.selectDzSubjectList(new DzSubject()).stream().collect(Collectors.toMap(DzSubject::getSubjectId, DzSubject::getSubjectName));
@@ -438,7 +438,7 @@ public class PaperService {
     }
 
     public Pair<LearnPaper, List<LearnPaperQuestion>> buildPaper2(String filterType, Long studentId, LearnPaper paper, TestPaperVO.PaperDef2 paperDef) {
-        paperDef.setFillExclude(null != studentId);
+        paperDef.setFillExclude(null != studentId || StringUtils.isNotBlank(filterType));
         List<LearnPaperQuestion> pqList = getQuestions2(filterType, studentId, paperDef);
         return Pair.of(paper, pqList);
     }