fix: 优化电站查询防洪扩容字段值显示错误
This commit is contained in:
parent
15708fd0a1
commit
ecd6803a0e
@ -1261,7 +1261,7 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
|
|||||||
"eng.BCKLEN AS bcklen, " +
|
"eng.BCKLEN AS bcklen, " +
|
||||||
"rbh.TTCP AS ttcp, " +
|
"rbh.TTCP AS ttcp, " +
|
||||||
"rbh.NMZCP AS nmzcp, " +
|
"rbh.NMZCP AS nmzcp, " +
|
||||||
"null AS fldcpStr, " +
|
"b.VAL AS fldcpStr, " +
|
||||||
"rbh.ACTCP AS actcp, " +
|
"rbh.ACTCP AS actcp, " +
|
||||||
"rbh.DDCP AS ddcp, " +
|
"rbh.DDCP AS ddcp, " +
|
||||||
"eng.CPSC AS cpsc, " +
|
"eng.CPSC AS cpsc, " +
|
||||||
@ -1327,6 +1327,33 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
|
|||||||
"LEFT JOIN SD_HYCD_DIC topHy ON topHy.HYCD = eng.TOP_HYCD AND NVL(topHy.IS_DELETED, 0) = 0 AND NVL(topHy.ENABLED, 1) = 1 " +
|
"LEFT JOIN SD_HYCD_DIC topHy ON topHy.HYCD = eng.TOP_HYCD AND NVL(topHy.IS_DELETED, 0) = 0 AND NVL(topHy.ENABLED, 1) = 1 " +
|
||||||
"LEFT JOIN SD_PWR_B_H pwr ON pwr.STCD = eng.STCD AND NVL(pwr.IS_DELETED, 0) = 0 " +
|
"LEFT JOIN SD_PWR_B_H pwr ON pwr.STCD = eng.STCD AND NVL(pwr.IS_DELETED, 0) = 0 " +
|
||||||
"LEFT JOIN SD_RSVRFCCH_B_H rbh ON rbh.STCD = eng.STCD " +
|
"LEFT JOIN SD_RSVRFCCH_B_H rbh ON rbh.STCD = eng.STCD " +
|
||||||
|
"LEFT JOIN ( SELECT STCD\n" +
|
||||||
|
" , MAX(CASE WHEN RN = 1 THEN TM END) AS TM\n" +
|
||||||
|
" , MAX(CASE WHEN RN = 1 THEN VAL END) AS VAL\n" +
|
||||||
|
" , MAX(VLSR) AS VLSR\n" +
|
||||||
|
" , MAX(VLSR_TM) AS VLSR_TM\n" +
|
||||||
|
" , LISTAGG('起始时间' || TO_CHAR(TM, 'YYYY-MM-DD') || '(' || VAL || ')' ||\n" +
|
||||||
|
" CASE WHEN VLSR IS NOT NULL THEN '来源' || VLSR ELSE '' END ||\n" +
|
||||||
|
" CASE WHEN VLSR_TM IS NOT NULL THEN ',来源时间' || TO_CHAR(VLSR_TM, 'YYYY-MM-DD') ELSE '' END,\n" +
|
||||||
|
" CHR(10)) WITHIN GROUP (ORDER BY TM DESC) AS ALL_VAL\n" +
|
||||||
|
" FROM ( SELECT STCD\n" +
|
||||||
|
" , TM\n" +
|
||||||
|
" , MAX(VLSR) AS VLSR\n" +
|
||||||
|
" , MAX(VLSR_TM) AS VLSR_TM\n" +
|
||||||
|
" , LISTAGG(\n" +
|
||||||
|
" SUBSTR(BGMD, 0, 2) || '月' || SUBSTR(BGMD, 3, 2) || '日' || '~' || SUBSTR(EDMD, 0, 2) || '月' ||\n" +
|
||||||
|
" SUBSTR(EDMD, 3, 2) || '日' || '限值为' ||\n" +
|
||||||
|
" (CASE WHEN FLDCPMN IS NOT NULL THEN (DECODE(SUBSTR(FLDCPMN, 1, 1), '.', '0' || FLDCPMN, FLDCPMN) ||\n" +
|
||||||
|
" '~' || DECODE(SUBSTR(FLDCP, 1, 1), '.', '0' || FLDCP, FLDCP))\n" +
|
||||||
|
" ELSE TO_CHAR(FLDCP) END), ',') WITHIN GROUP (ORDER BY BGMD) AS VAL\n" +
|
||||||
|
" , ROW_NUMBER() OVER (PARTITION BY STCD ORDER BY TM DESC) RN\n" +
|
||||||
|
" FROM SD_RSVRFSR_B\n" +
|
||||||
|
" WHERE BGMD IS NOT NULL\n" +
|
||||||
|
" AND EDMD IS NOT NULL\n" +
|
||||||
|
" AND FLDCPMN IS NOT NULL\n" +
|
||||||
|
" AND FLDCPMN > 0\n" +
|
||||||
|
" GROUP BY STCD, TM ) temp\n" +
|
||||||
|
" GROUP BY STCD) b ON b.STCD = eng.STCD " +
|
||||||
"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 MS_ALONG_B along ON along.BASEID = eng.BASE_ID AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
|
||||||
"LEFT JOIN ( " +
|
"LEFT JOIN ( " +
|
||||||
" SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD " +
|
" SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD " +
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user