From f26ee8d9dc2173897c89d4e9cca89c62dac66b48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E4=B9=BE=E7=BF=94?= Date: Fri, 24 Apr 2026 17:58:37 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BsDischargeRecServiceImpl.java | 7 +++++-- .../service/impl/BsDosingRecServiceImpl.java | 7 +++++-- .../service/impl/BsInsTestServiceImpl.java | 7 +++++-- .../BsSafePatrolInspectionServiceImpl.java | 19 +++++++++++++------ .../impl/BsWasteGasRunRecServiceImpl.java | 14 ++++++++++---- 5 files changed, 38 insertions(+), 16 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsDischargeRecServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsDischargeRecServiceImpl.java index a5ee32ef..f2dbd743 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsDischargeRecServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsDischargeRecServiceImpl.java @@ -69,8 +69,11 @@ public class BsDischargeRecServiceImpl extends BaseServiceImpl selectBsDischargeRecPage(IPage page, BsDischargeRecVO bsDischargeRec) { if(StringUtils.isNotEmpty(bsDischargeRec.getQueryDirDate())){ - bsDischargeRec.setStartDate(bsDischargeRec.getQueryDirDate().split(",")[0]); - bsDischargeRec.setEndDate(bsDischargeRec.getQueryDirDate().split(",")[1]); + String[] dates = bsDischargeRec.getQueryDirDate().split(","); + if (dates.length >= 2) { + bsDischargeRec.setStartDate(dates[0]); + bsDischargeRec.setEndDate(dates[1]); + } } return page.setRecords(baseMapper.selectBsDischargeRecPage(page, bsDischargeRec)); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsDosingRecServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsDosingRecServiceImpl.java index 20c7f52d..4930b017 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsDosingRecServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsDosingRecServiceImpl.java @@ -58,8 +58,11 @@ public class BsDosingRecServiceImpl extends BaseServiceImpl selectBsDosingRecPage(IPage page, BsDosingRecVO bsDosingRec) { if(StringUtils.isNotEmpty(bsDosingRec.getQueryDosingTime())){ - bsDosingRec.setStartDate(bsDosingRec.getQueryDosingTime().split(",")[0]); - bsDosingRec.setEndDate(bsDosingRec.getQueryDosingTime().split(",")[1]); + String[] dates = bsDosingRec.getQueryDosingTime().split(","); + if (dates.length >= 2) { + bsDosingRec.setStartDate(dates[0]); + bsDosingRec.setEndDate(dates[1]); + } } return page.setRecords(baseMapper.selectBsDosingRecPage(page, bsDosingRec)); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsInsTestServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsInsTestServiceImpl.java index 21938538..c875c89e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsInsTestServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsInsTestServiceImpl.java @@ -51,8 +51,11 @@ public class BsInsTestServiceImpl extends BaseServiceImpl selectBsInsTestPage(IPage page, BsInsTestVO bsInsTest) { if(StringUtils.isNotEmpty(bsInsTest.getQueryDosingTime())){ - bsInsTest.setStartDate(bsInsTest.getQueryDosingTime().split(",")[0]); - bsInsTest.setEndDate(bsInsTest.getQueryDosingTime().split(",")[1]); + String[] dates = bsInsTest.getQueryDosingTime().split(","); + if (dates.length >= 2) { + bsInsTest.setStartDate(dates[0]); + bsInsTest.setEndDate(dates[1]); + } } return page.setRecords(baseMapper.selectBsInsTestPage(page, bsInsTest)); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsSafePatrolInspectionServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsSafePatrolInspectionServiceImpl.java index 84df7a10..dbcce6d4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsSafePatrolInspectionServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsSafePatrolInspectionServiceImpl.java @@ -26,6 +26,7 @@ package org.springblade.desk.energy.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -59,12 +60,18 @@ public class BsSafePatrolInspectionServiceImpl extends BaseServiceImpl selectBsSafePatrolInspectionPage(IPage page, BsSafePatrolInspectionVO bsSafePatrolInspection) { - if(bsSafePatrolInspection.getQueryLaunchTime()!=null){ - bsSafePatrolInspection.setStartDate(bsSafePatrolInspection.getQueryLaunchTime().split(",")[0]); - bsSafePatrolInspection.setEndDate(bsSafePatrolInspection.getQueryLaunchTime().split(",")[1]); + if(StrUtil.isNotEmpty(bsSafePatrolInspection.getQueryLaunchTime())){ + String[] launchDates = bsSafePatrolInspection.getQueryLaunchTime().split(","); + if (launchDates.length >= 2) { + bsSafePatrolInspection.setStartDate(launchDates[0]); + bsSafePatrolInspection.setEndDate(launchDates[1]); + } }else if(StringUtils.isNotEmpty(bsSafePatrolInspection.getQueryTestTime())){ - bsSafePatrolInspection.setStartTestDate(bsSafePatrolInspection.getQueryTestTime().split(",")[0]); - bsSafePatrolInspection.setEndTestDate(bsSafePatrolInspection.getQueryTestTime().split(",")[1]); + String[] testDates = bsSafePatrolInspection.getQueryTestTime().split(","); + if (testDates.length >= 2) { + bsSafePatrolInspection.setStartTestDate(testDates[0]); + bsSafePatrolInspection.setEndTestDate(testDates[1]); + } } return page.setRecords(baseMapper.selectBsSafePatrolInspectionPage(page, bsSafePatrolInspection)); } @@ -133,7 +140,7 @@ public class BsSafePatrolInspectionServiceImpl extends BaseServiceImpl selectBsWasteGasRunRecPage(IPage page, BsWasteGasRunRecVO bsWasteGasRunRec) { if(StringUtils.isNotEmpty(bsWasteGasRunRec.getQueryStartTime())){ - bsWasteGasRunRec.setStartStart(bsWasteGasRunRec.getQueryStartTime().split(",")[0]); - bsWasteGasRunRec.setStartEnd(bsWasteGasRunRec.getQueryStartTime().split(",")[1]); + String[] startDates = bsWasteGasRunRec.getQueryStartTime().split(","); + if (startDates.length >= 2) { + bsWasteGasRunRec.setStartStart(startDates[0]); + bsWasteGasRunRec.setStartEnd(startDates[1]); + } } if(StringUtils.isNotEmpty(bsWasteGasRunRec.getQueryEndTime())){ - bsWasteGasRunRec.setEndStart(bsWasteGasRunRec.getQueryEndTime().split(",")[0]); - bsWasteGasRunRec.setEndEnd(bsWasteGasRunRec.getQueryEndTime().split(",")[1]); + String[] endDates = bsWasteGasRunRec.getQueryEndTime().split(","); + if (endDates.length >= 2) { + bsWasteGasRunRec.setEndStart(endDates[0]); + bsWasteGasRunRec.setEndEnd(endDates[1]); + } } return page.setRecords(baseMapper.selectBsWasteGasRunRecPage(page, bsWasteGasRunRec)); }