Prechádzať zdrojové kódy

[0917] 光伏电厂累计报表测试

taosj 1 mesiac pred
rodič
commit
831b41d690

+ 2 - 2
forecast-backend-server/src/main/java/com/ufo/project/data/service/impl/PvPlantCumulativeReportServiceImpl.java

@@ -83,8 +83,8 @@ public class PvPlantCumulativeReportServiceImpl implements IPvPlantCumulativeRep
         Long frequency = getCollectionFrequency();
 
         // 3. 构建时间参数(ISO 8601 格式)
-        String startStr = formatOffsetDateTime(query.getStartTime());
-        String endStr = formatOffsetDateTime(query.getEndTime());
+        String startStr = formatOffsetDateTime(query.getStartTime() + " 00:00:00");
+        String endStr = formatOffsetDateTime(query.getEndTime() + " 23:59:59");
 
         // 4. 获取气象数据和电力数据
         List<DataWeatherLocal> weatherList = weatherLocalService.selectWeatherFieldsByTimeRange(

+ 1 - 1
forecast-backend-vue/src/views/ufo/electricity/datareport/pvPlantCumulativeMonthlyReport.vue

@@ -102,7 +102,7 @@ const buildParams = () => ({
   type: query.type,
   entityId: query.stationId,
   startTime: dayjs(query.startTime).format('YYYY-MM') + '-01',
-  endTime: dayjs(query.endTime).endOf('month').format('YYYY-MM-DD HH:mm:ss')
+  endTime: dayjs(query.endTime).endOf('month').format('YYYY-MM-DD')
 });
 
 const handleQuery = async () => {

+ 2 - 2
forecast-backend-vue/src/views/ufo/electricity/datareport/pvPlantCumulativeYearlyReport.vue

@@ -103,8 +103,8 @@ const loadStationOptions = async () => {
 const buildParams = () => ({
   type: query.type,
   entityId: query.stationId,
-  startTime: dayjs(query.startTime).startOf('year').format('YYYY-MM-DD HH:mm:ss'),
-  endTime: dayjs(query.endTime).endOf('year').format('YYYY-MM-DD HH:mm:ss')
+  startTime: dayjs(query.startTime).startOf('year').format('YYYY-MM-DD'),
+  endTime: dayjs(query.endTime).endOf('year').format('YYYY-MM-DD')
 });
 
 const handleQuery = async () => {