Administrator 1 år sedan
förälder
incheckning
f841ef8a06

+ 9 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/score/ScoreDataServiceImpl.java

@@ -167,6 +167,15 @@ public class ScoreDataServiceImpl implements IScoreDataService {
     private LambdaQueryWrapper<ScoreData> buildQueryWrapper(ScoreDataBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ScoreData> lqw = Wrappers.lambdaQuery();
+        String scoreType = bo.getScoreType();
+        if (StringUtils.isNotBlank(scoreType) && "5".equals(scoreType)){
+            //说明是统计查询成绩列表的全部 = score_type != 4
+            lqw.ne(ScoreData::getScoreTitle,"4");
+        }
+        if (StringUtils.isNotBlank(scoreType) && !"5".equals(scoreType)){
+            //说明是统计查询成绩列表的全部 = score_type != 4
+            lqw.eq(ScoreData::getScoreTitle,scoreType);
+        }
         lqw.eq(StringUtils.isNotBlank(bo.getScoreTitle()), ScoreData::getScoreTitle, bo.getScoreTitle());
         lqw.eq(bo.getScoreTime() != null, ScoreData::getScoreTime, bo.getScoreTime());
         lqw.like(StringUtils.isNotBlank(bo.getScoreClassName()), ScoreData::getScoreClassName, bo.getScoreClassName());