zhengsl/WholeProcessPlatform
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: 优化过鱼历史数据查询

Browse Source
This commit is contained in:
tangwei 2026-06-10 16:10:01 +08:00
parent d4ea1186bc
commit 4ba5a2c05d
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
backend/src/main/java/com/yfd/platform/qgc_data/service/impl/FishDraftDataServiceImpl.java
View File

@ -353,10 +353,10 @@ public class FishDraftDataServiceImpl extends ServiceImpl<FishDraftDataMapper, F
if ("RVCD".equals(orgType)) { if ("RVCD".equals(orgType)) {
hbrvcdSet.add(orgId); hbrvcdSet.add(orgId);
SdRvcdDic hbrv = rvcdDicMapper.selectById(orgId); // SdRvcdDic hbrv = rvcdDicMapper.selectById(orgId);
if (hbrv != null && hbrv.getRvnm() != null) { // if (hbrv != null && hbrv.getRvnm() != null) {
hbrvnmSet.add(hbrv.getRvnm()); // hbrvnmSet.add(hbrv.getRvnm());
} // }
List<SdEngInfoBH> stationList = engInfoBHMapper.selectByRvcd(null,orgId); List<SdEngInfoBH> stationList = engInfoBHMapper.selectByRvcd(null,orgId);
if (stationList != null) { if (stationList != null) {
@ -367,14 +367,17 @@ public class FishDraftDataServiceImpl extends ServiceImpl<FishDraftDataMapper, F
if (station.getEnnm() != null) { if (station.getEnnm() != null) {
ennmSet.add(station.getEnnm()); ennmSet.add(station.getEnnm());
} }
if(station.getReachcdName() != null){
hbrvnmSet.add(station.getReachcdName());
}
} }
} }
} else if ("STATION".equals(orgType)) { } else if ("STATION".equals(orgType)) {
SdEngInfoBH station = engInfoBHMapper.selectById(orgId); SdEngInfoBH station = engInfoBHMapper.selectById(orgId);
if (station != null) { if (station != null) {
if (station.getRvcd() != null) { if (station.getReachcd() != null) {
hbrvcdSet.add(station.getRvcd()); hbrvcdSet.add(station.getReachcd());
} }
if (station.getStcd() != null) { if (station.getStcd() != null) {
stcdSet.add(station.getStcd()); stcdSet.add(station.getStcd());
@ -382,11 +385,14 @@ public class FishDraftDataServiceImpl extends ServiceImpl<FishDraftDataMapper, F
if (station.getEnnm() != null) { if (station.getEnnm() != null) {
ennmSet.add(station.getEnnm()); ennmSet.add(station.getEnnm());
} }
if(station.getReachcdName() != null){
SdRvcdDic hbrv = rvcdDicMapper.selectById(station.getRvcd()); hbrvnmSet.add(station.getReachcdName());
if (hbrv != null && hbrv.getRvnm() != null) {
hbrvnmSet.add(hbrv.getRvnm());
} }
// SdRvcdDic hbrv = rvcdDicMapper.selectById(station.getRvcd());
// if (hbrv != null && hbrv.getRvnm() != null) {
// hbrvnmSet.add(hbrv.getRvnm());
// }
} }
} }
} }