fix: 优化逻辑

backend/src/main/java/com/yfd/platform/qgc_eng/eq/entity/vo/EngEqBaseVmsstbprptVo.java

@@ -28,4 +28,37 @@ public class EngEqBaseVmsstbprptVo extends EngEqMsstbprptVo {
 
     @Schema(description = "设施排序")
     private Integer siteStepSort;
+
+    @Schema(description = "死水位时保证流量")
+    private Double ddzgq;
+
+    @Schema(description = "最大泄放流量")
+    private String flkq;
+
+    @Schema(description = "孔口尺寸")
+    private String flksz;
+
+    @Schema(description = "结构形式")
+    private String frntwlltyp;
+
+    @Schema(description = "进水口底版高程")
+    private Double jskgc;
+
+    @Schema(description = "出水口底版高程")
+    private Double outflrelev;
+
+    @Schema(description = "基荷发电工况")
+    private Double jhfdgk;
+
+    @Schema(description = "发电流量")
+    private Double fdll;
+
+    @Schema(description = "生态机组额定流量")
+    private Double stjzysq;
+
+    @Schema(description = "装机容量")
+    private Double ttpwr;
+
+    @Schema(description = "所属建设阶段名称")
+    private String blprdName;
 }

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

@@ -426,6 +426,20 @@ public class EngEqDataServiceImpl implements EngEqDataService {
                 "eng.TOP_HYCD AS topHycd, " +
                 "eng.TOP_HYNM AS topHynm, " +
                 "eq.BLPRD AS blprd, " +
+                "CASE eq.BLPRD " +
+                "  WHEN 1001000 THEN '规划' " +
+                "  WHEN 1002000 THEN '预可研' " +
+                "  WHEN 1003000 THEN '环评' " +
+                "  WHEN 1004000 THEN '可研' " +
+                "  WHEN 1005000 THEN '在建' " +
+                "  WHEN 1006000 THEN '招标设计' " +
+                "  WHEN 1007000 THEN '施工详图' " +
+                "  WHEN 1009000 THEN '建设' " +
+                "  WHEN 1010000 THEN '蓄水阶段环保验收' " +
+                "  WHEN 1011000 THEN '竣工' " +
+                "  WHEN 1012000 THEN '竣工环保验收' " +
+                "  WHEN 1013000 THEN '环境影响后评价' " +
+                "  ELSE NULL END AS blprdName, " +
                 "eq.LGTD AS lgtd, " +
                 "eq.LTTD AS lttd, " +
                 "eq.ELEV AS elev, " +
@@ -444,6 +458,16 @@ public class EngEqDataServiceImpl implements EngEqDataService {
                 "eng.BLDSTT_CODE AS bldsttCode, " +
                 "TO_CHAR(eng.BLDSTT_CODE) AS bldsttCcode, " +
                 "CASE NVL(eng.BLDSTT_CODE, -1) WHEN 0 THEN '未建/规划' WHEN 1 THEN '在建' WHEN 2 THEN '已建' ELSE NULL END AS bldsttCcodeName, " +
+                "eq.DDZGQ AS ddzgq, " +
+                "eq.FLKQ AS flkq, " +
+                "eq.FLKSZ AS flksz, " +
+                "eq.FLKJG AS frntwlltyp, " +
+                "eq.JSKDBGC AS jskgc, " +
+                "eq.CSKDBGC AS outflrelev, " +
+                "eq.JHFDGK AS jhfdgk, " +
+                "eq.FDLL AS fdll, " +
+                "eq.STJZYSQ AS stjzysq, " +
+                "eq.STJZZJRL AS ttpwr, " +
                 "NVL(hb.ORDER_INDEX, 999999) AS baseStepSort, " +
                 "NVL(along.ORDER_INDEX, 999999) AS rvcdStepSort, " +
                 "NVL(eng.ORDER_INDEX, 999999) AS rstcdStepSort, " +
@@ -513,6 +537,7 @@ public class EngEqDataServiceImpl implements EngEqDataService {
         columns.put("topHycd", "t.topHycd AS topHycd");
         columns.put("topHynm", "t.topHynm AS topHynm");
         columns.put("blprd", "t.blprd AS blprd");
+        columns.put("blprdName", "t.blprdName AS blprdName");
         columns.put("lgtd", "t.lgtd AS lgtd");
         columns.put("lttd", "t.lttd AS lttd");
         columns.put("elev", "t.elev AS elev");
@@ -530,6 +555,16 @@ public class EngEqDataServiceImpl implements EngEqDataService {
         columns.put("bldstt", "t.bldstt AS bldstt");
         columns.put("bldsttCcode", "t.bldsttCcode AS bldsttCcode");
         columns.put("bldsttCcodeName", "t.bldsttCcodeName AS bldsttCcodeName");
+        columns.put("ddzgq", "t.ddzgq AS ddzgq");
+        columns.put("flkq", "t.flkq AS flkq");
+        columns.put("flksz", "t.flksz AS flksz");
+        columns.put("frntwlltyp", "t.frntwlltyp AS frntwlltyp");
+        columns.put("jskgc", "t.jskgc AS jskgc");
+        columns.put("outflrelev", "t.outflrelev AS outflrelev");
+        columns.put("jhfdgk", "t.jhfdgk AS jhfdgk");
+        columns.put("fdll", "t.fdll AS fdll");
+        columns.put("stjzysq", "t.stjzysq AS stjzysq");
+        columns.put("ttpwr", "t.ttpwr AS ttpwr");
         columns.put("orderIndex", "t.orderIndex AS orderIndex");
         columns.put("tm", "t.tm AS tm");
         columns.put("bldsttCode", "t.bldsttCode AS bldsttCode");