yitisheng
/
yitisheng-new-api
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updates

This commit is contained in:
zhouwentao 2024-06-05 11:56:58 +08:00
parent d62fef0441
commit 647edf240c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxCalculationMajorMapper.xml
View File

@ -557,7 +557,7 @@
<if test="queryvo.kslx!=null and queryvo.kslx!=''"> <if test="queryvo.kslx!=null and queryvo.kslx!=''">
AND cm.kslx = #{queryvo.kslx} AND cm.kslx = #{queryvo.kslx}
</if> </if>
AND cm.enroll_probability &gt;=60 AND cm.enroll_probability &gt;=0
GROUP BY cm.batch GROUP BY cm.batch
</select> </select>
</mapper> </mapper>

7
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/util/ScoreUtil.java
View File

@ -125,10 +125,11 @@ public class ScoreUtil {
if (StringUtils.isBlank(nowBatch) || StringUtils.isBlank(majorBatch)) { if (StringUtils.isBlank(nowBatch) || StringUtils.isBlank(majorBatch)) {
return false; return false;
} }
return true;
//将两个批次设置为数字等级，数字越小 权限越多 1st. //将两个批次设置为数字等级，数字越小 权限越多 1st.
int nowLevel = "本科A段".equals(nowBatch) ? 1 : "本科B段".equals(nowBatch) ? 1 : "本科".equals(nowBatch) ? 3 : 4; // 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; // int majorLevel = "提前批".equals(majorBatch)?1: "本科A段".equals(majorBatch) ? 1 : "本科B段".equals(majorBatch) ? 2 : "本科".equals(majorBatch) ? 3 : 4;
return nowLevel<=majorLevel; // return nowLevel<=majorLevel;
} }
/** /**