xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

台站不选择情况下传值修改

Browse Source
This commit is contained in:
qiaoqinzheng 2023-07-26 11:00:19 +08:00
parent 9b747338d7
commit 7ad22f79a1
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/AutoServiceImpl.java
View File

@ -62,11 +62,12 @@ public class AutoServiceImpl extends ServiceImpl<GardsAnalysesAutoMapper, GardsA
return result; return result;
} }
String endDate = DateUtils.formatDate(endTime, "yyyy-MM-dd") + " 23:59:59"; String endDate = DateUtils.formatDate(endTime, "yyyy-MM-dd") + " 23:59:59";
List<Integer> stationIdList;
if (Objects.isNull(stationIds)){ if (Objects.isNull(stationIds)){
result.error500("台站所选id不能为空"); stationIdList = new LinkedList<>();
return result; }else {
stationIdList = Arrays.asList(stationIds);
} }
List<Integer> stationIdList = Arrays.asList(stationIds);
Page<GardsSampleData> page = new Page(queryRequest.getPageNo(), queryRequest.getPageSize()); Page<GardsSampleData> page = new Page(queryRequest.getPageNo(), queryRequest.getPageSize());
Page<GardsSampleData> sampleDataPage = gardsSampleDataWebMapper.findAutoPage(startDate, endDate, stationIdList, page); Page<GardsSampleData> sampleDataPage = gardsSampleDataWebMapper.findAutoPage(startDate, endDate, stationIdList, page);
sampleDataPage.getRecords().forEach(item->{ sampleDataPage.getRecords().forEach(item->{

7
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/ReviewedServiceImpl.java
View File

@ -60,11 +60,12 @@ public class ReviewedServiceImpl extends ServiceImpl<GardsAnalysesManMapper, Gar
return result; return result;
} }
String endDate = DateUtils.formatDate(endTime, "yyyy-MM-dd") + " 23:59:59"; String endDate = DateUtils.formatDate(endTime, "yyyy-MM-dd") + " 23:59:59";
List<Integer> stationIdList;
if (Objects.isNull(stationIds)){ if (Objects.isNull(stationIds)){
result.error500("台站所选id不能为空"); stationIdList = new LinkedList<>();
return result; }else {
stationIdList = Arrays.asList(stationIds);
} }
List<Integer> stationIdList = Arrays.asList(stationIds);
Page<GardsSampleData> page = new Page(queryRequest.getPageNo(), queryRequest.getPageSize()); Page<GardsSampleData> page = new Page(queryRequest.getPageNo(), queryRequest.getPageSize());
Page<GardsSampleData> sampleDataPage = gardsSampleDataWebMapper.findReviewedPage(startDate, endDate, stationIdList, page); Page<GardsSampleData> sampleDataPage = gardsSampleDataWebMapper.findReviewedPage(startDate, endDate, stationIdList, page);
sampleDataPage.getRecords().forEach(item->{ sampleDataPage.getRecords().forEach(item->{