sss

src/main/java/com/sysu/admin/controller/lz/everyday/LzEveryday.java

@@ -44,10 +44,10 @@ public class LzEveryday {
     private Double whitePoint;
 
     /**
-     * 花穗长度 单位厘米
+     * 花穗长度 百分比
      */
     @Column
-    private Integer flowerLength;
+    private Double flowerLength;
 
     /**
      * 花穗占比

src/main/java/com/sysu/admin/controller/lz/everyday/LzEverydayExcel.java

@@ -13,7 +13,7 @@ public class LzEverydayExcel {
     @ExcelProperty(value = "物候期",index = 1)
     private Integer period_id;
     @ExcelProperty(value = "花穗长度",index = 2)
-    private Integer flowerLength;
+    private Double flowerLength;
     @ExcelProperty(value = "花穗占比",index = 3)
     private Double flowerPercent;
     @ExcelProperty(value = "白点数",index = 4)

src/main/java/com/sysu/admin/controller/lz/everyday/LzEverydayRepository.java

@@ -9,6 +9,6 @@ import java.util.List;
 
 public interface LzEverydayRepository extends JpaPlusRepository<LzEveryday, Integer> {
 
-    List<LzEveryday> findAllByTreeIdAndCreateDateBetween(Integer treeId, Date start, Date end);
+    List<LzEveryday> findAllByTreeIdAndCreateDateBetweenOrderByIdAsc(Integer treeId, Date start, Date end);
 
 }

src/main/java/com/sysu/admin/controller/lz/everyday/LzEverydayService.java

@@ -20,7 +20,7 @@ public class LzEverydayService extends BaseService<LzEveryday, Integer> {
 
 
     public List<LzEveryday> findListByTreeId(Integer treeId, Date startDate , Date endDate){
-        List<LzEveryday> lzEverydayList = lzEverydayRepository.findAllByTreeIdAndCreateDateBetween(treeId, startDate, endDate);
+        List<LzEveryday> lzEverydayList = lzEverydayRepository.findAllByTreeIdAndCreateDateBetweenOrderByIdAsc(treeId, startDate, endDate);
         lzEverydayList.forEach(lzEveryday -> {
             lzEveryday.setLzEverydayImage(lzEverydayImgService.findAllByEverydayId(lzEveryday.getId()));
         });