From 92a38a3e65e49798e2d3c88c4e6bee32af77a3d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <8153694@qq.com>
Date: Mon, 17 Jul 2023 16:49:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=8A=A8=E8=80=83?=
=?UTF-8?q?=E6=A0=B8=E5=90=8E=E7=BB=AD=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mortals/xhx/busiz/h5/web/FeedbackApiController.java | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/FeedbackApiController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/FeedbackApiController.java
index 4006b969..d073c16b 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/FeedbackApiController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/FeedbackApiController.java
@@ -85,6 +85,8 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq> {
}else{
FeedbackQuery feedbackQuery = new FeedbackQuery();
feedbackQuery.setIdList(feedbackIdList);
+ feedbackQuery.setCreateTimeStart(feedbackReq.getFeedBackStartDate());
+ feedbackQuery.setCreateTimeEnd(feedbackReq.getFeedBackEndDate());
Result<FeedbackEntity> result = feedbackService.find(feedbackQuery, pageAllInfo, null);
model.put(PAGEINFO_KEY, result.getPageInfo());
model.put(KEY_RESULT_DATA, result.getList());
@@ -102,6 +104,10 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq> {
List<Long> unFeedbackList = feedbackStaffService.find(feedbackStaffQuery).stream().map(i -> i.getFeedbackId()).distinct().collect(Collectors.toList());
FeedbackQuery feedbackQuery = new FeedbackQuery();
feedbackQuery.setIdList(unFeedbackList);
+
+ feedbackQuery.setCreateTimeStart(feedbackReq.getFeedBackStartDate());
+ feedbackQuery.setCreateTimeEnd(feedbackReq.getFeedBackEndDate());
+
Result<FeedbackEntity> result = feedbackService.find(feedbackQuery, pageAllInfo, null);
model.put(PAGEINFO_KEY, result.getPageInfo());
@@ -115,6 +121,8 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq> {
List<Long> unfinFeedbackList = feedbackStaffService.find(feedbackStaffQuery).stream().map(i -> i.getFeedbackId()).distinct().collect(Collectors.toList());
FeedbackQuery feedbackQuery = new FeedbackQuery();
feedbackQuery.setIdList(unfinFeedbackList);
+ feedbackQuery.setCreateTimeStart(feedbackReq.getFeedBackStartDate());
+ feedbackQuery.setCreateTimeEnd(feedbackReq.getFeedBackEndDate());
Result<FeedbackEntity> result = feedbackService.find(feedbackQuery, pageAllInfo, null);
model.put(PAGEINFO_KEY, result.getPageInfo());
model.put(KEY_RESULT_DATA, result.getList());
--
2.24.3