diff --git a/src/main/java/mjkf/xinke/main/service/AsphaltDomesticService.java b/src/main/java/mjkf/xinke/main/service/AsphaltDomesticService.java index 80265ea..d21710a 100644 --- a/src/main/java/mjkf/xinke/main/service/AsphaltDomesticService.java +++ b/src/main/java/mjkf/xinke/main/service/AsphaltDomesticService.java @@ -24,7 +24,7 @@ public class AsphaltDomesticService extends DataService query = new LambdaQueryWrapper<>(); query.eq(AsphaltDomestic::getName, data.getName()); var date = LocalDate.of(year, month, 1); - query.between(AsphaltDomestic::getDate, date, date.minusMonths(1)); + query.between(AsphaltDomestic::getDate, date,date.plusMonths(1)); return query; } @@ -42,10 +42,8 @@ public class AsphaltDomesticService extends DataService query = new LambdaQueryWrapper<>(); query.eq(AsphaltImported::getName, data.getName()); var date = LocalDate.of(year, month, 1); - query.between(AsphaltImported::getDate, date, date.minusMonths(1)); + query.between(AsphaltImported::getDate, date,date.plusMonths(1)); return query; } @@ -42,10 +42,8 @@ public class AsphaltImportedService extends DataService query = new LambdaQueryWrapper<>(); query.eq(AsphaltModifier::getName, data.getName()); var date = LocalDate.of(year, month, 1); - query.between(AsphaltModifier::getDate, date, date.minusMonths(1)); + query.between(AsphaltModifier::getDate, date,date.plusMonths(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 7bb79cb..a5dbac1 100644 --- a/src/main/java/mjkf/xinke/main/service/CementService.java +++ b/src/main/java/mjkf/xinke/main/service/CementService.java @@ -30,7 +30,7 @@ public class CementService extends DataService, Cement> { query.eq(Cement::getPack, data.getPack()); query.eq(Cement::getSource, data.getSource()); var date = LocalDate.of(year, month, 1); - query.between(Cement::getDate, date, date.minusMonths(1)); + query.between(Cement::getDate, date,date.plusMonths(1)); return query; } @@ -51,10 +51,8 @@ public class CementService extends DataService, Cement> { ); } if (month != null) { - 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.plusMonths(1)); } if (name != null) { query.like(Cement::getName, name); diff --git a/src/main/java/mjkf/xinke/main/service/FujianSurveyService.java b/src/main/java/mjkf/xinke/main/service/FujianSurveyService.java index 9c57ba8..409ff3b 100644 --- a/src/main/java/mjkf/xinke/main/service/FujianSurveyService.java +++ b/src/main/java/mjkf/xinke/main/service/FujianSurveyService.java @@ -24,7 +24,7 @@ public class FujianSurveyService extends DataService, F query.eq(FujianSurvey::getName, data.getName()); query.eq(FujianSurvey::getSpec, data.getSpec()); var date = LocalDate.of(year, month, 1); - query.between(FujianSurvey::getDate, date, date.minusMonths(1)); + query.between(FujianSurvey::getDate, date,date.plusMonths(1)); return query; } @@ -43,10 +43,8 @@ public class FujianSurveyService extends DataService, F ); } if (month != null) { - 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.plusMonths(1)); } if (name != null) { query.like(FujianSurvey::getName, name); diff --git a/src/main/java/mjkf/xinke/main/service/FuzhouHighwayBureauService.java b/src/main/java/mjkf/xinke/main/service/FuzhouHighwayBureauService.java index 1945ac0..4333501 100644 --- a/src/main/java/mjkf/xinke/main/service/FuzhouHighwayBureauService.java +++ b/src/main/java/mjkf/xinke/main/service/FuzhouHighwayBureauService.java @@ -25,7 +25,7 @@ public class FuzhouHighwayBureauService extends DataService, LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(LocalMaterial::getName, data.getName()); var date = LocalDate.of(year, month, 1); - query.between(LocalMaterial::getDate, date, date.minusMonths(1)); + query.between(LocalMaterial::getDate, date,date.plusMonths(1)); return query; } diff --git a/src/main/java/mjkf/xinke/main/service/OilService.java b/src/main/java/mjkf/xinke/main/service/OilService.java index b2e30c9..1fb345d 100644 --- a/src/main/java/mjkf/xinke/main/service/OilService.java +++ b/src/main/java/mjkf/xinke/main/service/OilService.java @@ -23,7 +23,7 @@ public class OilService extends DataService, Oil> { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(Oil::getName, data.getName()); var date = LocalDate.of(year, month, 1); - query.between(Oil::getDate, date, date.minusMonths(1)); + query.between(Oil::getDate, date,date.plusMonths(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 c0b11f0..7308edc 100644 --- a/src/main/java/mjkf/xinke/main/service/SanmingSteelService.java +++ b/src/main/java/mjkf/xinke/main/service/SanmingSteelService.java @@ -26,7 +26,7 @@ public class SanmingSteelService extends DataService, S query.eq(SanmingSteel::getSpec, data.getSpec()); query.eq(SanmingSteel::getMaterial, data.getMaterial()); var date = LocalDate.of(year, month, 1); - query.between(SanmingSteel::getDate, date, date.minusMonths(1)); + query.between(SanmingSteel::getDate, date,date.plusMonths(1)); return query; } @@ -46,10 +46,8 @@ public class SanmingSteelService extends DataService, S ); } if (month != null) { - 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.plusMonths(1)); } if (name != null) { query.like(SanmingSteel::getName, name); diff --git a/src/main/java/mjkf/xinke/main/service/SteelPlateService.java b/src/main/java/mjkf/xinke/main/service/SteelPlateService.java index 6e1373c..586862e 100644 --- a/src/main/java/mjkf/xinke/main/service/SteelPlateService.java +++ b/src/main/java/mjkf/xinke/main/service/SteelPlateService.java @@ -33,7 +33,7 @@ public class SteelPlateService extends DataService, Steel query.eq(SteelPlate::getMaterial, data.getMaterial()); query.eq(SteelPlate::getSource, data.getSource()); var date = LocalDate.of(year, month, 1); - query.between(SteelPlate::getDate, date, date.minusMonths(1)); + query.between(SteelPlate::getDate, date,date.plusMonths(1)); return query; } @@ -55,10 +55,8 @@ public class SteelPlateService extends DataService, Steel ); } if (month != null) { - 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.plusMonths(1)); } if (name != null) { query.like(SteelPlate::getName, name); diff --git a/src/main/java/mjkf/xinke/main/service/SteelRebarService.java b/src/main/java/mjkf/xinke/main/service/SteelRebarService.java index e764a07..686cf9c 100644 --- a/src/main/java/mjkf/xinke/main/service/SteelRebarService.java +++ b/src/main/java/mjkf/xinke/main/service/SteelRebarService.java @@ -30,7 +30,7 @@ public class SteelRebarService extends DataService, Steel query.eq(SteelRebar::getMaterial, data.getMaterial()); query.eq(SteelRebar::getSource, data.getSource()); var date = LocalDate.of(year, month, 1); - query.between(SteelRebar::getDate, date, date.minusMonths(1)); + query.between(SteelRebar::getDate, date, date.plusMonths(1)); return query; } @@ -51,10 +51,8 @@ public class SteelRebarService extends DataService, Steel ); } if (month != null) { - 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.plusMonths(1)); } if (name != null) { query.like(SteelRebar::getName, name); diff --git a/src/main/java/mjkf/xinke/main/service/SteelSectionService.java b/src/main/java/mjkf/xinke/main/service/SteelSectionService.java index d29eaf4..e48b1b8 100644 --- a/src/main/java/mjkf/xinke/main/service/SteelSectionService.java +++ b/src/main/java/mjkf/xinke/main/service/SteelSectionService.java @@ -31,7 +31,7 @@ public class SteelSectionService extends DataService, S query.eq(SteelSection::getMaterial, data.getMaterial()); query.eq(SteelSection::getSource, data.getSource()); var date = LocalDate.of(year, month, 1); - query.between(SteelSection::getDate, date, date.minusMonths(1)); + query.between(SteelSection::getDate, date,date.plusMonths(1)); return query; } @@ -52,10 +52,8 @@ public class SteelSectionService extends DataService, S ); } if (month != null) { - 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.plusMonths(1)); } if (name != null) { query.like(SteelSection::getName, name); diff --git a/src/main/java/mjkf/xinke/main/service/SteelStrandService.java b/src/main/java/mjkf/xinke/main/service/SteelStrandService.java index df79f7b..c5302b7 100644 --- a/src/main/java/mjkf/xinke/main/service/SteelStrandService.java +++ b/src/main/java/mjkf/xinke/main/service/SteelStrandService.java @@ -31,7 +31,7 @@ public class SteelStrandService extends DataService, Ste query.eq(SteelStrand::getMaterial, data.getMaterial()); query.eq(SteelStrand::getSource, data.getSource()); var date = LocalDate.of(year, month, 1); - query.between(SteelStrand::getDate, date, date.minusMonths(1)); + query.between(SteelStrand::getDate, date,date.plusMonths(1)); return query; } @@ -52,10 +52,8 @@ public class SteelStrandService extends DataService, Ste ); } if (month != null) { - 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.plusMonths(1)); } if (name != null) { query.like(SteelStrand::getName, name);