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

feat: 趋势表返回一年数据

Browse Source
This commit is contained in:
han0
2024-07-09 11:46:00 +08:00
parent e7ad0fe717
commit 47b332d677
18 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/mjkf/xinke/main/constant/MaterialTaskType.java
View File

@@ -290,7 +290,7 @@ public class MaterialTaskType {
/**
* todo-1 数据展示模块 地市暂不切换
* todo-1 趋势图一年每月打点
* todo-1 计算模块更新
*/
}

2
src/main/java/mjkf/xinke/main/controller/PriceResultController.java
View File

@@ -97,6 +97,8 @@ public class PriceResultController {
throw new NcHttpException(HttpErrorResponseEnum.PRICE_RESULT_NOT_FOUND);
}
var query = priceResultService.getQueryByName(data.getName());
query.orderByAsc(PriceResult::getYear, PriceResult::getMonth);
var result = priceResultService.list(query);
return FuHttpResponse.Builder().dataResponse(result).build();

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

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

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

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

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

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

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

@@ -62,7 +62,7 @@ public class DataFujianService extends DataService<BaseMapper<DataFujian>, DataF
LambdaQueryWrapper<DataFujian> query = new LambdaQueryWrapper<>();
query.eq(DataFujian::getName, data.getName());
var date = LocalDate.of(year, month, 1);
query.between(DataFujian::getDate, date, date.plusMonths(1));
query.between(DataFujian::getDate, date.minusYears(1), date.plusMonths(1));
return query;
}

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

@@ -56,7 +56,7 @@ public class DataGuangdongService extends DataService<BaseMapper<DataGuangdong>,
LambdaQueryWrapper<DataGuangdong> query = new LambdaQueryWrapper<>();
query.eq(DataGuangdong::getName, data.getName());
var date = LocalDate.of(year, month, 1);
query.between(DataGuangdong::getDate, date, date.plusMonths(1));
query.between(DataGuangdong::getDate, date.minusYears(1), date.plusMonths(1));
return query;
}

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

@@ -59,7 +59,7 @@ public class DataNetworkService extends DataService<BaseMapper<DataNetwork>, Dat
LambdaQueryWrapper<DataNetwork> query = new LambdaQueryWrapper<>();
query.eq(DataNetwork::getName, data.getName());
var date = LocalDate.of(year, month, 1);
query.between(DataNetwork::getDate, date, date.plusMonths(1));
query.between(DataNetwork::getDate, date.minusYears(1), date.plusMonths(1));
return query;
}
}

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

@@ -58,7 +58,7 @@ public class DataZhejiangService extends DataService<BaseMapper<DataZhejiang>,
LambdaQueryWrapper<DataZhejiang> query = new LambdaQueryWrapper<>();
query.eq(DataZhejiang::getName, data.getName());
var date = LocalDate.of(year, month, 1);
query.between(DataZhejiang::getDate, date, date.plusMonths(1));
query.between(DataZhejiang::getDate, date.minusYears(1), date.plusMonths(1));
return query;
}

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

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

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

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

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

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

4
src/main/java/mjkf/xinke/main/service/PriceResultService.java
View File

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Service;
@Service
public class PriceResultService extends ServiceImpl<BaseMapper<PriceResult>, PriceResult> {
public LambdaQueryWrapper getQuery(Integer year, Integer month, String materialId, String name) {
public LambdaQueryWrapper<PriceResult> getQuery(Integer year, Integer month, String materialId, String name) {
var query = new LambdaQueryWrapper<PriceResult>();
if (year != null) {
query = query.eq(PriceResult::getYear, year);
@@ -26,7 +26,7 @@ public class PriceResultService extends ServiceImpl<BaseMapper<PriceResult>, Pri
return query;
}
public LambdaQueryWrapper getQueryByName(String name) {
public LambdaQueryWrapper<PriceResult> getQueryByName(String name) {
return this.getQuery(null, null, null, name);
}
}

2
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.plusMonths(1));
query.between(SanmingSteel::getDate, date.minusYears(1), date.plusMonths(1));
return query;
}

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

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

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

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

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

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

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

@@ -32,7 +32,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.plusMonths(1));
query.between(SteelStrand::getDate, date.minusYears(1),date.plusMonths(1));
return query;
}
@@ -54,7 +54,7 @@ public class SteelStrandService extends DataService<BaseMapper<SteelStrand>, Ste
}
if (month != null) {
var date = LocalDate.of(year, month, 1);
query.between(SteelStrand::getDate, date,date.plusMonths(1));
query.between(SteelStrand::getDate, date.minusYears(1), date.plusMonths(1));
}
if (name != null) {
query.like(SteelStrand::getName, name);