feat(吉林演示): 松原

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceYesterdayGreenRateCloudServiceImpl.java

@@ -37,9 +37,10 @@ public class SpaceYesterdayGreenRateCloudServiceImpl extends SpaceOptimizeBaseSe
                 .optimizeDate(beginOfYesterday)
                 .build());
         if (CollUtil.isEmpty(durationViewList)) {
-
+            return XServiceResult.OK;
         }
 
+
         return XServiceResult.OK;
     }
 }
\ No newline at end of file

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

@@ -160,7 +160,8 @@
 
     <select id="selectResultList" resultMap="ExtendsResultMap"
             parameterType="pps.core.space.entity.SpaceOptimizeShortDurationView">
-        SELECT w.short_period_id,
+        SELECT p.line_id,
+               l.line_name,
                w.well_number,
                w.wellhead_id,
                w.start_seq,
@@ -168,11 +169,13 @@
                d.is_optimize,
                d.open_well_time,
                d.close_well_time
-        FROM space_optimize_short_wellhead w
+        FROM space_optimize_short_period p
+                 JOIN base_power_line l ON p.line_id = l.id
+                 JOIN space_optimize_short_wellhead w ON p.id = w.short_period_id
                  JOIN base_wellhead b ON w.wellhead_id = b.id
                  JOIN space_optimize_short_duration d ON w.id = d.record_id
-        WHERE w.optimize_date = #{optimizeDate}
-        ORDER BY w.short_period_id,
+        WHERE p.optimize_date = #{optimizeDate}
+        ORDER BY p.line_id,
                  w.well_number,
                  w.start_seq,
                  d.is_optimize,