|
@@ -85,10 +85,7 @@ import java.io.FileInputStream;
|
|
import java.io.IOException;
|
|
import java.io.IOException;
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
import java.time.LocalDateTime;
|
|
import java.time.LocalDateTime;
|
|
-import java.util.ArrayList;
|
|
|
|
-import java.util.Collections;
|
|
|
|
-import java.util.Date;
|
|
|
|
-import java.util.List;
|
|
|
|
|
|
+import java.util.*;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -1195,6 +1192,12 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
|
|
});
|
|
});
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ Collections.sort(voList, new Comparator<SbInfoVO>() {
|
|
|
|
+ @Override
|
|
|
|
+ public int compare(SbInfoVO o1, SbInfoVO o2) {
|
|
|
|
+ return o1.getNo().compareTo(o2.getNo());
|
|
|
|
+ }
|
|
|
|
+ });
|
|
return voList;
|
|
return voList;
|
|
}
|
|
}
|
|
|
|
|