feat(能源管理系统): 间开制度管理

1.开发中短期间开优化模块-中短期优化详情接口,完成接口冒烟测试并生成接口文档;
2.开发间开优化历史模块-优化历史分页列表接口,完成接口冒烟测试并生成接口文档;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceInstitutionDetailView.java

@@ -63,6 +63,13 @@ public class SpaceInstitutionDetailView extends BaseModel implements Serializabl
     @TableField
     private Integer startInterval;
 
+    /**
+     * 长期优化周期ID
+     */
+    @XText("长期优化周期ID")
+    @TableField(exist = false)
+    private String longPeriodId;
+
     /**
      * 长期优化周期
      */
@@ -77,6 +84,13 @@ public class SpaceInstitutionDetailView extends BaseModel implements Serializabl
     @TableField(exist = false)
     private String longOptimizeDeadline;
 
+    /**
+     * 中短期优化周期ID
+     */
+    @XText("中短期优化周期ID")
+    @TableField(exist = false)
+    private String midPeriodId;
+
     /**
      * 中短期优化周期
      */

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_institution_detail/QueryOptimizeHistoryViewOutput.java

@@ -30,12 +30,18 @@ public class QueryOptimizeHistoryViewOutput {
     @XText("制度名称")
     private String institutionName;
 
+    @XText("长期优化周期ID")
+    private String longPeriodId;
+
     @XText("长期优化周期")
     private String longExecutionCycle;
 
     @XText("长期优化时间")
     private String longOptimizeDeadline;
 
+    @XText("中短期优化周期ID")
+    private String midPeriodId;
+
     @XText("中短期优化周期")
     private String midExecutionCycle;
 

C11-space/pps-core-space/src/main/resources/mybatis/mapper/pps/core/space/SpaceInstitutionDetailViewMapper.xml

@@ -60,8 +60,10 @@
     </select>
 
     <resultMap id="ExtendResultMap" type="pps.core.space.entity.SpaceInstitutionDetailView" extends="BaseResultMap">
+        <result column="long_period_id" property="longPeriodId" jdbcType="VARCHAR"/>
         <result column="long_execution_cycle" property="longExecutionCycle" jdbcType="VARCHAR"/>
         <result column="long_optimize_deadline" property="longOptimizeDeadline" jdbcType="VARCHAR"/>
+        <result column="mid_period_id" property="midPeriodId" jdbcType="VARCHAR"/>
         <result column="mid_execution_cycle" property="midExecutionCycle" jdbcType="VARCHAR"/>
         <result column="mid_optimize_deadline" property="midOptimizeDeadline" jdbcType="VARCHAR"/>
     </resultMap>
@@ -83,14 +85,16 @@
                                     WHERE is_current_basic = 0
                                       AND ou_id = #{ouId}),
              long_period
-                 AS (SELECT row_number() over ( PARTITION BY institution_id ORDER BY optimize_deadline DESC ) AS line_number, institution_id,
+                 AS (SELECT row_number() over ( PARTITION BY institution_id ORDER BY optimize_deadline DESC ) AS line_number,id,
+                            institution_id,
                             execution_cycle,
                             optimize_state,
                             optimize_deadline
                      FROM space_optimize_long_period
                      WHERE institution_id IN (SELECT id FROM institution_detail)),
              mid_period
-                 AS (SELECT row_number() over ( PARTITION BY institution_id ORDER BY optimize_deadline DESC ) AS line_number, institution_id,
+                 AS (SELECT row_number() over ( PARTITION BY institution_id ORDER BY optimize_deadline DESC ) AS line_number,id,
+                            institution_id,
                             execution_cycle,
                             optimize_state,
                             optimize_deadline
@@ -101,8 +105,10 @@
                d.line_id,
                d.grid_type_key,
                d.institution_name,
+               l.id                AS long_period_id,
                l.execution_cycle   AS long_execution_cycle,
                l.optimize_deadline AS long_optimize_deadline,
+               m.id                AS mid_period_id,
                m.execution_cycle   AS mid_execution_cycle,
                m.optimize_deadline AS mid_optimize_deadline
         FROM institution_detail d