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-09 09:13:48 +08:00
parent 09902904fd
commit c29beec53b
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yfd.platform.common.DataSourceLoadOptionsBase;
import com.yfd.platform.common.DataSourceRequest;
import com.yfd.platform.qgc_base.domain.SdRvcdDic;
import com.yfd.platform.qgc_base.mapper.SdRvcdDicMapper;
import com.yfd.platform.qgc_data.domain.ApprovalMain;
import com.yfd.platform.qgc_data.domain.FishDraftData;
import com.yfd.platform.qgc_data.domain.SysUserDataScope;
@ -73,6 +75,10 @@ public class FishDraftDataServiceImpl extends ServiceImpl<FishDraftDataMapper, F
@Resource
private SdHbrvDicMapper hbrvDicMapper;
@Resource
private SdRvcdDicMapper rvcdDicMapper;
@Resource
private SdFpssRMapper sdFpssRMapper;
@ -344,15 +350,15 @@ public class FishDraftDataServiceImpl extends ServiceImpl<FishDraftDataMapper, F
continue;
}
if ("HBRVCD".equals(orgType)) {
if ("RVCD".equals(orgType)) {
hbrvcdSet.add(orgId);
SdHbrvDic hbrv = hbrvDicMapper.selectById(orgId);
if (hbrv != null && hbrv.getHbrvnm() != null) {
hbrvnmSet.add(hbrv.getHbrvnm());
SdRvcdDic hbrv = rvcdDicMapper.selectById(orgId);
if (hbrv != null && hbrv.getRvnm() != null) {
hbrvnmSet.add(hbrv.getRvnm());
}
List<SdEngInfoBH> stationList = engInfoBHMapper.selectByHbrvcd(orgId);
List<SdEngInfoBH> stationList = engInfoBHMapper.selectByRvcd(null,orgId);
if (stationList != null) {
for (SdEngInfoBH station : stationList) {
if (station.getStcd() != null) {
@ -367,8 +373,8 @@ public class FishDraftDataServiceImpl extends ServiceImpl<FishDraftDataMapper, F
} else if ("STATION".equals(orgType)) {
SdEngInfoBH station = engInfoBHMapper.selectById(orgId);
if (station != null) {
if (station.getHbrvcd() != null) {
hbrvcdSet.add(station.getHbrvcd());
if (station.getRvcd() != null) {
hbrvcdSet.add(station.getRvcd());
}
if (station.getStcd() != null) {
stcdSet.add(station.getStcd());
@ -377,19 +383,19 @@ public class FishDraftDataServiceImpl extends ServiceImpl<FishDraftDataMapper, F
ennmSet.add(station.getEnnm());
}
SdHbrvDic hbrv = hbrvDicMapper.selectById(station.getHbrvcd());
if (hbrv != null && hbrv.getHbrvnm() != null) {
hbrvnmSet.add(hbrv.getHbrvnm());
SdRvcdDic hbrv = rvcdDicMapper.selectById(station.getRvcd());
if (hbrv != null && hbrv.getRvnm() != null) {
hbrvnmSet.add(hbrv.getRvnm());
}
}
}
}
if (!hbrvcdSet.isEmpty()) {
approvalMain.setHbrvcd(String.join(",", hbrvcdSet));
approvalMain.setRvcd(String.join(",", hbrvcdSet));
}
if (!hbrvnmSet.isEmpty()) {
approvalMain.setHbrvnm(String.join(",", hbrvnmSet));
approvalMain.setRvnm(String.join(",", hbrvnmSet));
}
if (!stcdSet.isEmpty()) {
approvalMain.setStcd(String.join(",", stcdSet));