Skip to content

A
attendance-performance-platform
Commit 92a38a3e authored by 赵啸非's avatar 赵啸非
Browse files
Options

修改自动考核后续服务

parent 26c7cd1f
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/FeedbackApiController.java
View file @ 92a38a3e
...@@ -85,6 +85,8 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq> { ...@@ -85,6 +85,8 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq> {
}else{ }else{
FeedbackQuery feedbackQuery = new FeedbackQuery(); FeedbackQuery feedbackQuery = new FeedbackQuery();
feedbackQuery.setIdList(feedbackIdList); feedbackQuery.setIdList(feedbackIdList);
feedbackQuery.setCreateTimeStart(feedbackReq.getFeedBackStartDate());
feedbackQuery.setCreateTimeEnd(feedbackReq.getFeedBackEndDate());
Result<FeedbackEntity> result = feedbackService.find(feedbackQuery, pageAllInfo, null); Result<FeedbackEntity> result = feedbackService.find(feedbackQuery, pageAllInfo, null);
model.put(PAGEINFO_KEY, result.getPageInfo()); model.put(PAGEINFO_KEY, result.getPageInfo());
model.put(KEY_RESULT_DATA, result.getList()); model.put(KEY_RESULT_DATA, result.getList());
...@@ -102,6 +104,10 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq> { ...@@ -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()); List<Long> unFeedbackList = feedbackStaffService.find(feedbackStaffQuery).stream().map(i -> i.getFeedbackId()).distinct().collect(Collectors.toList());
FeedbackQuery feedbackQuery = new FeedbackQuery(); FeedbackQuery feedbackQuery = new FeedbackQuery();
feedbackQuery.setIdList(unFeedbackList); feedbackQuery.setIdList(unFeedbackList);
feedbackQuery.setCreateTimeStart(feedbackReq.getFeedBackStartDate());
feedbackQuery.setCreateTimeEnd(feedbackReq.getFeedBackEndDate());
Result<FeedbackEntity> result = feedbackService.find(feedbackQuery, pageAllInfo, null); Result<FeedbackEntity> result = feedbackService.find(feedbackQuery, pageAllInfo, null);
model.put(PAGEINFO_KEY, result.getPageInfo()); model.put(PAGEINFO_KEY, result.getPageInfo());
...@@ -115,6 +121,8 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq> { ...@@ -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()); List<Long> unfinFeedbackList = feedbackStaffService.find(feedbackStaffQuery).stream().map(i -> i.getFeedbackId()).distinct().collect(Collectors.toList());
FeedbackQuery feedbackQuery = new FeedbackQuery(); FeedbackQuery feedbackQuery = new FeedbackQuery();
feedbackQuery.setIdList(unfinFeedbackList); feedbackQuery.setIdList(unfinFeedbackList);
feedbackQuery.setCreateTimeStart(feedbackReq.getFeedBackStartDate());
feedbackQuery.setCreateTimeEnd(feedbackReq.getFeedBackEndDate());
Result<FeedbackEntity> result = feedbackService.find(feedbackQuery, pageAllInfo, null); Result<FeedbackEntity> result = feedbackService.find(feedbackQuery, pageAllInfo, null);
model.put(PAGEINFO_KEY, result.getPageInfo()); model.put(PAGEINFO_KEY, result.getPageInfo());
model.put(KEY_RESULT_DATA, result.getList()); model.put(KEY_RESULT_DATA, result.getList());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment