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

fix: 优化bug

Browse Source
This commit is contained in:
tangwei 2026-07-15 18:01:20 +08:00
parent c3dbe858b4
commit 326a397559
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java
View File

@ -1095,6 +1095,9 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
"t.WDDT AS wddt, " +
"t.ORDER_INDEX AS orderIndex, " +
"t.REMARK AS remark, " +
"t.STINDX AS stindx, " +
"t.COENVW_STATE AS coenvwState, " +
"CASE t.DVTP WHEN '1' THEN '堤坝式' WHEN '2' THEN '引水式' WHEN '3' THEN '混合式' ELSE '未知' END AS dvtpName, " +
"t.VLSR AS vlsr, " +
"t.VLSR_TM AS vlsrTm, " +
"t.RECORD_USER AS recordUser, " +

8
backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java
View File

@ -3396,8 +3396,8 @@ public class EngEqDataServiceImpl implements EngEqDataService {
"eng.DTIN AS dtin, " +
"NVL(hb.ORDER_INDEX, 999999) AS baseStepSort, " +
"NVL(along.ORDER_INDEX, 999999) AS rvcdStepSort, " +
"NVL(eng.ORDER_INDEX, 999999) AS rstcdStepSort, " +
"NVL(eng.ORDER_INDEX, 999999) AS siteStepSort " +
"NVL(c.SORT, 999999) AS rstcdStepSort, " +
"NVL(d.SORT, 999999) AS siteStepSort " +
"FROM SD_ENGINFO_B_H eng " +
"INNER JOIN SD_PWR_B_H pbh ON pbh.STCD= eng.STCD " +
"LEFT JOIN SD_RSVRFCCH_B_H rbh ON rbh.STCD= eng.STCD " +
@ -3406,7 +3406,9 @@ public class EngEqDataServiceImpl implements EngEqDataService {
"LEFT JOIN SD_ADDVCD_DIC ad ON ad.ADDVCD = eng.ADDVCD" +
" AND NVL(hbrv.IS_DELETED, 0) = 0 AND NVL(hbrv.ENABLED, 1) = 1 " +
"LEFT JOIN SD_RVCD_DIC rv ON rv.RVCD = eng.RVCD " +
"LEFT JOIN MS_ALONG_B along ON along.RVCD = eng.HBRVCD AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
"LEFT JOIN MS_ALONG_B along ON along.BASEID = eng.BASE_ID AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
"LEFT JOIN (select c.SORT,d.BASEID,d.RVCD,c.STCD from MS_ALONGDET_B c inner join MS_ALONG_B d on c.ALONG_ID=d.ID where c.IS_DELETED=0 and d.IS_DELETED=0 and d.CODE='common') c on c.BASEID=eng.BASE_ID and c.stcd=eng.STCD \n" +
"LEFT JOIN (select c.SORT,d.BASEID,d.RVCD,c.STCD from MS_ALONGDET_B c inner join MS_ALONG_B d on c.ALONG_ID=d.ID where c.IS_DELETED=0 and d.IS_DELETED=0 and d.CODE='common') d on d.BASEID=eng.BASE_ID and d.stcd=eng.STCD "+
"WHERE NVL(eng.IS_DELETED, 0) = 0";
}

6
backend/src/main/java/com/yfd/platform/qgc_env/wt/mapper/AlongListMapper.java
View File

@ -62,7 +62,7 @@ public interface AlongListMapper extends BaseMapper<SdAlongVO> {
" and MAB.RVCD=#{rvcd} " +
" </if>" +
" <if test='baseId != null and baseId != \"\"'>" +
" and MAB.RVCD in (select HBRVCD from SD_HBRV_DIC where IS_DELETED=0 and ENABLED=1 and BASEID=#{baseId}) " +
" and MAB.BASEID in (select BASEID from SD_HYDROBASE where IS_DELETED=0 and ENABLED=1 and BASEID=#{baseId}) " +
" </if>" +
" union all " +
" select " +
@ -93,7 +93,7 @@ public interface AlongListMapper extends BaseMapper<SdAlongVO> {
" and MAB.RVCD=#{rvcd} " +
" </if>" +
" <if test='baseId != null and baseId != \"\"'>" +
" and MAB.RVCD in (select HBRVCD from SD_HBRV_DIC where IS_DELETED=0 and ENABLED=1 and BASEID=#{baseId}) " +
" and MAB.BASEID in (select BASEID from SD_HYDROBASE where IS_DELETED=0 and ENABLED=1 and BASEID=#{baseId}) " +
" </if>" +
") T order by rvcdSort asc, sort asc" +
"</script>")
@ -117,7 +117,7 @@ public interface AlongListMapper extends BaseMapper<SdAlongVO> {
"and MAB.RVCD=#{rvcd} " +
"</if>" +
"<if test='baseId != null and baseId != \"\"'>" +
"and MAB.RVCD in (select HBRVCD from SD_HBRV_DIC where IS_DELETED=0 and ENABLED=1 and BASEID=#{baseId}) " +
"and MAB.BASEID in (select BASEID from SD_HYDROBASE where IS_DELETED=0 and ENABLED=1 and BASEID=#{baseId}) " +
"</if>" +
"order by MAB.ORDER_INDEX asc, SAD.SORT asc, SWR.TM desc" +
") where ROWNUM=1" +

2
backend/src/main/java/com/yfd/platform/qgc_env/wte/service/impl/WeFishServiceImpl.java
View File

@ -1923,7 +1923,7 @@ public class WeFishServiceImpl implements WeFishService {
List<String> rstcdList,
Map<String, Object> paramMap) {
StringBuilder sql = new StringBuilder();
sql.append("SELECT t.HBRVCD AS hbrvcd, t.YR AS yr ")
sql.append("SELECT t.BASE_ID AS hbrvcd, t.YR AS yr ")
.append("FROM (")
.append("SELECT section.HBRVCD, section.RSTCD, section.BASE_ID, TO_CHAR(we.TM, 'yyyy') AS yr ")
.append("FROM SD_WE_B_H section ")