修改自动考核后续服务

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/FeedbackApiController.java

@@ -72,9 +72,7 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq> {
                 feedbackReq.setFeedBackStartDate(DateUtil.beginOfMonth(DateUtil.parse(feedbackReq.getFeedBackStartDate()).toJdkDate()).toDateStr());
                 feedbackReq.setFeedBackEndDate(DateUtil.endOfMonth(DateUtil.parse(feedbackReq.getFeedBackStartDate()).toJdkDate()).toDateStr());
             }
-            //PageInfo pageInfo = buildPageInfo(feedbackReq);
             PageInfo pageAllInfo = buildPageInfo(feedbackReq);
-
             if (YesNoEnum.YES.getValue() == feedbackReq.getFeedbackStatus()) {
                 //已反馈
                 //查询我已经回答过的
@@ -97,19 +95,31 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq> {
                 //查询我的反馈 但是还未回答的
                 List<Long> feedbackIdList = answerService.find(new FeedbackAnswerQuery().staffId(context.getUser().getCustomerId())).stream().map(i -> i.getFeedbackId()).distinct().collect(Collectors.toList());
 
-                FeedbackStaffQuery feedbackStaffQuery = new FeedbackStaffQuery();
-                feedbackStaffQuery.setFeedbackIdNotList(feedbackIdList);
-                feedbackStaffQuery.setStaffId(context.getUser().getCustomerId());
-
-                List<Long> unfinFeedbackList = feedbackStaffService.find(feedbackStaffQuery).stream().map(i -> i.getFeedbackId()).distinct().collect(Collectors.toList());
-                FeedbackQuery feedbackQuery = new FeedbackQuery();
-                feedbackQuery.setIdList(unfinFeedbackList);
-                Result<FeedbackEntity> result = feedbackService.find(feedbackQuery, pageAllInfo, null);
-
-
-                model.put(PAGEINFO_KEY, result.getPageInfo());
-                model.put(KEY_RESULT_DATA, result.getList());
-                parsePageInfo(model, result.getPageInfo());
+                if(ObjectUtils.isEmpty(feedbackIdList)){
+                    //全部未反馈
+                    FeedbackStaffQuery feedbackStaffQuery = new FeedbackStaffQuery();
+                    feedbackStaffQuery.setStaffId(context.getUser().getCustomerId());
+                    List<Long> unFeedbackList = feedbackStaffService.find(feedbackStaffQuery).stream().map(i -> i.getFeedbackId()).distinct().collect(Collectors.toList());
+                    FeedbackQuery feedbackQuery = new FeedbackQuery();
+                    feedbackQuery.setIdList(unFeedbackList);
+                    Result<FeedbackEntity> result = feedbackService.find(feedbackQuery, pageAllInfo, null);
+
+                    model.put(PAGEINFO_KEY, result.getPageInfo());
+                    model.put(KEY_RESULT_DATA, result.getList());
+                    parsePageInfo(model, result.getPageInfo());
+                }else{
+                    FeedbackStaffQuery feedbackStaffQuery = new FeedbackStaffQuery();
+                    feedbackStaffQuery.setFeedbackIdNotList(feedbackIdList);
+                    feedbackStaffQuery.setStaffId(context.getUser().getCustomerId());
+
+                    List<Long> unfinFeedbackList = feedbackStaffService.find(feedbackStaffQuery).stream().map(i -> i.getFeedbackId()).distinct().collect(Collectors.toList());
+                    FeedbackQuery feedbackQuery = new FeedbackQuery();
+                    feedbackQuery.setIdList(unfinFeedbackList);
+                    Result<FeedbackEntity> result = feedbackService.find(feedbackQuery, pageAllInfo, null);
+                    model.put(PAGEINFO_KEY, result.getPageInfo());
+                    model.put(KEY_RESULT_DATA, result.getList());
+                    parsePageInfo(model, result.getPageInfo());
+                }
             }
             rest.setData(model);
             recordSysLog(request, busiDesc + " 【成功】");