fix(service): 修复日期查询条件

This commit is contained in:
han0
2023-12-19 19:37:29 +08:00
parent fc81fb7262
commit b7015fb177
11 changed files with 22 additions and 11 deletions

View File

@@ -23,7 +23,8 @@ public class AsphaltDomesticService extends DataService<BaseMapper<AsphaltDomest
var data = (AsphaltDomestic) obj;
LambdaQueryWrapper<AsphaltDomestic> 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;
}

View File

@@ -23,7 +23,8 @@ public class AsphaltImportedService extends DataService<BaseMapper<AsphaltImport
var data = (AsphaltImported) obj;
LambdaQueryWrapper<AsphaltImported> 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;
}

View File

@@ -29,7 +29,8 @@ public class CementService extends DataService<BaseMapper<Cement>, 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;
}

View File

@@ -23,7 +23,8 @@ public class FujianSurveyService extends DataService<BaseMapper<FujianSurvey>, F
LambdaQueryWrapper<FujianSurvey> 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;
}

View File

@@ -24,7 +24,8 @@ public class FuzhouHighwayBureauService extends DataService<BaseMapper<FuzhouHig
LambdaQueryWrapper<FuzhouHighwayBureau> 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;
}

View File

@@ -25,7 +25,8 @@ public class FuzhouTransportationBureauService extends DataService<BaseMapper<Fu
LambdaQueryWrapper<FuzhouTransportationBureau> 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;
}

View File

@@ -25,7 +25,8 @@ public class SanmingSteelService extends DataService<BaseMapper<SanmingSteel>, 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;
}

View File

@@ -32,7 +32,8 @@ public class SteelPlateService extends DataService<BaseMapper<SteelPlate>, 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;
}

View File

@@ -29,7 +29,8 @@ public class SteelRebarService extends DataService<BaseMapper<SteelRebar>, 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;
}

View File

@@ -30,7 +30,8 @@ public class SteelSectionService extends DataService<BaseMapper<SteelSection>, 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;
}

View File

@@ -30,7 +30,8 @@ public class SteelStrandService extends DataService<BaseMapper<SteelStrand>, 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;
}