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-11 10:00:59 +08:00
parent c4b88ee28f
commit 55b527934a
7 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -2,6 +2,7 @@ package mjkf.xinke.main.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import mjkf.xinke.main.constant.MaterialTaskType;
import mjkf.xinke.main.model.db.AsphaltModifier;
import mjkf.xinke.main.model.db.DataNetwork;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Service;
@@ -58,8 +59,10 @@ public class DataNetworkService extends DataService<BaseMapper<DataNetwork>, Dat
var data = (DataNetwork) obj;
LambdaQueryWrapper<DataNetwork> query = new LambdaQueryWrapper<>();
query.eq(DataNetwork::getName, data.getName());
query.eq(DataNetwork::getSpec, data.getSpec());
var date = LocalDate.of(year, month, 1);
query.between(DataNetwork::getDate, date.minusYears(1), date.plusMonths(1));
query.orderByAsc(DataNetwork::getDate);
return query;
}
}

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

@@ -28,6 +28,7 @@ public class FujianSurveyService extends DataService<BaseMapper<FujianSurvey>, F
query.eq(FujianSurvey::getSpec, data.getSpec());
var date = LocalDate.of(year, month, 1);
query.between(FujianSurvey::getDate, date.minusYears(1), date.plusMonths(1));
query.orderByAsc(FujianSurvey::getDate);
return query;
}

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

@@ -29,6 +29,7 @@ public class FuzhouHighwayBureauService extends DataService<BaseMapper<FuzhouHig
query.eq(FuzhouHighwayBureau::getSpec, data.getSpec());
var date = LocalDate.of(year, month, 1);
query.between(FuzhouHighwayBureau::getDate, date.minusYears(1), date.plusMonths(1));
query.orderByAsc(FuzhouHighwayBureau::getDate);
return query;
}

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

@@ -30,6 +30,7 @@ public class FuzhouTransportationBureauService extends DataService<BaseMapper<Fu
query.eq(FuzhouTransportationBureau::getSpec, data.getSpec());
var date = LocalDate.of(year, month, 1);
query.between(FuzhouTransportationBureau::getDate, date.minusYears(1), date.plusMonths(1));
query.orderByAsc(FuzhouTransportationBureau::getDate);
return query;
}

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

@@ -47,8 +47,11 @@ public class LocalMaterialService extends DataService<BaseMapper<LocalMaterial>,
var data = (LocalMaterial) obj;
LambdaQueryWrapper<LocalMaterial> query = new LambdaQueryWrapper<>();
query.eq(LocalMaterial::getName, data.getName());
query.eq(LocalMaterial::getSpec, data.getSpec());
query.eq(LocalMaterial::getCounty, data.getCounty());
var date = LocalDate.of(year, month, 1);
query.between(LocalMaterial::getDate, date,date.plusMonths(1));
query.between(LocalMaterial::getDate, date.minusYears(1), date.plusMonths(1));
query.orderByAsc(LocalMaterial::getDate);
return query;
}

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

@@ -27,6 +27,7 @@ public class SanmingSteelService extends DataService<BaseMapper<SanmingSteel>, S
query.eq(SanmingSteel::getMaterial, data.getMaterial());
var date = LocalDate.of(year, month, 1);
query.between(SanmingSteel::getDate, date.minusYears(1), date.plusMonths(1));
query.orderByAsc(SanmingSteel::getDate);
return query;
}