Browse Source

小优化

xiaochan 11 months ago
parent
commit
3e78fade6a

+ 7 - 0
src/main/java/thyyxxk/webserver/entity/archive/PatientArchive.java

@@ -98,6 +98,13 @@ public class PatientArchive implements Serializable {
     @TableField(value = "sort")
     private Integer sort;
 
+    public Integer getSortNull() {
+        if (sort == null) {
+            return Integer.MAX_VALUE;
+        }
+        return sort;
+    }
+
     /**
      * 一些其他信息
      */

+ 3 - 2
src/main/java/thyyxxk/webserver/service/archive/ArchiveServer.java

@@ -260,14 +260,15 @@ public class ArchiveServer {
             Object bean = SpringBeanUtil.getBean(parameter.getType());
             parameters[i] = bean;
         }
-
         return parameters;
     }
 
 
     public List<PatientArchive> getPatientArchives(String patNo, Integer times) {
         List<PatientArchive> array = patientArchiveDao.getPatientList(patNo, times);
-        return TreeUtil.objectTreeSort(array);
+        TreeUtil.Option defaultOption = TreeUtil.getDefaultOption();
+        defaultOption.setSort("sortNull");
+        return TreeUtil.objectTree(array, defaultOption);
     }
 
     public ResultVo<String> ArchiveRecovery(ArchiveRecovery data) {

+ 11 - 7
src/main/java/thyyxxk/webserver/utils/TreeUtil.java

@@ -117,13 +117,8 @@ public class TreeUtil {
     }
 
     public static <T> List<T> objectTreeSort(List<T> tempList) {
-        Option tOption = Option.builder()
-                .id("id")
-                .parentId("parentId")
-                .children("children")
-                .sort("sort")
-                .build();
-        return objectTree(tempList, tOption, null);
+        Option defaultOption = getDefaultOption();
+        return objectTree(tempList, defaultOption, null);
     }
 
     public static <T> List<T> objectTree(List<T> tempList, String id, String parentId, TowFunction<T, T> addCallback) {
@@ -135,5 +130,14 @@ public class TreeUtil {
         return objectTree(tempList, tOption, addCallback);
     }
 
+    public static Option getDefaultOption() {
+        return Option.builder()
+                .id("id")
+                .parentId("parentId")
+                .children("children")
+                .sort("sort")
+                .build();
+    }
+
 
 }