From 55b527934acf568d6f8166df207b5eb420b89c85 Mon Sep 17 00:00:00 2001 From: han0 Date: Thu, 11 Jul 2024 10:00:59 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E9=87=87=E9=9B=86?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E8=B6=8B=E5=8A=BF=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/mjkf/xinke/main/service/AsphaltModifierService.java | 3 ++- .../java/mjkf/xinke/main/service/DataNetworkService.java | 3 +++ .../java/mjkf/xinke/main/service/FujianSurveyService.java | 1 + .../mjkf/xinke/main/service/FuzhouHighwayBureauService.java | 1 + .../main/service/FuzhouTransportationBureauService.java | 1 + .../java/mjkf/xinke/main/service/LocalMaterialService.java | 5 ++++- .../java/mjkf/xinke/main/service/SanmingSteelService.java | 1 + 7 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/mjkf/xinke/main/service/AsphaltModifierService.java b/src/main/java/mjkf/xinke/main/service/AsphaltModifierService.java index 5a87615..2c51309 100644 --- a/src/main/java/mjkf/xinke/main/service/AsphaltModifierService.java +++ b/src/main/java/mjkf/xinke/main/service/AsphaltModifierService.java @@ -23,7 +23,8 @@ public class AsphaltModifierService extends DataService 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; } diff --git a/src/main/java/mjkf/xinke/main/service/DataNetworkService.java b/src/main/java/mjkf/xinke/main/service/DataNetworkService.java index 51dda22..8e230dc 100644 --- a/src/main/java/mjkf/xinke/main/service/DataNetworkService.java +++ b/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, Dat var data = (DataNetwork) obj; LambdaQueryWrapper 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; } } diff --git a/src/main/java/mjkf/xinke/main/service/FujianSurveyService.java b/src/main/java/mjkf/xinke/main/service/FujianSurveyService.java index aebeaa6..0d5bea7 100644 --- a/src/main/java/mjkf/xinke/main/service/FujianSurveyService.java +++ b/src/main/java/mjkf/xinke/main/service/FujianSurveyService.java @@ -28,6 +28,7 @@ public class FujianSurveyService extends DataService, 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; } diff --git a/src/main/java/mjkf/xinke/main/service/FuzhouHighwayBureauService.java b/src/main/java/mjkf/xinke/main/service/FuzhouHighwayBureauService.java index 79bd069..92de1bf 100644 --- a/src/main/java/mjkf/xinke/main/service/FuzhouHighwayBureauService.java +++ b/src/main/java/mjkf/xinke/main/service/FuzhouHighwayBureauService.java @@ -29,6 +29,7 @@ public class FuzhouHighwayBureauService extends DataService, var data = (LocalMaterial) obj; LambdaQueryWrapper 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; } diff --git a/src/main/java/mjkf/xinke/main/service/SanmingSteelService.java b/src/main/java/mjkf/xinke/main/service/SanmingSteelService.java index 9e70015..3d87c5f 100644 --- a/src/main/java/mjkf/xinke/main/service/SanmingSteelService.java +++ b/src/main/java/mjkf/xinke/main/service/SanmingSteelService.java @@ -27,6 +27,7 @@ public class SanmingSteelService extends DataService, 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; }