添加窗口编码

attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowPerformServiceImpl.java

@@ -24,10 +24,7 @@ import com.mortals.xhx.module.window.service.WindowPerformService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.ObjectUtils;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -114,7 +111,7 @@ public class WindowPerformServiceImpl extends AbstractCRUDServiceImpl<WindowPerf
 
     @Override
     public Rest<List<WindowPerformAllVo>> getAllList(WindowPerformQuery query, Context context) {
-        ArrayList<WindowPerformAllVo> allList = new ArrayList<>();
+        List<WindowPerformAllVo> allList = new ArrayList<>();
         query.setOwnerId(context.getUser().getCustomerId());
         List<WindowPerformEntity> windowPerformEntities = this.find(query, context);
         if (!ObjectUtils.isEmpty(windowPerformEntities)) {
@@ -146,6 +143,10 @@ public class WindowPerformServiceImpl extends AbstractCRUDServiceImpl<WindowPerf
             }).collect(Collectors.toList());
             allList.addAll(collect);
         }
+
+       allList = allList.stream().sorted(Comparator.comparing(WindowPerformAllVo::getFillDate)).collect(Collectors.toList());
+
+
         return Rest.ok(allList);
     }
 }
\ No newline at end of file