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-09-03 09:56:02 +08:00
parent 5d76129fbb
commit 4f92bd6a57
3 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdHydrobaseServiceImpl.java
View File

@ -75,7 +75,10 @@ public class SdHydrobaseServiceImpl extends ServiceImpl<SdHydrobaseMapper, SdHyd
if (StringUtils.hasText(basename)) { if (StringUtils.hasText(basename)) {
wrapper.like(SdHydrobase::getBasename, basename); wrapper.like(SdHydrobase::getBasename, basename);
} }
if (adminAuthService.isCurrentManagedAdmin()) {
wrapper.orderByAsc(SdHydrobase::getOrderIndex);
return this.list(wrapper);
}
Set<String> authorizedStations = getUserAuthorizedStationCodes(); Set<String> authorizedStations = getUserAuthorizedStationCodes();
if (authorizedStations != null && !authorizedStations.isEmpty()) { if (authorizedStations != null && !authorizedStations.isEmpty()) {

3
backend/src/main/java/com/yfd/platform/qgc_env/fb/service/impl/FbStationServiceImpl.java
View File

@ -53,6 +53,9 @@ public class FbStationServiceImpl implements FbStationService {
private static final Map<String, String> FISH_RUN_FIELD_MEANING_MAP = new HashMap<>(); private static final Map<String, String> FISH_RUN_FIELD_MEANING_MAP = new HashMap<>();
static { static {
FISH_RUN_FIELD_MEANING_MAP.put("ID", "主键ID");
FISH_RUN_FIELD_MEANING_MAP.put("RPIMN_ID", "放流实施ID");
FISH_RUN_FIELD_MEANING_MAP.put("STCD", "电站编码");
FISH_RUN_FIELD_MEANING_MAP.put("FTP", "鱼种类"); FISH_RUN_FIELD_MEANING_MAP.put("FTP", "鱼种类");
FISH_RUN_FIELD_MEANING_MAP.put("FSZ", "平均长度"); FISH_RUN_FIELD_MEANING_MAP.put("FSZ", "平均长度");
FISH_RUN_FIELD_MEANING_MAP.put("FWET", "平均体重"); FISH_RUN_FIELD_MEANING_MAP.put("FWET", "平均体重");

21
backend/src/main/java/com/yfd/platform/qgc_env/wq/service/impl/EnvWqDataServiceImpl.java
View File

@ -1089,6 +1089,24 @@ public class EnvWqDataServiceImpl implements EnvWqDataService {
.append("T.CYANO AS cyano, ") .append("T.CYANO AS cyano, ")
.append("T.WQGRD AS wqgrd, ") .append("T.WQGRD AS wqgrd, ")
.append("T.WWQTG AS wwqtg, ") .append("T.WWQTG AS wwqtg, ")
.append("CASE T.WWQTG " +
" WHEN '1' THEN 'Ⅰ' " +
" WHEN '2' THEN 'Ⅱ' " +
" WHEN '3' THEN 'Ⅲ' " +
" WHEN '4' THEN 'Ⅳ' " +
" WHEN '5' THEN 'Ⅴ' " +
" WHEN '6' THEN 'V' " +
" ELSE '未知' " +
"END AS WWQTG_NAME,")
.append("CASE T.WQGRD " +
" WHEN '1' THEN 'Ⅰ' " +
" WHEN '2' THEN 'Ⅱ' " +
" WHEN '3' THEN 'Ⅲ' " +
" WHEN '4' THEN 'Ⅳ' " +
" WHEN '5' THEN 'Ⅴ' " +
" WHEN '6' THEN 'V' " +
" ELSE '未知' " +
"END AS WQGRD_NAME,")
.append("T.SFDB AS sfdb, ") .append("T.SFDB AS sfdb, ")
.append("T.WQ_SFDBHN_YS AS wqSfdbhnYs, ") .append("T.WQ_SFDBHN_YS AS wqSfdbhnYs, ")
.append("T.BASE_ID AS baseId, ") .append("T.BASE_ID AS baseId, ")
@ -1917,7 +1935,8 @@ public class EnvWqDataServiceImpl implements EnvWqDataService {
case "stcd" -> "T.STCD"; case "stcd" -> "T.STCD";
case "tm" -> "T.TM"; case "tm" -> "T.TM";
case "wqgrd" -> "T.WQGRD"; case "wqgrd" -> "T.WQGRD";
case "wqgrdName" -> "T.WQGRD_NAME"; case "wqgrdName" -> "WQGRD_NAME";
case "wwqtgName" -> "WWQTG_NAME";
case "ph" -> "T.PH"; case "ph" -> "T.PH";
case "dox" -> "T.DOX"; case "dox" -> "T.DOX";
case "codmn" -> "T.CODMN"; case "codmn" -> "T.CODMN";