增加matchYear查询混合年度

ie-admin/src/main/java/com/ruoyi/web/controller/front/FrontStudentController.java

@@ -136,7 +136,7 @@ public class FrontStudentController extends BaseController {
 
         LearnDirectedKnowledge dkCond = new LearnDirectedKnowledge();
         dkCond.setUniversityId(universityId);
-        dkCond.setYear(dzControl.getPlanYear());
+        dkCond.setMatchYear(dzControl.getPlanYear());
         dkCond.setLocations(sysUser.getLocation());
         dkCond.setExamineeTypes(sysUser.getExamType().name());
         Map<String, LearnDirectedKnowledge> directedKnowledgeMap = learnDirectedKnowledgeService.selectLearnDirectedKnowledgeList(dkCond).stream().collect(Collectors.toMap(LearnDirectedKnowledge::getDirectKey, t -> t));

ie-admin/src/main/java/com/ruoyi/web/controller/learn/LearnPaperController.java

@@ -6,7 +6,10 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.alibaba.fastjson.JSONArray;
 import com.ruoyi.common.annotation.Anonymous;
+import com.ruoyi.common.core.content.VistorContextHolder;
 import com.ruoyi.common.utils.http.HttpUtils;
+import com.ruoyi.dz.domain.DzControl;
+import com.ruoyi.dz.service.IDzControlService;
 import com.ruoyi.learn.domain.LearnQuestions;
 import com.ruoyi.learn.service.ILearnQuestionsService;
 import com.ruoyi.system.service.ISysConfigService;
@@ -47,6 +50,8 @@ public class LearnPaperController extends BaseController
     private CommService commService;
     @Autowired
     private ISysConfigService configService;
+    @Autowired
+    private IDzControlService dzControlService;
 
     /**
      * 查询试卷列表
@@ -123,7 +128,8 @@ public class LearnPaperController extends BaseController
     @Anonymous
     public AjaxResult buildAll(@ApiParam("序号") @RequestParam Integer seq)
     {
-        paperService.buildAllPapers(seq);
+        DzControl dzControl = dzControlService.selectDzControl(VistorContextHolder.getContext());
+        paperService.buildAllPapers(dzControl.getPlanYear(), seq);
         return success();
     }
 

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

@@ -156,7 +156,7 @@ public class LearnTeacherService {
             AMarjorPlan plan = marjorPlanMapper.selectAMarjorPlanById(req.getMajorPlanId());
             LearnDirectedKnowledge dkCond = new LearnDirectedKnowledge();
             dkCond.setUniversityId(plan.getUniversityId());
-            dkCond.setYear(plan.getYear());
+            dkCond.setMatchYear(plan.getYear());
             SysUser sysUser = SecurityUtils.getLoginUser().getUser();
             dkCond.setLocations(sysUser.getLocation());
             dkCond.setExamineeTypes(sysUser.getExamType().name());
@@ -498,7 +498,7 @@ public class LearnTeacherService {
         AMarjorPlan plan = marjorPlanMapper.selectAMarjorPlanById(planId);
         LearnDirectedKnowledge dkCond = new LearnDirectedKnowledge();
         dkCond.setUniversityId(plan.getUniversityId());
-        dkCond.setYear(plan.getYear());
+        dkCond.setMatchYear(plan.getMatchYear());
         SysUser sysUser = SecurityUtils.getLoginUser().getUser();
         dkCond.setLocations(sysUser.getLocation());
         dkCond.setExamineeTypes(sysUser.getExamType().name());
@@ -553,7 +553,7 @@ public class LearnTeacherService {
             AMarjorPlan curr = planList.get(0);
             LearnDirectedKnowledge dkCond = new LearnDirectedKnowledge();
             dkCond.setUniversityId(curr.getUniversityId());
-            dkCond.setYear(curr.getYear());
+            dkCond.setMatchYear(curr.getMatchYear());
             SysUser sysUser = SecurityUtils.getLoginUser().getUser();
             dkCond.setLocations(sysUser.getLocation());
             dkCond.setExamineeTypes(sysUser.getExamType().name());
@@ -578,16 +578,17 @@ public class LearnTeacherService {
             if(null == examType) {
                 examType = null != sysUser.getExamType() ? sysUser.getExamType().name() : ExamType.OHS.name();
             }
-            return getStudentKnowledgeIdSet(planList.get(0), sysUser.getLocation(), examType);
+            AMarjorPlan plan = planList.get(0);
+            return getStudentKnowledgeIdSet(plan.getMatchYear(), plan, sysUser.getLocation(), examType);
         }
         return Sets.newHashSet();
     }
 
-    public Set<Long> getStudentKnowledgeIdSet(AMarjorPlan curr, String location, String examType) {
+    public Set<Long> getStudentKnowledgeIdSet(Integer year, AMarjorPlan curr, String location, String examType) {
         Set<Long> knowledgeIdSet = Sets.newHashSet();
         LearnDirectedKnowledge dkCond = new LearnDirectedKnowledge();
         dkCond.setUniversityId(curr.getUniversityId());
-        dkCond.setYear(curr.getYear());
+        dkCond.setMatchYear(year);
 
         dkCond.setLocations(location);
         dkCond.setExamineeTypes(examType);

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

@@ -1,6 +1,5 @@
 package com.ruoyi.web.service;
 
-import cn.hutool.core.lang.Dict;
 import com.alibaba.fastjson2.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.google.common.collect.Lists;
@@ -62,11 +61,11 @@ public class PaperService {
         this.learnKnowledgeTreeMapper = learnKnowledgeTreeMapper;
         this.learnCultureKnowledgeMapper = learnCultureKnowledgeMapper;
         this.dzSubjectMapper = dzSubjectMapper;
-        // buildAllPapers(900);
+        // buildAllPapers(2026, 901);
         // buildSimulatedPaperForUniversity(20950L, 11L, 78L, 2);
         // buildSimulatedPaperForUniversity(20962L, 11L, 156L, 2);
         // test2();
-        // testCulture(900);
+        // testCulture(2026, 901);
         // corrQuestions();
     }
 
@@ -173,16 +172,16 @@ public class PaperService {
         } while(questionsList.size() != pageSize);
     }
 
-    public void buildAllPapers(Integer seq) {
+    public void buildAllPapers(Integer year, Integer seq) {
         LearnDirectedKnowledge dkCond = new LearnDirectedKnowledge();
-        dkCond.setYear(2025);
+        dkCond.setMatchYear(year);
         Map<Long, List<LearnDirectedKnowledge>> universityDirectedMap = learnDirectedKnowledgeMapper.selectLearnDirectedKnowledgeList(dkCond).stream().collect(Collectors.groupingBy(LearnDirectedKnowledge::getUniversityId));
 
         Map uCond = new HashMap();
         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(227L,24L,193L);
+        Set<Long> validIdSet = Sets.newHashSet(426L,427L,428L,429L,430L,431L,432L,433L,434L,435L,436L,437L,438L,439L,440L,441L,442L,443L,444L,445L,446L,447L,448L,449L,450L,451L,452L,453L,454L,455L,456L,457L,458L,459L,460L,461L,462L,463L,464L,465L,466L,467L,468L,469L,470L,471L,472L,473L,474L,475L,476L,477L,478L,479L,480L,481L,482L,483L,484L,485L,486L,487L,488L,489L,490L,491L,492L,493L,494L,495L,496L,497L,498L,499L,500L,501L,502L,503L,504L,505L,506L,507L,508L,509L,510L,511L,512L,513L,514L,515L,516L,517L,518L,519L,520L,521L,522L,523L,524L,525L,526L,527L,528L,529L,530L,531L,532L,533L,534L,535L,536L,537L,538L,539L,540L,541L,542L,543L,544L,545L,546L,547L,548L,549L,550L,551L,552L,553L,554L,555L,556L,557L,558L,559L,560L,561L,562L,563L,564L,565L,566L,567L,568L,569L,570L,571L,572L,573L,574L,575L,576L,577L,578L,579L,580L,581L,582L,583L,584L,585L,586L,587L,588L,589L,590L,591L,592L);
         for(Long universityId : universityDirectedMap.keySet()) {
             BBusiWishUniversities universities = universityMap.get(universityId);
             if(null == universities) {
@@ -205,14 +204,15 @@ public class PaperService {
         }
     }
 
-    public void testCulture(Integer seq) {
+    public void testCulture(Integer year, Integer seq) {
         LearnCultureKnowledge ckCond = new LearnCultureKnowledge();
+        ckCond.setMatchYear(year);
         // ckCond.setUniversityId(20154L);
-        List<LearnCultureKnowledge> cultureKnowledgeList = learnCultureKnowledgeMapper.selectLearnCultureKnowledgeList(ckCond);
+        List<LearnCultureKnowledge> cultureKnowledgeList = learnCultureKnowledgeMapper.selectLearnCultureKnowledgeList(ckCond).stream().filter(t -> t.getId() >= 215).collect(Collectors.toList());
 
         List<Long> errorIdList = Lists.newArrayList();
         Map uCond = new HashMap();
-        Set<Long> validIdSet = Sets.newHashSet();
+        Set<Long> validIdSet = Sets.newHashSet(218L,224L,239L,269L);
         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));
@@ -222,7 +222,7 @@ public class PaperService {
             }
             TestPaperVO.PaperDef2 paperDef = new TestPaperVO.PaperDef2(ck.getConditions());
             if(ck.getScore() != (int) Math.round(paperDef.getScore())) {
-                throw new RuntimeException("分值不对称");
+                throw new RuntimeException("分值不对称: " + ck.getId());
             }
             paperDef.setFillExclude(false);
 
@@ -250,7 +250,7 @@ public class PaperService {
             paper.setPaperInfo(JSONObject.toJSONString(info));
             try {
                 Pair<LearnPaper, List<LearnPaperQuestion>> paperResult = buildPaper2(null, paper, paperDef);
-                savePaper(paperResult.getKey(), paperResult.getValue());
+                // savePaper(paperResult.getKey(), paperResult.getValue());
                 continue;
             } catch(Exception e) {
                 errorIdList.add(ck.getId());

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

@@ -20,6 +20,8 @@ import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.dz.SubjectScore;
+import com.ruoyi.dz.domain.DzControl;
+import com.ruoyi.dz.service.IDzControlService;
 import com.ruoyi.ie.domain.*;
 import com.ruoyi.ie.mapper.*;
 import com.ruoyi.system.service.ISysConfigService;
@@ -56,7 +58,7 @@ public class VoluntaryService {
     private static TypeReference<List<VoluntaryDto.AIResponse>> wishAiDetailsTypeReference = new TypeReference<List<VoluntaryDto.AIResponse>>() { };
     Set<String> NumberTypeSet = Sets.newHashSet(VoluntaryDto.EnumInputType.Number.name(), VoluntaryDto.EnumInputType.Eyesight.name(), VoluntaryDto.EnumInputType.Score.name());
     private static VoluntaryRuleHelper voluntaryRuleHelper = new VoluntaryRuleHelper();
-
+    private final IDzControlService dzControlService;
     private final AWishRecordMapper aWishRecordMapper;
     private final AEnrollScoreMapper aEnrollScoreMapper;
     private final AEnrollSpecialMapper aEnrollSpecialMapper;
@@ -70,7 +72,8 @@ public class VoluntaryService {
     private final EnrollRateCalculator enrollRateCalculator;
     private final BBusiWishRecordsMapper busiWishRecordsMapper;
 
-    public VoluntaryService(AWishRecordMapper aWishRecordMapper, AEnrollScoreMapper aEnrollScoreMapper, AEnrollSpecialMapper aEnrollSpecialMapper, AMarjorPlanMapper aMarjorPlanMapper, AMarjorSubmitMapper aMarjorSubmitMapper, AEnrollUniversityMapper aEnrollUniversityMapper, BBusiWishUniversitiesMapper bBusiWishUniversitiesMapper, BBusiWishUniversitiesProfessionMapper bBusiWishUniversitiesProfessionMapper, ISysConfigService sysConfigService, EnrollRateCalculator enrollRateCalculator, BBusiWishRecordsMapper busiWishRecordsMapper) {
+    public VoluntaryService(IDzControlService dzControlService, AWishRecordMapper aWishRecordMapper, AEnrollScoreMapper aEnrollScoreMapper, AEnrollSpecialMapper aEnrollSpecialMapper, AMarjorPlanMapper aMarjorPlanMapper, AMarjorSubmitMapper aMarjorSubmitMapper, AEnrollUniversityMapper aEnrollUniversityMapper, BBusiWishUniversitiesMapper bBusiWishUniversitiesMapper, BBusiWishUniversitiesProfessionMapper bBusiWishUniversitiesProfessionMapper, ISysConfigService sysConfigService, EnrollRateCalculator enrollRateCalculator, BBusiWishRecordsMapper busiWishRecordsMapper) {
+        this.dzControlService = dzControlService;
         this.aWishRecordMapper = aWishRecordMapper;
         this.aEnrollScoreMapper = aEnrollScoreMapper;
         this.aEnrollSpecialMapper = aEnrollSpecialMapper;
@@ -153,7 +156,8 @@ public class VoluntaryService {
     }
 
     public Integer getPlanYear(SysUser u) {
-        return 2025;
+        DzControl dzControl = dzControlService.selectDzControl(VistorContextHolder.getContext());
+        return dzControl.getPlanYear();
     }
 
     public Integer getSubmitYear() {
@@ -179,9 +183,8 @@ public class VoluntaryService {
                 continue;
             }
             for(Map<Long, List<AMarjorPlan>> tmpMap : bothPlanList) {
-                boolean isCurrYear = mp.getYear().equals(planYear);
                 if (tmpMap == currUniversityMajorPlansMap) {
-                    if(!isCurrYear || !mp.getId().equals(planId)) {
+                    if(!mp.getId().equals(planId)) {
                         continue;
                     }
                 } else if(mp.getYear() > submitYear) {

ie-system/src/main/java/com/ruoyi/ie/domain/AMarjorPlan.java

@@ -21,6 +21,9 @@ public class AMarjorPlan extends BaseEntity
     /** 年度 */
     @Excel(name = "年度")
     private Integer year;
+    /** 查询年度 */
+    @Excel(name = "查询年度")
+    private Integer matchYear;
 
     /** 院校id */
     @Excel(name = "院校id")
@@ -150,7 +153,16 @@ public class AMarjorPlan extends BaseEntity
     {
         return year;
     }
-    public void setUniversityId(Long universityId) 
+
+    public Integer getMatchYear() {
+        return matchYear;
+    }
+
+    public void setMatchYear(Integer matchYear) {
+        this.matchYear = matchYear;
+    }
+
+    public void setUniversityId(Long universityId)
     {
         this.universityId = universityId;
     }

ie-system/src/main/java/com/ruoyi/learn/domain/LearnCultureKnowledge.java

@@ -22,6 +22,10 @@ public class LearnCultureKnowledge extends BaseEntity
     @Excel(name = "年度")
     private Integer year;
 
+    /** 查询年度 */
+    @Excel(name = "查询年度")
+    private Integer matchYear;
+
     /** 院校id */
     @Excel(name = "院校id")
     private Long universityId;
@@ -78,7 +82,15 @@ public class LearnCultureKnowledge extends BaseEntity
         return year;
     }
 
-    public void setUniversityId(Long universityId) 
+    public Integer getMatchYear() {
+        return matchYear;
+    }
+
+    public void setMatchYear(Integer matchYear) {
+        this.matchYear = matchYear;
+    }
+
+    public void setUniversityId(Long universityId)
     {
         this.universityId = universityId;
     }

ie-system/src/main/java/com/ruoyi/learn/domain/LearnDirectedKnowledge.java

@@ -22,6 +22,10 @@ public class LearnDirectedKnowledge extends BaseEntity
     @Excel(name = "年度")
     private Integer year;
 
+    /** 查询年度 */
+    @Excel(name = "查询年度")
+    private Integer matchYear;
+
     @Excel(name = "院校ID")
     private Long universityId;
 
@@ -91,6 +95,14 @@ public class LearnDirectedKnowledge extends BaseEntity
         return year;
     }
 
+    public Integer getMatchYear() {
+        return matchYear;
+    }
+
+    public void setMatchYear(Integer matchYear) {
+        this.matchYear = matchYear;
+    }
+
     public Long getUniversityId() {
         return universityId;
     }

ie-system/src/main/resources/mapper/ie/AEnrollScoreMapper.xml

@@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN `sy_major` m3 ON m2.`parent_code` = m3.`code`
         <where>
             <if test="examineeType != null "> and es.examineeTypes = #{examineeType}</if>
-            <if test="year != null "> and es.year = #{year}</if>
+            <if test="year != null "> and es.match_year = #{year}</if>
             <if test="universityCode != null and universityCode != ''"> and u.`code` = #{universityCode}</if>
             <if test="majorGroup != null"> and es.`majorGroups` = #{majorGroup}</if>
             <choose>

ie-system/src/main/resources/mapper/ie/AMarjorPlanMapper.xml

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="AMarjorPlan" id="AMarjorPlanResult">
         <result property="id"    column="id"    />
         <result property="year"    column="year"    />
+        <result property="matchYear"    column="match_year"    />
         <result property="universityId"    column="universityId"    />
         <result property="universityName"    column="universityName"    />
         <result property="level"    column="level"    />
@@ -36,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectAMarjorPlanVo">
-        select id, year, universityId, universityName, level, majorGroup, majorName, majorDirection, enrollCode, majorEnrollCode, examineeType, planTotal, xuefei, lengthOfSchooling, score, culturalScore, profScore, schoolScore, chinessScore, mathScore, englishScore, custCond, comment, company, test, enrollFormula, acceptanceRate, enrollCount from a_marjor_plan
+        select id, year, match_year, universityId, universityName, level, majorGroup, majorName, majorDirection, enrollCode, majorEnrollCode, examineeType, planTotal, xuefei, lengthOfSchooling, score, culturalScore, profScore, schoolScore, chinessScore, mathScore, englishScore, custCond, comment, company, test, enrollFormula, acceptanceRate, enrollCount from a_marjor_plan
     </sql>
 
 
@@ -55,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectListByRuleCond" parameterType="Map" resultMap="AMarjorPlanResult">
-      SELECT m1.code majorCode, p.id, p.year, p.universityId, p.universityName, p.level, majorGroup, majorName, majorDirection, enrollCode, majorEnrollCode, examineeType, planTotal, xuefei, lengthOfSchooling, score, culturalScore, profScore, schoolScore, chinessScore, mathScore, englishScore, custCond, comment, company, p.acceptanceRate
+      SELECT m1.code majorCode, p.id, p.year, p.match_year, p.universityId, p.universityName, p.level, majorGroup, majorName, majorDirection, enrollCode, majorEnrollCode, examineeType, planTotal, xuefei, lengthOfSchooling, score, culturalScore, profScore, schoolScore, chinessScore, mathScore, englishScore, custCond, comment, company, p.acceptanceRate
         FROM `a_marjor_plan` p
         JOIN `b_busi_wish_universities` u ON p.`universityId` = u.`id`
         LEFT JOIN `sy_major` m1 ON m1.`name` = p.`majorName` and m1.`exam_type` = p.examineeType
@@ -63,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN `sy_major` m3 ON m2.`parent_code` = m3.`code` and m3.`exam_type` = p.examineeType
         <where>
             <if test="examineeType != null and examineeType != '' "> and (p.`examineeType` IS NULL OR p.`examineeType` = '' OR p.`examineeType` = #{examineeType})</if>
-            <if test="year != null "> and p.year = #{year}</if>
+            <if test="year != null "> and p.match_year = #{year}</if>
             <if test="universityCode != null and universityCode != ''"> and u.`code` = #{universityCode}</if>
             <if test="majorEnrollCodes != null"> AND p.`id` in <foreach item="o" collection="majorEnrollCodes" open="(" separator="," close=")">#{o}</foreach></if>
             <choose>

ie-system/src/main/resources/mapper/learn/LearnCultureKnowledgeMapper.xml

@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectLearnCultureKnowledgeVo"/>
         <where>  
             <if test="year != null "> and year = #{year}</if>
+            <if test="matchYear != null "> and match_year = #{matchYear}</if>
             <if test="universityId != null "> and university_id = #{universityId}</if>
             <if test="subjects != null  and subjects != ''"> and subjects = #{subjects}</if>
             <if test="questionTypes != null  and questionTypes != ''"> and question_types = #{questionTypes}</if>

ie-system/src/main/resources/mapper/learn/LearnDirectedKnowledgeMapper.xml

@@ -31,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectLearnDirectedKnowledgeVo"/>
         <where>  
             <if test="year != null "> and year = #{year}</if>
+            <if test="matchYear != null "> and match_year = #{matchYear}</if>
             <if test="universityId != null  and universityId != ''"> and university_id = #{universityId}</if>
             <if test="directKey != null  and directKey != ''"> and direct_key = #{directKey}</if>
             <if test="enrollFormula != null  and enrollFormula != ''"> and enrollFormula = #{enrollFormula}</if>

ie-system/src/main/resources/mapper/syzy/BBusiWishUniversitiesProfessionMapper.xml

@@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="examType != null and examType != ''"> AND up.`examType` = #{examType}</if>
         <where>
             <if test="collegeCode != null  and collegeCode != ''"> and mp.`universityId` = #{collegeCode}</if>
-            <if test="year != null"> and mp.`year` = #{year}</if>
+            <if test="year != null"> and mp.`match_year` = #{year}</if>
             <if test="examineeType != null  and examineeType != ''"> and mp.`examineeType` = #{examineeType}</if>
             <if test="code != null  and code != ''"> and up.code = #{code}</if>
             <if test="name != null  and name != ''"> and up.name like concat('%', #{name}, '%')</if>