feat(吉林演示): 松原

1.开发间开优化结果统计功能,创建间开优化效果统计表,生成对应代码;
2.修改15天,10天,3天,1天间开优化功能,修改代码结构;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -40,6 +40,10 @@ public class SpaceOptimizeEffectEnt extends BaseModel implements Serializable {
     @TableField
     private String optimalResult;
 
+    @XText("优化前制度描述")
+    @TableField
+    private String institutionResult;
+
     @XText("优化前总开井时长(min)")
     @TableField
     private BigDecimal totalDuration;

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

@@ -38,6 +38,10 @@ public class SpaceOptimizeEffectView extends BaseModel implements Serializable {
     @TableField
     private String optimalResult;
 
+    @XText("优化前制度描述")
+    @TableField
+    private String institutionResult;
+
     @XText("优化前总开井时长(min)")
     @TableField
     private BigDecimal totalDuration;

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

@@ -14,6 +14,7 @@
         <result column="wellhead_id" property="wellheadId" jdbcType="VARCHAR"/>
         <result column="well_number" property="wellNumber" jdbcType="VARCHAR"/>
         <result column="optimize_date" property="optimizeDate" jdbcType="DATE"/>
+        <result column="institution_result" property="institutionResult" jdbcType="VARCHAR"/>
         <result column="optimal_result" property="optimalResult" jdbcType="VARCHAR"/>
         <result column="total_duration" property="totalDuration" jdbcType="DECIMAL"/>
         <result column="green_power_duration" property="greenPowerDuration" jdbcType="DECIMAL"/>
@@ -86,7 +87,8 @@
     optimal_peak_power_cost,
     optimal_power_cost,
     green_power_upgrade,
-    cost_down
+    cost_down,
+    institution_result
     </sql>
     <select id="selectOne" parameterType="pps.core.space.entity.SpaceOptimizeEffectView" resultMap="BaseResultMap">
         select
@@ -144,7 +146,8 @@
         optimal_peak_power_cost,
         optimal_power_cost,
         green_power_upgrade,
-        cost_down )
+        cost_down,
+        institution_result)
         VALUES
         <foreach collection="list" item="item" separator=",">
             (
@@ -188,7 +191,8 @@
             #{item.optimalPeakPowerCost},
             #{item.optimalPowerCost},
             #{item.greenPowerUpgrade},
-            #{item.costDown}
+            #{item.costDown},
+            #{item.institutionResult}
             )
         </foreach>
     </insert>