From cbaff53b2c82cfaa7ad8cb22f5a33a1b7caecd7c Mon Sep 17 00:00:00 2001 From: czt <czt18638530771@163.com> Date: 星期四, 25 九月 2025 10:06:28 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/com/fzzy/api/view/pr/Api1109PR.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/fzzy/api/view/pr/Api1109PR.java b/src/main/java/com/fzzy/api/view/pr/Api1109PR.java index 252b6d0..f4d2885 100644 --- a/src/main/java/com/fzzy/api/view/pr/Api1109PR.java +++ b/src/main/java/com/fzzy/api/view/pr/Api1109PR.java @@ -87,12 +87,12 @@ predicates.add(predicate2); } if (null != param.getStart()) { - Predicate predicate3 = cb.greaterThan(root.<Date>get("qdrq"), ContextUtil.getCurZero(param.getStart())); + Predicate predicate3 = cb.greaterThan(root.<Date>get("zhgxsj"), ContextUtil.getCurZero(param.getStart())); predicates.add(predicate3); } if (null != param.getEnd()) { - Predicate predicate4 = cb.lessThan(root.<Date>get("qdrq"), ContextUtil.getNextZero(param.getEnd())); + Predicate predicate4 = cb.lessThan(root.<Date>get("zhgxsj"), ContextUtil.getNextZero(param.getEnd())); predicates.add(predicate4); } return cb.and(predicates.toArray(new Predicate[0])); -- Gitblit v1.9.3