From b20413b7bd58a1661863511a8ffb1d690608db27 Mon Sep 17 00:00:00 2001 From: zhouwentao <1577701412@qq.com> Date: Sun, 22 Jun 2025 23:31:43 +0800 Subject: [PATCH] updates --- .../controller/YxSchoolMajorController.java | 349 +++++++++++++----- .../modules/yx/dto/SchoolMajorLqfsDTO.java | 41 +- .../modules/yx/entity/YxSchoolMajor.java | 7 + .../mapper/xml/YxCalculationMajorMapper.xml | 2 +- .../impl/YxCalculationMajorServiceImpl.java | 26 +- 5 files changed, 310 insertions(+), 115 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolMajorController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolMajorController.java index acc310e..2ee946d 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolMajorController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolMajorController.java @@ -69,12 +69,9 @@ public class YxSchoolMajorController extends JeecgController yxSchoolMajorList =yxSchoolMajorService.list(); + + LambdaQueryWrapper yxHistoryMajorEnrollLambdaQueryWrapper = new LambdaQueryWrapper<>(); + yxHistoryMajorEnrollLambdaQueryWrapper.eq(YxHistoryMajorEnroll::getYear,"2024"); + List yxHistoryMajorEnrollList = yxHistoryMajorEnrollService.list(yxHistoryMajorEnrollLambdaQueryWrapper); + Map historyMajorEnrollMap = new LinkedHashMap<>(); + for (YxHistoryMajorEnroll h : yxHistoryMajorEnrollList) { + key = h.getSchoolCode()+ a + h.getBatch() +a + h.getMajorName() + a + h.getCategory(); + if ("音乐类".equals(h.getMajorType())) { + if ("音乐表演".equals(h.getMainSubjects())) { + key+= a + h.getMainSubjects() + a+ h.getMajorTypeChild(); + }else{ + key+= a + h.getMainSubjects(); + } + } + historyMajorEnrollMap.put(key, h); + } + Map schoolMajorMap = new HashMap<>(); for (YxSchoolMajor item : yxSchoolMajorList) { key = item.getSchoolCode()+a+item.getBatch()+a+item.getMajorName()+a+item.getCategory(); + if ("音乐类".equals(item.getMajorType())) { + if ("音乐表演".equals(item.getMainSubjects())) { + key+= a + item.getMainSubjects() + a+ item.getMajorTypeChild(); + }else{ + key+= a + item.getMainSubjects(); + } + }else if("表演类".equals(item.getMajorType())){ + key+= a + item.getMainSubjects(); + } schoolMajorMap.put(key,item); } Map majorMap = yxMajorService.mapsForMajorName(); @@ -333,7 +356,19 @@ public class YxSchoolMajorController extends JeecgController list = ExcelImportUtil.importExcel(file.getInputStream(), SchoolMajorLqfsDTO.class, params); String a="_"; String key; - List yxSchoolMajorList =yxSchoolMajorService.list(); + LambdaQueryWrapper schoolMajorLambdaQueryWrapper = new LambdaQueryWrapper<>(); + schoolMajorLambdaQueryWrapper.eq(YxSchoolMajor::getMajorType, list.get(0).getMajorType()); + List yxSchoolMajorList =yxSchoolMajorService.list(schoolMajorLambdaQueryWrapper); Map schoolMajorMap = new HashMap<>(); List updatesList = new ArrayList<>(); + List addsList = new ArrayList<>(); for (YxSchoolMajor item : yxSchoolMajorList) { index++; AssertUtils.notEmpty(item.getSchoolCode(), String.format("行[%s],请输入学校代码", index)); AssertUtils.notEmpty(item.getBatch(), String.format("行[%s],请输入批次", index)); AssertUtils.notEmpty(item.getMajorName(), String.format("行[%s],请输入专业名称", index)); AssertUtils.notEmpty(item.getCategory(), String.format("行[%s],请输入科类", index)); - key = item.getSchoolCode()+a+item.getBatch()+a+item.getMajorName()+a+item.getCategory(); + key = item.getSchoolCode()+a+item.getBatch()+a+item.getMajorName()+a+item.getCategory()+a+item.getMajorType(); schoolMajorMap.put(key,item); } + YxSchoolMajor yxSchoolMajor = null; + for (SchoolMajorLqfsDTO schoolMajorLqfsDTO : list) { + schoolMajorLqfsDTO.setMajorName(schoolMajorLqfsDTO.getMajorName().replace("(","（").replace(")","）")); - index=3; - YxSchoolMajor yxSchoolMajor; - String probabilityOperator =""; - for (SchoolMajorLqfsDTO item : list) { - index++; - probabilityOperator=""; - key = item.getSchoolCode()+a+item.getBatch()+a+item.getMajorName()+a+item.getCategory(); - if(StringUtils.isBlank(item.getProbabilityOperatorWen()) && StringUtils.isBlank(item.getProbabilityOperatorZhuan())){ - continue; + if(schoolMajorLqfsDTO.getSchoolCode().length() == 1){ + schoolMajorLqfsDTO.setSchoolCode("000"+schoolMajorLqfsDTO.getSchoolCode()); + }else if(schoolMajorLqfsDTO.getSchoolCode().length() == 2){ + schoolMajorLqfsDTO.setSchoolCode("00"+schoolMajorLqfsDTO.getSchoolCode()); + }else if(schoolMajorLqfsDTO.getSchoolCode().length() == 3){ + schoolMajorLqfsDTO.setSchoolCode("0"+schoolMajorLqfsDTO.getSchoolCode()); } - if(StringUtils.isNotBlank(item.getProbabilityOperatorWen())){ - probabilityOperator+="文*"+item.getProbabilityOperatorWen(); + if(schoolMajorLqfsDTO.getEnrollmentCode().length() == 1){ + schoolMajorLqfsDTO.setEnrollmentCode("0"+schoolMajorLqfsDTO.getEnrollmentCode()); } - if(StringUtils.isNotBlank(item.getProbabilityOperatorZhuan())){ - if(StringUtils.isNotBlank(item.getProbabilityOperatorWen())){ - probabilityOperator+="+"; - } - probabilityOperator+="专*"+item.getProbabilityOperatorZhuan(); - } + key = schoolMajorLqfsDTO.getSchoolCode()+a+schoolMajorLqfsDTO.getBatch()+a+schoolMajorLqfsDTO.getMajorName()+a+schoolMajorLqfsDTO.getCategory()+a+schoolMajorLqfsDTO.getMajorType(); yxSchoolMajor = schoolMajorMap.get(key); - yxSchoolMajor.setRulesEnrollProbabilitySx(item.getRulesEnrollProbabilitySx()); - yxSchoolMajor.setRulesEnrollProbability(probabilityOperator); - yxSchoolMajor.setProbabilityOperator(probabilityOperator); - if (StringUtils.isNotBlank(item.getDetail())) { - yxSchoolMajor.setDetail(item.getDetail()); + if(yxSchoolMajor==null){ + yxSchoolMajor = new YxSchoolMajor(); + yxSchoolMajor.setSchoolCode(schoolMajorLqfsDTO.getSchoolCode()); + yxSchoolMajor.setBatch(schoolMajorLqfsDTO.getBatch()); + yxSchoolMajor.setEnrollmentCode(schoolMajorLqfsDTO.getEnrollmentCode()); + yxSchoolMajor.setMajorName(schoolMajorLqfsDTO.getMajorName()); + yxSchoolMajor.setMajorType(schoolMajorLqfsDTO.getMajorType()); + yxSchoolMajor.setCategory(schoolMajorLqfsDTO.getCategory()); + yxSchoolMajor.setMainSubjects(schoolMajorLqfsDTO.getZkkm()); + yxSchoolMajor.setMajorTypeChild(schoolMajorLqfsDTO.getZyzjlb()); + + yxSchoolMajor.setRulesEnrollProbability(schoolMajorLqfsDTO.getRulesEnrollProbability()); + yxSchoolMajor.setRulesEnrollProbabilitySx(schoolMajorLqfsDTO.getRulesEnrollProbabilitySx()); + yxSchoolMajor.setPrivateRulesEnrollProbability(schoolMajorLqfsDTO.getRulesEnrollProbability()); + yxSchoolMajor.setProbabilityOperator(schoolMajorLqfsDTO.getProbabilityOperator()); + yxSchoolMajor.setPrivateProbabilityOperator(schoolMajorLqfsDTO.getProbabilityOperator()); + + yxSchoolMajor.setPlanNum(Integer.valueOf(schoolMajorLqfsDTO.getPlanNum())); + yxSchoolMajor.setTuition(schoolMajorLqfsDTO.getXuefei()); + yxSchoolMajor.setState("2"); // 新增 + yxSchoolMajor.setCulturalScoreLimitation(new BigDecimal(schoolMajorLqfsDTO.getCulturalScoreLimitation())); + yxSchoolMajor.setProfessionalScoreLimitation(new BigDecimal(schoolMajorLqfsDTO.getProfessionalScoreLimitation())); + yxSchoolMajor.setChineseScoreLimitation(new BigDecimal(schoolMajorLqfsDTO.getChineseScoreLimitation())); + yxSchoolMajor.setEnglishScoreLimitation(new BigDecimal(schoolMajorLqfsDTO.getEnglishScoreLimitation())); + + addsList.add(yxSchoolMajor); + if (StringUtils.isBlank(schoolMajorLqfsDTO.getZkkm())) { + schoolMajorLqfsDTO.setZkkm(""); + } + // 专业子级 + if (StringUtils.isBlank(schoolMajorLqfsDTO.getZyzjlb())) { + schoolMajorLqfsDTO.setZyzjlb(""); + } + if(StringUtils.isBlank(schoolMajorLqfsDTO.getRulesEnrollProbability())){ + schoolMajorLqfsDTO.setRulesEnrollProbability(""); + } + if(StringUtils.isBlank(schoolMajorLqfsDTO.getProbabilityOperator())){ + schoolMajorLqfsDTO.setProbabilityOperator(""); + } + if(StringUtils.isBlank(schoolMajorLqfsDTO.getPlanNum())){ + schoolMajorLqfsDTO.setPlanNum(""); + } + if(StringUtils.isBlank(schoolMajorLqfsDTO.getXuefei())){ + schoolMajorLqfsDTO.setXuefei(""); + } + if(StringUtils.isBlank(schoolMajorLqfsDTO.getDetail())){ + schoolMajorLqfsDTO.setDetail(""); + } + if(StringUtils.isBlank(schoolMajorLqfsDTO.getProfessionalScoreLimitation())){ + schoolMajorLqfsDTO.setProfessionalScoreLimitation(""); + } + if(StringUtils.isBlank(schoolMajorLqfsDTO.getCulturalScoreLimitation())){ + schoolMajorLqfsDTO.setCulturalScoreLimitation(""); + } + if(StringUtils.isBlank(schoolMajorLqfsDTO.getEnglishScoreLimitation())){ + schoolMajorLqfsDTO.setEnglishScoreLimitation(""); + } + if(StringUtils.isBlank(schoolMajorLqfsDTO.getSfxz())){ + schoolMajorLqfsDTO.setSfxz(""); + } + if(StringUtils.isBlank(schoolMajorLqfsDTO.getSfgbyz())){ + schoolMajorLqfsDTO.setSfgbyz(""); + } + + System.out.println(schoolMajorLqfsDTO.getSchoolCode()+","+schoolMajorLqfsDTO.getSchoolName()+","+schoolMajorLqfsDTO.getBatch()+","+schoolMajorLqfsDTO.getEnrollmentCode()+","+ + schoolMajorLqfsDTO.getMajorName()+","+schoolMajorLqfsDTO.getMajorType()+","+schoolMajorLqfsDTO.getZkkm()+","+schoolMajorLqfsDTO.getZyzjlb()+","+"2025"+","+ + schoolMajorLqfsDTO.getCategory()+","+schoolMajorLqfsDTO.getRulesEnrollProbability()+","+schoolMajorLqfsDTO.getProbabilityOperator()+","+ schoolMajorLqfsDTO.getPlanNum()+","+ + schoolMajorLqfsDTO.getXuefei()+","+schoolMajorLqfsDTO.getDetail()+","+schoolMajorLqfsDTO.getProfessionalScoreLimitation()+","+schoolMajorLqfsDTO.getEnglishScoreLimitation()+","+schoolMajorLqfsDTO.getCulturalScoreLimitation()+","+ + schoolMajorLqfsDTO.getSfxz()+","+ schoolMajorLqfsDTO.getSfgbyz() + ); + }else{ + yxSchoolMajor.setRulesEnrollProbability(schoolMajorLqfsDTO.getRulesEnrollProbability()); + yxSchoolMajor.setProbabilityOperator(schoolMajorLqfsDTO.getProbabilityOperator()); + yxSchoolMajor.setPrivateProbabilityOperator(schoolMajorLqfsDTO.getProbabilityOperator()); + yxSchoolMajor.setPrivateRulesEnrollProbability(schoolMajorLqfsDTO.getRulesEnrollProbability()); + if (StringUtils.isNotBlank(schoolMajorLqfsDTO.getPlanNum())) { + yxSchoolMajor.setPlanNum(Integer.parseInt(schoolMajorLqfsDTO.getPlanNum())); + } + if (StringUtils.isNotBlank(schoolMajorLqfsDTO.getXuefei())) { + yxSchoolMajor.setTuition(schoolMajorLqfsDTO.getXuefei()); + } + yxSchoolMajor.setDetail(schoolMajorLqfsDTO.getDetail()); + if(StringUtils.isNotBlank(schoolMajorLqfsDTO.getProfessionalScoreLimitation())){ + yxSchoolMajor.setProfessionalScoreLimitation(new BigDecimal(schoolMajorLqfsDTO.getProfessionalScoreLimitation())); + } + if(StringUtils.isNotBlank(schoolMajorLqfsDTO.getCulturalScoreLimitation())){ + yxSchoolMajor.setCulturalScoreLimitation(new BigDecimal(schoolMajorLqfsDTO.getCulturalScoreLimitation())); + } + if(StringUtils.isNotBlank(schoolMajorLqfsDTO.getChineseScoreLimitation())){ + yxSchoolMajor.setChineseScoreLimitation(new BigDecimal(schoolMajorLqfsDTO.getChineseScoreLimitation())); + } + if(StringUtils.isNotBlank(schoolMajorLqfsDTO.getEnglishScoreLimitation())){ + yxSchoolMajor.setEnglishScoreLimitation(new BigDecimal(schoolMajorLqfsDTO.getEnglishScoreLimitation())); + } + if ("是".equals(schoolMajorLqfsDTO.getSfxz())) { + yxSchoolMajor.setState("2"); + } + updatesList.add(yxSchoolMajor); } - if (item.getChineseScoreLimitation()!=null) { - yxSchoolMajor.setChineseScoreLimitation(item.getChineseScoreLimitation()); - } - if (item.getChineseScoreLimitation()!=null) { - yxSchoolMajor.setEnglishScoreLimitation(item.getEnglishScoreLimitation()); - } - if (item.getChineseScoreLimitation()!=null) { - yxSchoolMajor.setCulturalScoreLimitation(item.getCulturalScoreLimitation()); - } - if (item.getChineseScoreLimitation()!=null) { - yxSchoolMajor.setProfessionalScoreLimitation(item.getProfessionalScoreLimitation()); - } - updatesList.add(yxSchoolMajor); } - service.updateBatchById(updatesList); + if(updatesList.size()>0){ + yxSchoolMajorService.updateBatchById(updatesList); + } + if(addsList.size()>0){ + yxSchoolMajorService.saveBatch(addsList); + } + // index=3; +// YxSchoolMajor yxSchoolMajor; +// String probabilityOperator =""; +// for (SchoolMajorLqfsDTO item : list) { +// index++; +// probabilityOperator=""; +// key = item.getSchoolCode()+a+item.getBatch()+a+item.getMajorName()+a+item.getCategory(); +// if(StringUtils.isBlank(item.getProbabilityOperatorWen()) && StringUtils.isBlank(item.getProbabilityOperatorZhuan())){ +// continue; +// } +// if(StringUtils.isNotBlank(item.getProbabilityOperatorWen())){ +// probabilityOperator+="文*"+item.getProbabilityOperatorWen(); +// } +// +// if(StringUtils.isNotBlank(item.getProbabilityOperatorZhuan())){ +// if(StringUtils.isNotBlank(item.getProbabilityOperatorWen())){ +// probabilityOperator+="+"; +// } +// probabilityOperator+="专*"+item.getProbabilityOperatorZhuan(); +// } +// yxSchoolMajor = schoolMajorMap.get(key); +// yxSchoolMajor.setRulesEnrollProbabilitySx(item.getRulesEnrollProbabilitySx()); +// yxSchoolMajor.setRulesEnrollProbability(probabilityOperator); +// yxSchoolMajor.setProbabilityOperator(probabilityOperator); +// if (StringUtils.isNotBlank(item.getDetail())) { +// yxSchoolMajor.setDetail(item.getDetail()); +// } +// if (item.getChineseScoreLimitation()!=null) { +// yxSchoolMajor.setChineseScoreLimitation(item.getChineseScoreLimitation()); +// } +// if (item.getEnglishScoreLimitation()!=null) { +// yxSchoolMajor.setEnglishScoreLimitation(item.getEnglishScoreLimitation()); +// } +// if (item.getCulturalScoreLimitation()!=null) { +// yxSchoolMajor.setCulturalScoreLimitation(item.getCulturalScoreLimitation()); +// } +// if (item.getProbabilityOperatorWen()!=null) { +// yxSchoolMajor.setProfessionalScoreLimitation(item.getProfessionalScoreLimitation()); +// } +// updatesList.add(yxSchoolMajor); +// } +// service.updateBatchById(updatesList); log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒"); return Result.ok("文件导入成功！数据行数：" + list.size()); } catch (Exception e) { diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/dto/SchoolMajorLqfsDTO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/dto/SchoolMajorLqfsDTO.java index 7d9d577..9220494 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/dto/SchoolMajorLqfsDTO.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/dto/SchoolMajorLqfsDTO.java @@ -19,6 +19,10 @@ public class SchoolMajorLqfsDTO implements Serializable { @Excel(name = "学校代码", width = 15) @ApiModelProperty(value = "学校代码") private java.lang.String schoolCode; + /**学校名称*/ + @Excel(name = "学校名称", width = 15) + @ApiModelProperty(value = "学校名称") + private java.lang.String schoolName; /**批次*/ @Excel(name = "批次", width = 15) @ApiModelProperty(value = "批次") @@ -39,6 +43,15 @@ public class SchoolMajorLqfsDTO implements Serializable { @Excel(name = "科类(文科/理科)", width = 15) @ApiModelProperty(value = "科类(文科/理科)") private java.lang.String category; + + @Excel(name = "主考科目", width = 15) + @ApiModelProperty(value = "主考科目") + private java.lang.String zkkm; + + @Excel(name = "专业子级类别", width = 15) + @ApiModelProperty(value = "专业子级类别") + private java.lang.String zyzjlb; + /**录取方式缩写*/ @Excel(name = "录取方式缩写(用于筛选条件)", width = 15) @ApiModelProperty(value = "录取方式缩写(用于筛选条件)") @@ -50,6 +63,23 @@ public class SchoolMajorLqfsDTO implements Serializable { @ApiModelProperty(value = "对外录取方式") private java.lang.String rulesEnrollProbability; + @Excel(name = "对外录取方式运算符", width = 15) + @ApiModelProperty(value = "对外录取方式运算符") + private java.lang.String probabilityOperator; + + @Excel(name = "计划招生人数", width = 15) + @ApiModelProperty(value = "计划招生人数") + private java.lang.String planNum; + + @Excel(name = "学费") + private String xuefei; + + @Excel(name = "是否为新增") + private String sfxz; + + @Excel(name = "是否改变录取原则") + private String sfgbyz; + /**对外录取方式运算符(文)*/ @Excel(name = "对外录取方式运算符(文)", width = 15) @ApiModelProperty(value = "对外录取方式运算符(文)") @@ -68,31 +98,34 @@ public class SchoolMajorLqfsDTO implements Serializable { @Excel(name = "备注", width = 15) @ApiModelProperty(value = "备注") private java.lang.String detail; + + @Excel(name = "状态", width = 15) + private String status; /** * 文化分限制 */ @ApiModelProperty(value = "文化成绩限制") @Excel(name = "文化成绩限制", width = 15) - private BigDecimal culturalScoreLimitation; + private String culturalScoreLimitation; /** * 专业分限制 */ @ApiModelProperty(value = "专业成绩限制") @Excel(name = "专业成绩限制", width = 15) - private BigDecimal professionalScoreLimitation; + private String professionalScoreLimitation; /** * 语文分限制 */ @ApiModelProperty(value = "语文成绩限制") @Excel(name = "语文成绩限制", width = 15) - private BigDecimal chineseScoreLimitation; + private String chineseScoreLimitation; /** * 外语成绩限制 */ @ApiModelProperty(value = "外语成绩限制") @Excel(name = "外语成绩限制", width = 15) - private BigDecimal englishScoreLimitation; + private String englishScoreLimitation; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolMajor.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolMajor.java index 42d6ada..e4f2743 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolMajor.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolMajor.java @@ -39,6 +39,12 @@ public class YxSchoolMajor implements Serializable { @ApiModelProperty(value = "学校代码") @Dict(dictTable = "yx_school_child",dicCode = "school_code",dicText = "school_name") private java.lang.String schoolCode; + + /**学校代码*/ + @Excel(name = "学校名称", width = 15) + @ApiModelProperty(value = "学校名称") + private java.lang.String schoolName; + /**专业代码*/ @ApiModelProperty(value = "专业代码") @Dict(dictTable = "yx_major",dicCode = "major_code",dicText = "major_name") @@ -81,6 +87,7 @@ public class YxSchoolMajor implements Serializable { /**学费*/ + @Excel(name = "学费") @ApiModelProperty(value = "学费") private java.lang.String tuition; /**学制*/ diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxCalculationMajorMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxCalculationMajorMapper.xml index 04222d1..78881f4 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxCalculationMajorMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxCalculationMajorMapper.xml @@ -105,7 +105,7 @@ - AND cm.batch = #{queryvo.batch} + AND cm.batch like concat('%',#{queryvo.batch},'%') AND cm.batch in diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java index aacce7d..ddb0c8a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java @@ -126,19 +126,6 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); -// lqw.eq(YxHistoryMajorEnroll::getYear,"2024"); -// lqw.eq(YxHistoryMajorEnroll::getMajorType,"体育类"); -// lqw.eq(YxHistoryMajorEnroll::getBatch,"本科"); -// List list = yxHistoryMajorEnrollService.list(lqw); -// for (YxHistoryMajorEnroll yxHistoryMajorEnroll : list) { -// if ("理科".equals(yxHistoryMajorEnroll.getCategory())) { -// -// }else{ -// -// } -// } - if (pageNum == null) { pageNum = 1; } @@ -152,6 +139,11 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl(Arrays.asList(activeCurrentUserScore.getProfessionalCategoryChildren().split(",")))); @@ -225,14 +217,6 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl