修改考勤汇总

attendance-performance-manager-ui/admin/src/views/feedback/list.vue

@@ -93,14 +93,14 @@ export default {
                         label: "状态", prop: "processStatus", formatter: (row) => {
 
                           let str="未开始"
-                          if(row.processStatus===1){
+                          if(row.processStatus==1){
                             str="进行中"
-                          }else if (row.processStatus===2){
+                          }else if (row.processStatus==2){
                             str="已结束"
                           }
                             return (
-                                <el-tag size="small">
-                                  {{str}}
+                                <el-tag type={row.processStatus ? row.processStatus == 2 ? 'success' : 'info' : 'danger'} size="small">
+                                  {str}
                                 </el-tag>
                             )
                         }

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

@@ -40,26 +40,35 @@ public class FeedbackServiceImpl extends AbstractCRUDServiceImpl<FeedbackDao, Fe
     private FeedbackStaffService feedbackStaffService;
 
 
+    @Override
+    protected void findAfter(FeedbackEntity params, PageInfo pageInfo, Context context, List<FeedbackEntity> list) throws AppException {
+        updateProcessStatus(list);
+    }
+
     @Override
     protected void findAfter(FeedbackEntity entity, Context context, List<FeedbackEntity> list) throws AppException {
-      list.stream().forEach(item->{
-          Date feedbackTimeStart = item.getFeedbackTimeStart();
-          Date feedbackTimeEnd = item.getFeedbackTimeEnd();
+        updateProcessStatus(list);
+    }
 
-          if(DateUtil.compare(new Date(),feedbackTimeStart)<0){
-             item.setProcessStatus(0);
-          }
+    private static void updateProcessStatus(List<FeedbackEntity> list) {
+        list.stream().forEach(item->{
+            Date feedbackTimeStart = item.getFeedbackTimeStart();
+            Date feedbackTimeEnd = item.getFeedbackTimeEnd();
 
-          boolean in = DateUtil.isIn(new Date(), item.getFeedbackTimeStart(), item.getFeedbackTimeEnd());
-          if(in){
-              item.setProcessStatus(1);
-          }
+            if(DateUtil.compare(new Date(),feedbackTimeStart)<0){
+               item.setProcessStatus(0);
+            }
+
+            boolean in = DateUtil.isIn(new Date(), item.getFeedbackTimeStart(), item.getFeedbackTimeEnd());
+            if(in){
+                item.setProcessStatus(1);
+            }
 
-          if(DateUtil.compare(new Date(),feedbackTimeEnd)>0){
-              item.setProcessStatus(2);
-          }
+            if(DateUtil.compare(new Date(),feedbackTimeEnd)>0){
+                item.setProcessStatus(2);
+            }
 
-      });
+        });
     }
 
     @Override