Merge remote-tracking branch 'origin/master' into oracle_T001_202411121430

C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePriceStrategyCloudServiceImpl.java

 package pps.core.base.service;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.text.CharSequenceUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import pps.cloud.base.service.IBasePriceStrategyCloudService;
@@ -12,9 +14,9 @@ import pps.core.common.constant.BusinessConstant;
 import pps.core.common.entity.BaseModel;
 import xstartup.annotation.XService;
 import xstartup.base.XContext;
-import xstartup.base.util.XCopyUtils;
 import xstartup.data.XListResult;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -58,8 +60,36 @@ public class BasePriceStrategyCloudServiceImpl implements IBasePriceStrategyClou
         if (CollUtil.isEmpty(detailList)) {
             outputs = Collections.emptyList();
         } else {
-            outputs = XCopyUtils.copyNewList(detailList, GetBasePriceStrategyDetailOutput.class);
+            outputs = new ArrayList<>(detailList.size());
+            GetBasePriceStrategyDetailOutput output;
+            for (BasePriceStrategyDetailEnt ent : detailList) {
+                output = new GetBasePriceStrategyDetailOutput();
+                output.setStrategyId(ent.getStrategyId());
+                output.setStrategyMonth(ent.getStrategyMonth());
+                output.setPeriodTypeKey(ent.getPeriodTypeKey());
+                output.setStartTime(ent.getStartTime());
+                output.setEndTime(ent.getEndTime());
+                output.setOpenTime(this.strToDateTime(ent.getStartTime()));
+                output.setCloseTime(this.strToDateTime(ent.getEndTime()));
+                output.setElectrovalence(ent.getElectrovalence());
+                outputs.add(output);
+            }
         }
         return XListResult.success(outputs);
     }
+
+    /**
+     * 字符串转日期时间
+     *
+     * @param dateStr 日期str
+     * @return {@link DateTime }
+     */
+    private DateTime strToDateTime(String dateStr) {
+        //转换开始时间和结束时间(开始时间不能为24:00)
+        if (CharSequenceUtil.equals(dateStr, BusinessConstant.END_OF_DAY_TIME)) {
+            return BusinessConstant.DATE_FLAG;
+        } else {
+            return DateUtil.parse(dateStr + BusinessConstant.INITIALIZATION_SECOND, BusinessConstant.TIME_FORMAT);
+        }
+    }
 }
\ No newline at end of file