From 647edf240ca8dd428fc2549befc056e25622c5f7 Mon Sep 17 00:00:00 2001 From: zhouwentao <1577701412@qq.com> Date: Wed, 5 Jun 2024 11:56:58 +0800 Subject: [PATCH] updates --- .../modules/yx/mapper/xml/YxCalculationMajorMapper.xml | 2 +- .../src/main/java/org/jeecg/modules/yx/util/ScoreUtil.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) 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 e613300..3529b53 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 @@ -557,7 +557,7 @@ AND cm.kslx = #{queryvo.kslx} - AND cm.enroll_probability >=60 + AND cm.enroll_probability >=0 GROUP BY cm.batch diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/util/ScoreUtil.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/util/ScoreUtil.java index 30f65f1..35735f5 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/util/ScoreUtil.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/util/ScoreUtil.java @@ -125,10 +125,11 @@ public class ScoreUtil { if (StringUtils.isBlank(nowBatch) || StringUtils.isBlank(majorBatch)) { return false; } + return true; //将两个批次设置为数字等级，数字越小 权限越多 1st. - int nowLevel = "本科A段".equals(nowBatch) ? 1 : "本科B段".equals(nowBatch) ? 1 : "本科".equals(nowBatch) ? 3 : 4; - int majorLevel = "提前批".equals(majorBatch)?1: "本科A段".equals(majorBatch) ? 1 : "本科B段".equals(majorBatch) ? 2 : "本科".equals(majorBatch) ? 3 : 4; - return nowLevel<=majorLevel; +// int nowLevel = "本科A段".equals(nowBatch) ? 1 : "本科B段".equals(nowBatch) ? 1 : "本科".equals(nowBatch) ? 3 : 4; +// int majorLevel = "提前批".equals(majorBatch)?1: "本科A段".equals(majorBatch) ? 1 : "本科B段".equals(majorBatch) ? 2 : "本科".equals(majorBatch) ? 3 : 4; +// return nowLevel<=majorLevel; } /**