root/material-manage-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(material): 修复

Browse Source
This commit is contained in:
han0
2023-12-19 20:00:44 +08:00
parent b7015fb177
commit 551c487ca0
14 changed files with 36 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/mjkf/xinke/main/service/AsphaltDomesticService.java
View File

@@ -24,7 +24,7 @@ public class AsphaltDomesticService extends DataService<BaseMapper<AsphaltDomest
LambdaQueryWrapper<AsphaltDomestic> 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<BaseMapper<AsphaltDomest
);
}
if (month != null) {
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.plusMonths(1));
}
if (name != null) {
query.like(AsphaltDomestic::getName, name);

8
src/main/java/mjkf/xinke/main/service/AsphaltImportedService.java
View File

@@ -24,7 +24,7 @@ public class AsphaltImportedService extends DataService<BaseMapper<AsphaltImport
LambdaQueryWrapper<AsphaltImported> 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<BaseMapper<AsphaltImport
);
}
if (month != null) {
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.plusMonths(1));
}
if (name != null) {
query.like(AsphaltImported::getName, name);

2
src/main/java/mjkf/xinke/main/service/AsphaltModifierService.java
View File

@@ -23,7 +23,7 @@ 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.minusMonths(1));
query.between(AsphaltModifier::getDate, date,date.plusMonths(1));
return query;
}

8
src/main/java/mjkf/xinke/main/service/CementService.java
View File

@@ -30,7 +30,7 @@ public class CementService extends DataService<BaseMapper<Cement>, 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<BaseMapper<Cement>, 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);

8
src/main/java/mjkf/xinke/main/service/FujianSurveyService.java
View File

@@ -24,7 +24,7 @@ public class FujianSurveyService extends DataService<BaseMapper<FujianSurvey>, 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<BaseMapper<FujianSurvey>, 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);

8
src/main/java/mjkf/xinke/main/service/FuzhouHighwayBureauService.java
View File

@@ -25,7 +25,7 @@ public class FuzhouHighwayBureauService extends DataService<BaseMapper<FuzhouHig
query.eq(FuzhouHighwayBureau::getName, data.getName());
query.eq(FuzhouHighwayBureau::getSpec, data.getSpec());
var date = LocalDate.of(year, month, 1);
query.between(FuzhouHighwayBureau::getDate, date, date.minusMonths(1));
query.between(FuzhouHighwayBureau::getDate, date,date.plusMonths(1));
return query;
}
@@ -44,10 +44,8 @@ public class FuzhouHighwayBureauService extends DataService<BaseMapper<FuzhouHig
);
}
if (month != null) {
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.plusMonths(1));
}
if (name != null) {
query.like(FuzhouHighwayBureau::getName, name);

8
src/main/java/mjkf/xinke/main/service/FuzhouTransportationBureauService.java
View File

@@ -26,7 +26,7 @@ public class FuzhouTransportationBureauService extends DataService<BaseMapper<Fu
query.eq(FuzhouTransportationBureau::getName, data.getName());
query.eq(FuzhouTransportationBureau::getSpec, data.getSpec());
var date = LocalDate.of(year, month, 1);
query.between(FuzhouTransportationBureau::getDate, date, date.minusMonths(1));
query.between(FuzhouTransportationBureau::getDate, date,date.plusMonths(1));
return query;
}
@@ -45,10 +45,8 @@ public class FuzhouTransportationBureauService extends DataService<BaseMapper<Fu
);
}
if (month != null) {
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.plusMonths(1));
}
if (name != null) {
query.like(FuzhouTransportationBureau::getName, name);

2
src/main/java/mjkf/xinke/main/service/LocalMaterialService.java
View File

@@ -25,7 +25,7 @@ public class LocalMaterialService extends DataService<BaseMapper<LocalMaterial>,
LambdaQueryWrapper<LocalMaterial> 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;
}

2
src/main/java/mjkf/xinke/main/service/OilService.java
View File

@@ -23,7 +23,7 @@ public class OilService extends DataService<BaseMapper<Oil>, Oil> {
LambdaQueryWrapper<Oil> 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;
}

8
src/main/java/mjkf/xinke/main/service/SanmingSteelService.java
View File

@@ -26,7 +26,7 @@ public class SanmingSteelService extends DataService<BaseMapper<SanmingSteel>, 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<BaseMapper<SanmingSteel>, 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);

8
src/main/java/mjkf/xinke/main/service/SteelPlateService.java
View File

@@ -33,7 +33,7 @@ public class SteelPlateService extends DataService<BaseMapper<SteelPlate>, 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<BaseMapper<SteelPlate>, 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);

8
src/main/java/mjkf/xinke/main/service/SteelRebarService.java
View File

@@ -30,7 +30,7 @@ public class SteelRebarService extends DataService<BaseMapper<SteelRebar>, 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<BaseMapper<SteelRebar>, 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);

8
src/main/java/mjkf/xinke/main/service/SteelSectionService.java
View File

@@ -31,7 +31,7 @@ public class SteelSectionService extends DataService<BaseMapper<SteelSection>, 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<BaseMapper<SteelSection>, 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);

8
src/main/java/mjkf/xinke/main/service/SteelStrandService.java
View File

@@ -31,7 +31,7 @@ public class SteelStrandService extends DataService<BaseMapper<SteelStrand>, 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<BaseMapper<SteelStrand>, 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);