Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/views/perform/effect/record/drawershow.vue

@@ -441,19 +441,19 @@ export default {
       sourceArr: [
         {
           label: "脱岗",
-          value: "1",
+          value: 1,
         },
         {
           label: "离岗",
-          value: "2",
+          value: 2,
         },
         {
           label: "玩手机",
-          value: "3",
+          value: 3,
         },
         {
           label: "睡觉",
-          value: "4",
+          value: 4,
         },
       ],
       form: {},

attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/service/impl/FeedbackServiceImpl.java

@@ -42,6 +42,11 @@ public class FeedbackServiceImpl extends AbstractCRUDServiceImpl<FeedbackDao, Fe
     @Autowired
     private FeedbackAnswerService feedbackAnswerService;
 
+    @Override
+    protected FeedbackEntity findBefore(FeedbackEntity params, PageInfo pageInfo, Context context) throws AppException {
+        params.setFeedbackTimeStartEnd(params.getFeedbackTimeStartStart());
+        return params;
+    }
 
     @Override
     protected void findAfter(FeedbackEntity params, PageInfo pageInfo, Context context, List<FeedbackEntity> list) throws AppException {