From b7015fb177c17e8a958c1b336da0a72fde7734ff Mon Sep 17 00:00:00 2001 From: han0 Date: Tue, 19 Dec 2023 19:37:29 +0800 Subject: [PATCH] =?UTF-8?q?fix(service):=20=E4=BF=AE=E5=A4=8D=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/mjkf/xinke/main/service/AsphaltDomesticService.java | 3 ++- .../java/mjkf/xinke/main/service/AsphaltImportedService.java | 3 ++- src/main/java/mjkf/xinke/main/service/CementService.java | 3 ++- src/main/java/mjkf/xinke/main/service/FujianSurveyService.java | 3 ++- .../mjkf/xinke/main/service/FuzhouHighwayBureauService.java | 3 ++- .../xinke/main/service/FuzhouTransportationBureauService.java | 3 ++- src/main/java/mjkf/xinke/main/service/SanmingSteelService.java | 3 ++- src/main/java/mjkf/xinke/main/service/SteelPlateService.java | 3 ++- src/main/java/mjkf/xinke/main/service/SteelRebarService.java | 3 ++- src/main/java/mjkf/xinke/main/service/SteelSectionService.java | 3 ++- src/main/java/mjkf/xinke/main/service/SteelStrandService.java | 3 ++- 11 files changed, 22 insertions(+), 11 deletions(-) diff --git a/src/main/java/mjkf/xinke/main/service/AsphaltDomesticService.java b/src/main/java/mjkf/xinke/main/service/AsphaltDomesticService.java index 68f2a94..80265ea 100644 --- a/src/main/java/mjkf/xinke/main/service/AsphaltDomesticService.java +++ b/src/main/java/mjkf/xinke/main/service/AsphaltDomesticService.java @@ -23,7 +23,8 @@ public class AsphaltDomesticService extends DataService query = new LambdaQueryWrapper<>(); query.eq(AsphaltDomestic::getName, data.getName()); - query.between(AsphaltDomestic::getDate, LocalDate.of(year, month, 1), LocalDate.of(year, month + 1, 1)); + var date = LocalDate.of(year, month, 1); + query.between(AsphaltDomestic::getDate, date, date.minusMonths(1)); return query; } diff --git a/src/main/java/mjkf/xinke/main/service/AsphaltImportedService.java b/src/main/java/mjkf/xinke/main/service/AsphaltImportedService.java index 56b0e4f..6de2c78 100644 --- a/src/main/java/mjkf/xinke/main/service/AsphaltImportedService.java +++ b/src/main/java/mjkf/xinke/main/service/AsphaltImportedService.java @@ -23,7 +23,8 @@ public class AsphaltImportedService extends DataService query = new LambdaQueryWrapper<>(); query.eq(AsphaltImported::getName, data.getName()); - query.between(AsphaltImported::getDate, LocalDate.of(year, month, 1), LocalDate.of(year, month + 1, 1)); + var date = LocalDate.of(year, month, 1); + query.between(AsphaltImported::getDate, date, date.minusMonths(1)); return query; } diff --git a/src/main/java/mjkf/xinke/main/service/CementService.java b/src/main/java/mjkf/xinke/main/service/CementService.java index fea6932..7bb79cb 100644 --- a/src/main/java/mjkf/xinke/main/service/CementService.java +++ b/src/main/java/mjkf/xinke/main/service/CementService.java @@ -29,7 +29,8 @@ public class CementService extends DataService, Cement> { query.eq(Cement::getSpec, data.getSpec()); query.eq(Cement::getPack, data.getPack()); query.eq(Cement::getSource, data.getSource()); - query.between(Cement::getDate, LocalDate.of(year, month, 1), LocalDate.of(year, month + 1, 1)); + var date = LocalDate.of(year, month, 1); + query.between(Cement::getDate, date, date.minusMonths(1)); 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 7c1f883..9c57ba8 100644 --- a/src/main/java/mjkf/xinke/main/service/FujianSurveyService.java +++ b/src/main/java/mjkf/xinke/main/service/FujianSurveyService.java @@ -23,7 +23,8 @@ public class FujianSurveyService extends DataService, F LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(FujianSurvey::getName, data.getName()); query.eq(FujianSurvey::getSpec, data.getSpec()); - query.between(FujianSurvey::getDate, LocalDate.of(year, month, 1), LocalDate.of(year, month + 1, 1)); + var date = LocalDate.of(year, month, 1); + query.between(FujianSurvey::getDate, date, date.minusMonths(1)); 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 6a253f2..1945ac0 100644 --- a/src/main/java/mjkf/xinke/main/service/FuzhouHighwayBureauService.java +++ b/src/main/java/mjkf/xinke/main/service/FuzhouHighwayBureauService.java @@ -24,7 +24,8 @@ public class FuzhouHighwayBureauService extends DataService query = new LambdaQueryWrapper<>(); query.eq(FuzhouHighwayBureau::getName, data.getName()); query.eq(FuzhouHighwayBureau::getSpec, data.getSpec()); - query.between(FuzhouHighwayBureau::getDate, LocalDate.of(year, month, 1), LocalDate.of(year, month + 1, 1)); + var date = LocalDate.of(year, month, 1); + query.between(FuzhouHighwayBureau::getDate, date, date.minusMonths(1)); return query; } diff --git a/src/main/java/mjkf/xinke/main/service/FuzhouTransportationBureauService.java b/src/main/java/mjkf/xinke/main/service/FuzhouTransportationBureauService.java index e7c5dd6..d63a65d 100644 --- a/src/main/java/mjkf/xinke/main/service/FuzhouTransportationBureauService.java +++ b/src/main/java/mjkf/xinke/main/service/FuzhouTransportationBureauService.java @@ -25,7 +25,8 @@ public class FuzhouTransportationBureauService extends DataService query = new LambdaQueryWrapper<>(); query.eq(FuzhouTransportationBureau::getName, data.getName()); query.eq(FuzhouTransportationBureau::getSpec, data.getSpec()); - query.between(FuzhouTransportationBureau::getDate, LocalDate.of(year, month, 1), LocalDate.of(year, month + 1, 1)); + var date = LocalDate.of(year, month, 1); + query.between(FuzhouTransportationBureau::getDate, date, date.minusMonths(1)); 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 1c54883..c0b11f0 100644 --- a/src/main/java/mjkf/xinke/main/service/SanmingSteelService.java +++ b/src/main/java/mjkf/xinke/main/service/SanmingSteelService.java @@ -25,7 +25,8 @@ public class SanmingSteelService extends DataService, S query.eq(SanmingSteel::getName, data.getName()); query.eq(SanmingSteel::getSpec, data.getSpec()); query.eq(SanmingSteel::getMaterial, data.getMaterial()); - query.between(SanmingSteel::getDate, LocalDate.of(year, month, 1), LocalDate.of(year, month + 1, 1)); + var date = LocalDate.of(year, month, 1); + query.between(SanmingSteel::getDate, date, date.minusMonths(1)); return query; } diff --git a/src/main/java/mjkf/xinke/main/service/SteelPlateService.java b/src/main/java/mjkf/xinke/main/service/SteelPlateService.java index 07fd52e..6e1373c 100644 --- a/src/main/java/mjkf/xinke/main/service/SteelPlateService.java +++ b/src/main/java/mjkf/xinke/main/service/SteelPlateService.java @@ -32,7 +32,8 @@ public class SteelPlateService extends DataService, Steel query.eq(SteelPlate::getSpec, data.getSpec()); query.eq(SteelPlate::getMaterial, data.getMaterial()); query.eq(SteelPlate::getSource, data.getSource()); - query.between(SteelPlate::getDate, LocalDate.of(year, month, 1), LocalDate.of(year, month + 1, 1)); + var date = LocalDate.of(year, month, 1); + query.between(SteelPlate::getDate, date, date.minusMonths(1)); return query; } diff --git a/src/main/java/mjkf/xinke/main/service/SteelRebarService.java b/src/main/java/mjkf/xinke/main/service/SteelRebarService.java index f19edab..e764a07 100644 --- a/src/main/java/mjkf/xinke/main/service/SteelRebarService.java +++ b/src/main/java/mjkf/xinke/main/service/SteelRebarService.java @@ -29,7 +29,8 @@ public class SteelRebarService extends DataService, Steel query.eq(SteelRebar::getSpec, data.getSpec()); query.eq(SteelRebar::getMaterial, data.getMaterial()); query.eq(SteelRebar::getSource, data.getSource()); - query.between(SteelRebar::getDate, LocalDate.of(year, month, 1), LocalDate.of(year, month + 1, 1)); + var date = LocalDate.of(year, month, 1); + query.between(SteelRebar::getDate, date, date.minusMonths(1)); return query; } diff --git a/src/main/java/mjkf/xinke/main/service/SteelSectionService.java b/src/main/java/mjkf/xinke/main/service/SteelSectionService.java index facab61..d29eaf4 100644 --- a/src/main/java/mjkf/xinke/main/service/SteelSectionService.java +++ b/src/main/java/mjkf/xinke/main/service/SteelSectionService.java @@ -30,7 +30,8 @@ public class SteelSectionService extends DataService, S query.eq(SteelSection::getSpec, data.getSpec()); query.eq(SteelSection::getMaterial, data.getMaterial()); query.eq(SteelSection::getSource, data.getSource()); - query.between(SteelSection::getDate, LocalDate.of(year, month, 1), LocalDate.of(year, month + 1, 1)); + var date = LocalDate.of(year, month, 1); + query.between(SteelSection::getDate, date, date.minusMonths(1)); return query; } diff --git a/src/main/java/mjkf/xinke/main/service/SteelStrandService.java b/src/main/java/mjkf/xinke/main/service/SteelStrandService.java index f0b5b4f..df79f7b 100644 --- a/src/main/java/mjkf/xinke/main/service/SteelStrandService.java +++ b/src/main/java/mjkf/xinke/main/service/SteelStrandService.java @@ -30,7 +30,8 @@ public class SteelStrandService extends DataService, Ste query.eq(SteelStrand::getSpec, data.getSpec()); query.eq(SteelStrand::getMaterial, data.getMaterial()); query.eq(SteelStrand::getSource, data.getSource()); - query.between(SteelStrand::getDate, LocalDate.of(year, month, 1), LocalDate.of(year, month + 1, 1)); + var date = LocalDate.of(year, month, 1); + query.between(SteelStrand::getDate, date, date.minusMonths(1)); return query; }