页面查询bug

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsDischargeRecServiceImpl.java

@@ -69,8 +69,11 @@ public class BsDischargeRecServiceImpl extends BaseServiceImpl<BsDischargeRecMap
 	@Override
 	public IPage<BsDischargeRecVO> selectBsDischargeRecPage(IPage<BsDischargeRecVO> 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));
 	}

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsDosingRecServiceImpl.java

@@ -58,8 +58,11 @@ public class BsDosingRecServiceImpl extends BaseServiceImpl<BsDosingRecMapper, B
 	@Override
 	public IPage<BsDosingRecVO> selectBsDosingRecPage(IPage<BsDosingRecVO> 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));
 	}

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsInsTestServiceImpl.java

@@ -51,8 +51,11 @@ public class BsInsTestServiceImpl extends BaseServiceImpl<BsInsTestMapper, BsIns
 	@Override
 	public IPage<BsInsTestVO> selectBsInsTestPage(IPage<BsInsTestVO> 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));
 	}

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<BsSafePat
 	private final IBsSafeInspectionPointService bsSafeInspectionPointService;
 	@Override
 	public IPage<BsSafePatrolInspectionVO> selectBsSafePatrolInspectionPage(IPage<BsSafePatrolInspectionVO> 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<BsSafePat
 	@Override
 	public void updateOldPatrol(Long ipId, Date launchTime, Long id) {
 		update(Wrappers.lambdaUpdate(BsSafePatrolInspectionEntity.class)
-				.eq(BsSafePatrolInspectionEntity::getIpId, id)
+				.eq(BsSafePatrolInspectionEntity::getIpId, ipId)
 				.lt(BsSafePatrolInspectionEntity::getLaunchTime, launchTime)
 				.eq(BsSafePatrolInspectionEntity::getTaskStatus, BsSafePatrolInspectionEntity.PREPARE_TEXT)
 				.set(BsSafePatrolInspectionEntity::getTaskStatus, BsSafePatrolInspectionEntity.NO_CHECK)

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsWasteGasRunRecServiceImpl.java

@@ -62,12 +62,18 @@ public class BsWasteGasRunRecServiceImpl extends BaseServiceImpl<BsWasteGasRunRe
 	@Override
 	public IPage<BsWasteGasRunRecVO> selectBsWasteGasRunRecPage(IPage<BsWasteGasRunRecVO> 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));
 	}