得到的

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/EnergyConsumptionAnalysisService.java

@@ -345,20 +345,21 @@ public class EnergyConsumptionAnalysisService {
                             "NVL( SUM( ELECTRICITY_CONSUMPTION_NP ), 0 ) AS ELECTRICITY_CONSUMPTION_NP",
                             "NVL( SUM( ELECTRICITY_CONSUMPTION_HH ), 0 ) AS ELECTRICITY_CONSUMPTION_HH",
                             "NVL( SUM( ELECTRICITY_CONSUMPTION_PH ), 0 ) AS ELECTRICITY_CONSUMPTION_PH",
-                    yearFlag ? "TO_CHAR( CREATE_DATE, 'YYYY-MM-' ) || '01' AS DATA_DATE" : "DATA_DATE");
+                            yearFlag ? "TO_CHAR( DATA_DATE, 'YYYY-MM-' ) || '01 00:00:00' AS DATA_DATE" : "DATA_DATE")
+                    .last(yearFlag ? "GROUP BY TO_CHAR( DATA_DATE, 'YYYY-MM-' )" : "GROUP BY data_date");
         } else {
             queryWrapper.select("IFNULL( SUM( ELECTRICITY_CHARGE_CITY ), 0 ) AS ELECTRICITY_CHARGE_CITY",
                             "IFNULL( SUM( ELECTRICITY_CONSUMPTION_VH ), 0 ) AS ELECTRICITY_CONSUMPTION_VH",
                             "IFNULL( SUM( ELECTRICITY_CONSUMPTION_NP ), 0 ) AS ELECTRICITY_CONSUMPTION_NP",
                             "IFNULL( SUM( ELECTRICITY_CONSUMPTION_HH ), 0 ) AS ELECTRICITY_CONSUMPTION_HH",
                             "IFNULL( SUM( ELECTRICITY_CONSUMPTION_PH ), 0 ) AS ELECTRICITY_CONSUMPTION_PH",
-                    yearFlag ? "DATE_FORMAT( DATA_DATE, '%Y-%M-01' ) AS DATA_DATE" : "DATA_DATE");
+                            yearFlag ? "DATE_FORMAT( DATA_DATE, '%Y-%M-01' ) AS DATA_DATE" : "DATA_DATE")
+                    .last(yearFlag ? "GROUP BY DATE_FORMAT( DATA_DATE, '%Y-%m-01')" : "GROUP BY DATA_DATE");
         }
         List<StationDailyProductionSituationEnt> list = context.getBean(StationDailyProductionSituationMapper.class)
                 .selectList(queryWrapper.lambda()
                         .between(StationDailyProductionSituationEnt::getDataDate, beginTime, endTime)
                         .in(StationDailyProductionSituationEnt::getStationName, lineNameSet)
-                        .last(yearFlag ? "GROUP BY DATE_FORMAT( data_date, '%Y-%m-01')" : "GROUP BY data_date")
                 );
         Map<Date, StationDailyProductionSituationEnt> collect;
         if (CollUtil.isEmpty(list)) {

C12-prediction/pps-core-prediction/src/main/resources/mybatis/mapper/pps/core/prediction/StationDailyProductionSituationViewMapper.xml

@@ -217,7 +217,7 @@
         D.STATION_NAME = Y.STATION_NAME
         <where>
             <if test="stationName != null and stationName !=''">
-                AND D.STATION_NAME LIKE '%', #{stationName}, '%'
+                AND D.STATION_NAME LIKE '%' || #{stationName} || '%'
             </if>
         </where>
         ORDER BY D.STATION_NAME