diff --git a/backend/src/main/java/com/yfd/platform/qgc_eng/eq/entity/vo/EngEqVmsstbprptVo.java b/backend/src/main/java/com/yfd/platform/qgc_eng/eq/entity/vo/EngEqVmsstbprptVo.java index e3a444c1..c2fdff5e 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_eng/eq/entity/vo/EngEqVmsstbprptVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_eng/eq/entity/vo/EngEqVmsstbprptVo.java @@ -4,6 +4,8 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; @Data @Schema(description = "电站统计查询") @@ -26,9 +28,22 @@ public class EngEqVmsstbprptVo implements Serializable { @Schema(description = "工程名称") private String ennm; + @Schema(description = "总投运容量") + private Double ttcp; + @Schema(description = "基地编码") private String baseId; + /** + * 开发方式 字典编码：sd_enginfo_b_h.dvtp 1=堤坝式 2=引水式 3=混合式 + */ + @Schema(description = "开发方式") + private String dvtp; + + + @Schema(description = "开发方式名称") + private String dvtpName; + @Schema(description = "基地名称") private String baseName; @@ -38,6 +53,12 @@ public class EngEqVmsstbprptVo implements Serializable { @Schema(description = "基地流域名称") private String hbrvcdName; + @Schema(description = "行政区") + private String addvcd; + + @Schema(description = "行政区名称") + private String addvcdName; + @Schema(description = "流域编码") private String rvcd; @@ -50,15 +71,30 @@ public class EngEqVmsstbprptVo implements Serializable { @Schema(description = "建设状态") private String bldstt; + @Schema(description = "装机容量") + private BigDecimal ttpwr; + @Schema(description = "建设状态分类") private Integer bldsttCcode; + @Schema(description = "建设状态分类") + private String bldsttCcodeName; + @Schema(description = "环保数据接入状态") private Integer dtinEnv; @Schema(description = "接入状态") private Integer dtin; + @Schema(description = "多年平均发电量") + private BigDecimal yrge; + + @Schema(description = "首台机组投运时间") + private Date piodt; + + @Schema(description = "所有机组投运时间") + private Date aiodt; + @Schema(description = "基地排序") private Integer baseStepSort; diff --git a/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java index b1801412..61e8914e 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java @@ -1122,7 +1122,7 @@ public class EngEqDataServiceImpl implements EngEqDataService { .append("WHERE NVL(eng.IS_DELETED, 0) = 0 ") .append("AND NVL(eng.DTIN, 0) = 1 ") .append("AND NVL(eng.BLDSTT_CODE, 0) IN (1, 2) ") - .append("AND EXISTS (SELECT 1 FROM SD_QEC_R qec WHERE qec.STCD = eng.STCD AND NVL(qec.IS_DELETED, 0) = 0) "); + .append("AND RUN_STATE = 4 "); if (StrUtil.isNotBlank(baseId)) { sql.append("AND eng.BASE_ID = #{map.baseId} "); paramMap.put("baseId", baseId); @@ -3371,7 +3371,11 @@ public class EngEqDataServiceImpl implements EngEqDataService { "'电站' AS sttpName, " + "eng.STCD AS stcd, " + "pbh.TTPWR AS ttpwr, " + + "pbh.YRGE AS yrge, " + "eng.ENNM AS stnm, " + + "eng.PIODT AS piodt, " + + "CAST(16.39 AS NUMBER) AS ttcp,"+ + "eng.AIODT AS aiodt, " + "eng.ENNM AS ennm, " + "eng.BASE_ID AS baseId, " + "hb.BASENAME AS baseName, " + @@ -3380,9 +3384,14 @@ public class EngEqDataServiceImpl implements EngEqDataService { "eng.RVCD AS rvcd, " + "rv.RVNM AS rvcdName, " + "eng.PRSC AS prsc, " + + "eng.DVTP AS dvtp, " + + "eng.ADDVCD AS addvcd, " + + "ad.ADDVNM AS addvcdName, " + + "CASE eng.DVTP WHEN '1' THEN '堤坝式' WHEN '2' THEN '引水式' WHEN '3' THEN '混合式' ELSE '未知' END AS dvtpName,"+ "eng.RUN_STATE AS runState, " + "eng.BLDSTT AS bldstt, " + "eng.BLDSTT_CODE AS bldsttCcode, " + + "CASE WHEN eng.BLDSTT_CODE =2 THEN '已建' WHEN eng.BLDSTT_CODE =1 THEN '在建' ELSE '未建/规划' END AS bldsttCcodeName, " + "eng.DTIN_ENV AS dtinEnv, " + "eng.DTIN AS dtin, " + "NVL(hb.ORDER_INDEX, 999999) AS baseStepSort, " + @@ -3393,6 +3402,7 @@ public class EngEqDataServiceImpl implements EngEqDataService { "INNER JOIN SD_PWR_B_H pbh ON pbh.STCD= eng.STCD " + "LEFT JOIN SD_HYDROBASE hb ON hb.BASEID = eng.BASE_ID AND NVL(hb.IS_DELETED, 0) = 0 " + "LEFT JOIN SD_HBRV_DIC hbrv ON hbrv.HBRVCD = eng.HBRVCD AND hbrv.BASEID = eng.BASE_ID " + + "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 " + @@ -3424,7 +3434,11 @@ public class EngEqDataServiceImpl implements EngEqDataService { columns.put("sttpName", "t.sttpName AS sttpName"); columns.put("stcd", "t.stcd AS stcd"); columns.put("stnm", "t.stnm AS stnm"); + columns.put("yrge", "t.yrge AS yrge"); + columns.put("piodt", "t.piodt AS piodt"); + columns.put("aiodt", "t.aiodt AS aiodt"); columns.put("ennm", "t.ennm AS ennm"); + columns.put("ttcp", "t.ttcp AS ttcp"); columns.put("baseId", "t.baseId AS baseId"); columns.put("baseName", "t.baseName AS baseName"); columns.put("hbrvcd", "t.hbrvcd AS hbrvcd"); @@ -3432,8 +3446,14 @@ public class EngEqDataServiceImpl implements EngEqDataService { columns.put("rvcd", "t.rvcd AS rvcd"); columns.put("rvcdName", "t.rvcdName AS rvcdName"); columns.put("prsc", "t.prsc AS prsc"); + columns.put("dvtp", "t.dvtp AS dvtp"); + columns.put("dvtpName", "t.dvtpName AS dvtpName"); + columns.put("addvcd", "t.addvcd AS addvcd"); + columns.put("addvcdName", "t.addvcdName AS addvcdName"); columns.put("bldstt", "t.bldstt AS bldstt"); + columns.put("ttpwr", "t.ttpwr AS ttpwr"); columns.put("bldsttCcode", "t.bldsttCcode AS bldsttCcode"); + columns.put("bldsttCcodeName", "t.bldsttCcodeName AS bldsttCcodeName"); columns.put("dtin", "t.dtin AS dtin"); columns.put("runState", "t.runState AS runState"); columns.put("dtinEnv", "t.dtinEnv AS dtinEnv");