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 18:34:36 +08:00
parent 647edf240c
commit 558310aaa0
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,6 +77,7 @@
<if test="queryvo.schoolName!=null and queryvo.schoolName!=''"> <if test="queryvo.schoolName!=null and queryvo.schoolName!=''">
AND (s.school_name like concat('%',#{queryvo.schoolName},'%') or sc.schooL_code like AND (s.school_name like concat('%',#{queryvo.schoolName},'%') or sc.schooL_code like
concat('%',#{queryvo.schoolName},'%') or cm.major_name like concat('%',#{queryvo.schoolName},'%') or cm.major_name like
concat('%',#{queryvo.schoolName},'%') or cm.major_detail like
concat('%',#{queryvo.schoolName},'%')) concat('%',#{queryvo.schoolName},'%'))
</if> </if>
<if test="queryvo.schoolCode!=null and queryvo.schoolCode!=''"> <if test="queryvo.schoolCode!=null and queryvo.schoolCode!=''">

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

@ -10,10 +10,7 @@ import org.jeecg.modules.yx.entity.YxUserScore;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
import java.util.Arrays; import java.util.*;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
/** /**
* @Description 分数计算工具1 * @Description 分数计算工具1
@ -549,4 +546,5 @@ public class ScoreUtil {
} }
return enrollProbability; return enrollProbability;
} }
} }