From 5de4db2e60ff62c9a791c3b9b769623fd2fe3239 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期二, 06 五月 2025 17:19:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/dto/CokingOverviewDTO.java |   91 +++++++++++++++++++++++++++++++++++----------
 1 files changed, 71 insertions(+), 20 deletions(-)

diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/dto/CokingOverviewDTO.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/dto/CokingOverviewDTO.java
index 5955cfc..e20022e 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/dto/CokingOverviewDTO.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/dto/CokingOverviewDTO.java
@@ -15,69 +15,85 @@
 public class CokingOverviewDTO {
 
     @TableId(type = IdType.ASSIGN_UUID)
-	private String id;
+    private String id;
     /**
      * 关联ID
      */
-	private String relId;
+    private String relId;
     /**
      * 工序类型
      */
-	private String processType;
+    private String processType;
     /**
      * 工序类型名称
      */
-	private String processTypeName;
+    private String processTypeName;
     /**
      * 子工序类型
      */
-	private String subProcessType;
+    private String subProcessType;
     /**
      * 子工序类型名称
      */
-	private String subProcessTypeName;
+    private String subProcessTypeName;
     /**
      * 查询时间
      */
-	private String clock;
+    private String clock;
     /**
-     * 蒸汽发生
+     * 蒸汽发生/总产生
      */
-	private BigDecimal steamP;
+    private BigDecimal steamP;
     /**
-     * 蒸汽消耗
+     * 吨焦产蒸汽
      */
-	private BigDecimal steamC;
+    private BigDecimal djSteamP;
+    /**
+     * 蒸汽消耗/总耗
+     */
+    private BigDecimal steamC;
+    /**
+     * 蒸汽单耗
+     */
+    private BigDecimal steamOnlyC;
     /**
      * 蒸汽量
      */
-	private BigDecimal steamV;
+    private BigDecimal steamV;
     /**
      * 煤气发生
      */
-	private BigDecimal gasP;
+    private BigDecimal gasP;
     /**
      * 煤气消耗
      */
-	private BigDecimal gasC;
+    private BigDecimal gasC;
     /**
-     * 电力消耗
+     * 电力消耗/总耗
      */
-	private BigDecimal powerC;
+    private BigDecimal powerC;
+    /**
+     * 电力单耗
+     */
+    private BigDecimal powerOnlyC;
+    /**
+     * 电耗基准
+     */
+    private BigDecimal powerCStandard;
     /**
      * 空转时间
      */
-	private BigDecimal idleTime;
+    private BigDecimal idleTime;
     /**
-     * BFG消耗
+     * BFG消耗/总耗
      */
     private BigDecimal bfgC;
     /**
-     * cog回收
+     * COG回收
      */
     private BigDecimal cogP;
     /**
-     * cog消耗
+     * COG消耗/总耗
      */
     private BigDecimal cogC;
 
@@ -90,4 +106,39 @@
      * cog单耗
      */
     private BigDecimal cogOnlyC;
+
+    /**
+     * 干熄炉数
+     */
+    private BigDecimal gxls;
+
+    /**
+     * 峰时占比
+     */
+    private BigDecimal fsRatio;
+
+    /**
+     * 谷时占比
+     */
+    private BigDecimal gsRatio;
+
+    /**
+     * 平时占比
+     */
+    private BigDecimal psRatio;
+
+//    /**
+//     * 峰时占比-月累计
+//     */
+//    private BigDecimal fsRatioMonth;
+//
+//    /**
+//     * 谷时占比-月累计
+//     */
+//    private BigDecimal gsRatioMonth;
+//
+//    /**
+//     * 平时占比-月累计
+//     */
+//    private BigDecimal psRatioMonth;
 }
\ No newline at end of file

--
Gitblit v1.9.3