得到的

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

@@ -109,18 +109,18 @@ public class SpaceOptimizeBaseService {
         int month = startDate.monthBaseOne();
         //查井口配置时间段
         SpaceInstitutionDurationMapper durationMapper = context.getBean(SpaceInstitutionDurationMapper.class);
-        List<SpaceInstitutionDurationEnt> durationList = durationMapper.selectList(new QueryWrapper<SpaceInstitutionDurationEnt>()
-                .select("*",
-                        "STR_TO_DATE( CONCAT( open_well_time, ':00' ), '%H:%i:%s' ) AS openTime",
-                        "STR_TO_DATE( CONCAT( close_well_time, ':00' ), '%H:%i:%s' ) AS closeTime"
-                )
-                .lambda()
+        List<SpaceInstitutionDurationEnt> durationList = durationMapper.selectList(new LambdaQueryWrapper<SpaceInstitutionDurationEnt>()
                 .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
                 .in(SpaceInstitutionDurationEnt::getWellheadId, spaceWellheadList.stream().map(SpaceInstitutionWellheadView::getWellheadId).collect(Collectors.toList()))
                 .orderByAsc(SpaceInstitutionDurationEnt::getOpenWellTime)
         );
         if (CollUtil.isEmpty(durationList)) {
             throw new XServiceException(BusinessError.DidNotFindCalibration);
+        } else {
+            for (SpaceInstitutionDurationEnt ent : durationList) {
+                ent.setOpenTime(BaseUtils.strToDateTime(ent.getOpenWellTime()));
+                ent.setCloseTime(BaseUtils.strToDateTime(ent.getCloseWellTime()));
+            }
         }
         //间开制度ID/井口LIST Map
         Map<String, List<SpaceInstitutionWellheadView>> wellheadMap = spaceWellheadList.stream()

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

@@ -360,11 +360,8 @@
             </when>
             <otherwise>
                 CASE
-                MINUTE ( DATA_DATE )
-                WHEN 15 THEN
-                DATE_SUB( DATA_DATE, INTERVAL 15 MINUTE )
-                WHEN 45 THEN
-                DATE_SUB( DATA_DATE, INTERVAL 15 MINUTE ) ELSE DATA_DATE
+                WHEN EXTRACT( MINUTE FROM CAST( TO_DATE( DATA_DATE, 'YYYY-MM-DD HH24:MI:SS' ) AS TIMESTAMP ) ) IN ( 15, 45 ) THEN
+                TO_DATE( DATA_DATE, 'YYYY-MM-DD HH24:MI:SS' ) - NUMTODSINTERVAL( 15, 'MINUTE' ) ELSE TO_DATE( DATA_DATE, 'YYYY-MM-DD HH24:MI:SS' )
                 END
             </otherwise>
         </choose>
@@ -412,7 +409,7 @@
                 END
             </otherwise>
         </choose>
-        , '%H:%i:%s' ) AS CREATE_TIME
+        , 'HH24:MI:SS' ) AS CREATE_TIME
         FROM
         PLANT_PREDICTED_POWER_SHORT_TERM
         WHERE
@@ -448,11 +445,10 @@
             </when>
             <otherwise>
                 CASE
-                MINUTE ( DATA_DATE )
-                WHEN 15 THEN
-                DATE_SUB( DATA_DATE, INTERVAL 15 MINUTE )
-                WHEN 45 THEN
-                DATE_SUB( DATA_DATE, INTERVAL 15 MINUTE ) ELSE DATA_DATE
+                WHEN EXTRACT( MINUTE FROM CAST( TO_DATE( DATA_DATE, 'YYYY-MM-DD HH24:MI:SS' ) AS TIMESTAMP ) ) IN ( 15,
+                45 ) THEN
+                TO_DATE( DATA_DATE, 'YYYY-MM-DD HH24:MI:SS' ) - NUMTODSINTERVAL( 15, 'MINUTE' ) ELSE TO_DATE( DATA_DATE,
+                'YYYY-MM-DD HH24:MI:SS' )
                 END
             </otherwise>
         </choose>