feat(吉林演示): 松原

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -2073,14 +2073,14 @@ public class SpaceOptimizeBaseService {
                     //封装能耗分析
                     if (effectMap.containsKey(w.getWellheadId())) {
                         effect = effectMap.get(w.getWellheadId());
-                        costDown = effect.getCostDown();
-                        //降低成本大于等于0才优化
-                        isOptimal = costDown.compareTo(BigDecimal.ZERO) >= 0;
+                        greenPowerUpgrade = effect.getGreenPowerUpgrade();
+                        //绿电占比大于等于0才优化
+                        isOptimal = greenPowerUpgrade.compareTo(BigDecimal.ZERO) >= 0;
                         if (isOptimal) {
                             optimalResult = effect.getOptimalResult();
                             optimalGreenPowerRate = effect.getOptimalGreenPowerRate();
                             optimalPowerCost = effect.getOptimalPowerCost();
-                            greenPowerUpgrade = effect.getGreenPowerUpgrade();
+                            costDown = effect.getCostDown();
                         } else {
                             optimalResult = effect.getInstitutionResult();
                             optimalGreenPowerRate = effect.getGreenPowerRate();