feat: 更新采集结果趋势获取

src/main/java/mjkf/xinke/main/service/AsphaltModifierService.java

@@ -23,7 +23,8 @@ public class AsphaltModifierService extends DataService<BaseMapper<AsphaltModifi
         LambdaQueryWrapper<AsphaltModifier> query = new LambdaQueryWrapper<>();
         query.eq(AsphaltModifier::getName, data.getName());
         var date = LocalDate.of(year, month, 1);
-        query.between(AsphaltModifier::getDate, date,date.plusMonths(1));
+        query.between(AsphaltModifier::getDate, date.minusYears(1), date.plusMonths(1));
+        query.orderByAsc(AsphaltModifier::getDate);
         return query;
     }
 

src/main/java/mjkf/xinke/main/service/DataNetworkService.java

@@ -2,6 +2,7 @@ package mjkf.xinke.main.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import mjkf.xinke.main.constant.MaterialTaskType;
+import mjkf.xinke.main.model.db.AsphaltModifier;
 import mjkf.xinke.main.model.db.DataNetwork;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Service;
@@ -58,8 +59,10 @@ public class DataNetworkService extends DataService<BaseMapper<DataNetwork>, Dat
         var data = (DataNetwork) obj;
         LambdaQueryWrapper<DataNetwork> query = new LambdaQueryWrapper<>();
         query.eq(DataNetwork::getName, data.getName());
+        query.eq(DataNetwork::getSpec, data.getSpec());
         var date = LocalDate.of(year, month, 1);
         query.between(DataNetwork::getDate, date.minusYears(1), date.plusMonths(1));
+        query.orderByAsc(DataNetwork::getDate);
         return query;
     }
 }

src/main/java/mjkf/xinke/main/service/FujianSurveyService.java

@@ -28,6 +28,7 @@ public class FujianSurveyService extends DataService<BaseMapper<FujianSurvey>, F
         query.eq(FujianSurvey::getSpec, data.getSpec());
         var date = LocalDate.of(year, month, 1);
         query.between(FujianSurvey::getDate, date.minusYears(1), date.plusMonths(1));
+        query.orderByAsc(FujianSurvey::getDate);
         return query;
     }
 

src/main/java/mjkf/xinke/main/service/FuzhouHighwayBureauService.java

@@ -29,6 +29,7 @@ public class FuzhouHighwayBureauService extends DataService<BaseMapper<FuzhouHig
         query.eq(FuzhouHighwayBureau::getSpec, data.getSpec());
         var date = LocalDate.of(year, month, 1);
         query.between(FuzhouHighwayBureau::getDate, date.minusYears(1), date.plusMonths(1));
+        query.orderByAsc(FuzhouHighwayBureau::getDate);
         return query;
     }
 

src/main/java/mjkf/xinke/main/service/FuzhouTransportationBureauService.java

@@ -30,6 +30,7 @@ public class FuzhouTransportationBureauService extends DataService<BaseMapper<Fu
         query.eq(FuzhouTransportationBureau::getSpec, data.getSpec());
         var date = LocalDate.of(year, month, 1);
         query.between(FuzhouTransportationBureau::getDate, date.minusYears(1), date.plusMonths(1));
+        query.orderByAsc(FuzhouTransportationBureau::getDate);
         return query;
     }
 

src/main/java/mjkf/xinke/main/service/LocalMaterialService.java

@@ -47,8 +47,11 @@ public class LocalMaterialService extends DataService<BaseMapper<LocalMaterial>,
         var data = (LocalMaterial) obj;
         LambdaQueryWrapper<LocalMaterial> query = new LambdaQueryWrapper<>();
         query.eq(LocalMaterial::getName, data.getName());
+        query.eq(LocalMaterial::getSpec, data.getSpec());
+        query.eq(LocalMaterial::getCounty, data.getCounty());
         var date = LocalDate.of(year, month, 1);
-        query.between(LocalMaterial::getDate, date,date.plusMonths(1));
+        query.between(LocalMaterial::getDate, date.minusYears(1), date.plusMonths(1));
+        query.orderByAsc(LocalMaterial::getDate);
         return query;
     }
 

src/main/java/mjkf/xinke/main/service/SanmingSteelService.java

@@ -27,6 +27,7 @@ public class SanmingSteelService extends DataService<BaseMapper<SanmingSteel>, S
         query.eq(SanmingSteel::getMaterial, data.getMaterial());
         var date = LocalDate.of(year, month, 1);
         query.between(SanmingSteel::getDate, date.minusYears(1), date.plusMonths(1));
+        query.orderByAsc(SanmingSteel::getDate);
         return query;
     }