瀏覽代碼

大题得分改为大于等于和小于等于

ting.yin 4 年之前
父節點
當前提交
4e0c05b742

+ 6 - 6
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/SubjectiveScoreServiceImpl.java

@@ -81,20 +81,20 @@ public class SubjectiveScoreServiceImpl extends BaseQueryService<SubjectiveScore
                 // predicates.add(predicate);
                 // predicates.add(predicate);
                 // }
                 // }
                 if (query.getMainStartScore() != null) {
                 if (query.getMainStartScore() != null) {
-                    Predicate predicate = cb
-                            .greaterThan(root.get("mainScore").as(Double.class), query.getMainStartScore());
+                    Predicate predicate = cb.greaterThanOrEqualTo(root.get("mainScore").as(Double.class),
+                            query.getMainStartScore());
                     predicates.add(predicate);
                     predicates.add(predicate);
                 }
                 }
                 if (query.getMainEndScore() != null) {
                 if (query.getMainEndScore() != null) {
-                    Predicate predicate = cb.lessThan(root.get("mainScore").as(Double.class), query.getMainEndScore());
+                    Predicate predicate = cb.lessThanOrEqualTo(root.get("mainScore").as(Double.class),
+                            query.getMainEndScore());
                     predicates.add(predicate);
                     predicates.add(predicate);
                 }
                 }
                 if (query.getScore() != null) {
                 if (query.getScore() != null) {
                     predicates.add(cb.equal(root.get("score"), query.getScore()));
                     predicates.add(cb.equal(root.get("score"), query.getScore()));
                 }
                 }
-                return predicates.isEmpty() ?
-                        cb.conjunction() :
-                        cb.and(predicates.toArray(new Predicate[predicates.size()]));
+                return predicates.isEmpty() ? cb.conjunction() : cb.and(predicates.toArray(new Predicate[predicates
+                        .size()]));
             }
             }
         };
         };
     }
     }