From 6f57cd04315dbd631ea3ae96471588f7cfb11620 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 09:11:37 +0800 Subject: [PATCH] bug --- .../BsEpciuInspectionPointController.java | 6 +++++- .../BsSafeInspectionPointController.java | 9 +++++++++ .../excel/BsEpciuInspectionPointExcel.java | 2 +- .../mapper/EpciuInspectionPointMapper.xml | 8 ++++---- .../mapper/EpciuPatrolInspectionMapper.xml | 12 ++++++------ .../mapper/SafeInspectionPointMapper.xml | 8 ++++---- .../mapper/SafePatrolInspectionMapper.xml | 12 ++++++------ .../entity/BsSafeInspectionPointEntity.java | 15 ++++++++------- .../QA/环保巡检点配置导入模板.xls | Bin 18944 -> 18944 bytes 9 files changed, 43 insertions(+), 29 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsEpciuInspectionPointController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsEpciuInspectionPointController.java index 14b5d9a1..375429eb 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsEpciuInspectionPointController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsEpciuInspectionPointController.java @@ -25,6 +25,7 @@ */ package org.springblade.desk.energy.controller; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; @@ -188,11 +189,14 @@ public class BsEpciuInspectionPointController extends BladeController { List list = ExcelUtil.read(file, BsEpciuInspectionPointExcel.class); list.forEach(noticeExcel -> { + if (cn.hutool.core.bean.BeanUtil.isEmpty(noticeExcel) || StrUtil.isEmpty(noticeExcel.getInsNum()) + || noticeExcel.getInsNum().contains("注")){ + return; + } BsEpciuInspectionPointEntity notice = BeanUtil.copy(noticeExcel, BsEpciuInspectionPointEntity.class); noticeList.add(notice); }); - // R checkR = ExcelExtUtil.importExcelCheck(file); // if (checkR != null) { // return checkR; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsSafeInspectionPointController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsSafeInspectionPointController.java index bfc57178..92fc80a5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsSafeInspectionPointController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsSafeInspectionPointController.java @@ -193,6 +193,15 @@ public class BsSafeInspectionPointController { List importList = ExcelUtil.read( file, 0, 1, BsSafeInspectionPointEntity.class ); + + // 过滤空行和说明文字行（包含"注"字符的行） + importList = importList.stream() + .filter(item -> item != null + && item.getInsNum() != null + && !item.getInsNum().trim().isEmpty() + && !item.getInsNum().contains("注")) + .toList(); + return R.status(bsSafeInspectionPointService.saveBatch(importList)); } /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsEpciuInspectionPointExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsEpciuInspectionPointExcel.java index 1c712040..6fd7286e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsEpciuInspectionPointExcel.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsEpciuInspectionPointExcel.java @@ -83,7 +83,7 @@ public class BsEpciuInspectionPointExcel implements Serializable { * 巡检点类型 */ @ColumnWidth(20) - @ExcelProperty("巡检点类型") + @ExcelProperty("巡检点类型（1为废水；2为废气）") private String insType; /** * 巡检周期 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EpciuInspectionPointMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EpciuInspectionPointMapper.xml index f9940129..a51fb7f3 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EpciuInspectionPointMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EpciuInspectionPointMapper.xml @@ -25,11 +25,11 @@ select * from BS_EPCIU_INSPECTION_POINT n n.is_deleted = 0 - - and n.INS_NUM = #{bsEpciuInspectionPoint.insNum} + + and n.INS_NUM like '%' || #{bsEpciuInspectionPoint.insNum} || '%' - - and n.INS_SITE = #{bsEpciuInspectionPoint.insSite} + + and n.INS_SITE like '%' || #{bsEpciuInspectionPoint.insSite} || '%' and n.INS_TYPE = #{bsEpciuInspectionPoint.insType} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EpciuPatrolInspectionMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EpciuPatrolInspectionMapper.xml index d357cc1d..7dc4a9e2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EpciuPatrolInspectionMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EpciuPatrolInspectionMapper.xml @@ -33,17 +33,17 @@ and n.TASK_STATUS = #{bsEpciuPatrolInspection.taskStatus} - - and n.INS_NUM = #{bsEpciuPatrolInspection.insNum} + + and n.INS_NUM like '%' || #{bsEpciuPatrolInspection.insNum} || '%' - - and n.INS_SITE = #{bsEpciuPatrolInspection.insSite} + + and n.INS_SITE like '%' || #{bsEpciuPatrolInspection.insSite} || '%' and n.INS_TYPE = #{bsEpciuPatrolInspection.insType} - - and n.INS_MAN = #{bsEpciuPatrolInspection.insMan} + + and n.INS_MAN like '%' || #{bsEpciuPatrolInspection.insMan} || '%' and n.INS_TYPE = #{bsEpciuPatrolInspection.insType} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/SafeInspectionPointMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/SafeInspectionPointMapper.xml index 25170d66..3ba592f7 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/SafeInspectionPointMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/SafeInspectionPointMapper.xml @@ -23,11 +23,11 @@ select * from BS_SAFE_INSPECTION_POINT n n.is_deleted = 0 - - and n.ins_num = #{bsSafeInspectionPoint.insNum} + + and n.ins_num like '%' || #{bsSafeInspectionPoint.insNum} || '%' - - and n.ins_site = #{bsSafeInspectionPoint.insSite} + + and n.ins_site like '%' || #{bsSafeInspectionPoint.insSite} || '%' diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/SafePatrolInspectionMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/SafePatrolInspectionMapper.xml index f71eb756..4bdb4274 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/SafePatrolInspectionMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/SafePatrolInspectionMapper.xml @@ -29,14 +29,14 @@ select * from BS_SAFE_PATROL_INSPECTION n n.is_deleted = 0 - - and n.ins_num = #{bsSafePatrolInspection.insNum} + + and n.ins_num like '%' || #{bsSafePatrolInspection.insNum} || '%' - - and n.ins_site = #{bsSafePatrolInspection.insSite} + + and n.ins_site like '%' || #{bsSafePatrolInspection.insSite} || '%' - - and n.INS_MAN = #{bsSafePatrolInspection.insMan} + + and n.INS_MAN like '%' || #{bsSafePatrolInspection.insMan} || '%' and n.TASK_STATUS = #{bsSafePatrolInspection.taskStatus} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsSafeInspectionPointEntity.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsSafeInspectionPointEntity.java index dabcdcfd..fae1e9b2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsSafeInspectionPointEntity.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsSafeInspectionPointEntity.java @@ -59,14 +59,19 @@ public class BsSafeInspectionPointEntity extends BaseEntity { /** * 巡检点编号 */ - @Schema(description = "巡检点编号") + @Schema(description = "巡逻点编号") private String insNum; /** * 巡检点位置 */ - @Schema(description = "巡检点位置") + @Schema(description = "巡逻点位置") private String insSite; + /** + * 备注 + */ + @Schema(description = "备注") + private String memo; /** * 巡检器 */ @@ -85,11 +90,7 @@ public class BsSafeInspectionPointEntity extends BaseEntity { @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) @Schema(description = "上次检验日期") private Date lastInsCycle; - /** - * 备注 - */ - @Schema(description = "备注") - private String memo; + @TableField(exist = false) private String ids; diff --git a/blade-service/blade-desk/src/main/resources/Excel/QA/环保巡检点配置导入模板.xls b/blade-service/blade-desk/src/main/resources/Excel/QA/环保巡检点配置导入模板.xls index 65d4d72d4b3fe3eabfa9ad9a978cfd43c11a5b8a..20e34a903ee2a3e611ee5856b46a7c80d65a5fc9 100644 GIT binary patch delta 436 zcmZpe!q_l{aYGIZ>x9+wBIPF+va~ZE+WeD6(VX$!WN8~$<|+oZ$;mc~$^s0G4`UBx z>@29R=?>@kZ^&TfH$ToKNBX}Jm?e_K`G4|6n|wy6&5X9(jP;`Gjtoo;EDW^_JV2U> z!9gCuXJ%k#5S2pkSr`}?S8zBoumROGF!3>f0FVU)tU%1cBmiYgFoGG3{9rKs4IgT z6tXaY#6bFx#X!11y4}GJW@KUm@)#LB7_I|7e+?*Z1Jo_TAi~99$0WqC4WxT=w!NAn zFW4YP23{a!Vwwr!aXtka#R$|6GLCWbCVRih1}p-b9DG<=8$SC+%5M&IUC#mlcZWZJ delta 427 zcmZpe!q_l{aYGIZYl6eZ9HGgDEbWY!HveQ%G-tdqS=z>xIfa3JaB+{xz`(&I03;b0*cc=j!3;)zuo#GgF2;mKj2R?0d83_Ty%SjbUj{B9&BWl$ z05So>V`gvxiokd*KpsdJM2;26V*&E^F$jTmxH7oGAuCuEq!U#Xq!VO