From d3db0e32efff2124759d76beac744ffb5522570c Mon Sep 17 00:00:00 2001 From: pangyang <475446853@qq.com> Date: Fri, 10 Apr 2026 11:34:24 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=B4=A8=E9=87=8F=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E6=B6=88=E6=81=AF=E6=8F=90=E9=86=92=E9=95=80=E7=A7=8D?= =?UTF-8?q?=E5=92=8C=E6=9D=90=E6=96=99=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BsEpciuInspectionPointController.java | 30 ++++++++++++++----- .../excel/BsEpciuInspectionPointExcel.java | 6 ++-- .../entity/BsSafeInspectionPointEntity.java | 8 ++--- .../impl/InspectionTaskServiceImpl.java | 4 +-- 4 files changed, 31 insertions(+), 17 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 27b7962f..14b5d9a1 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 @@ -41,8 +41,11 @@ import org.springblade.core.mp.support.Query; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.excel.CoatingThicknessExcel; +import org.springblade.desk.basic.pojo.entity.CoatingThickness; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.energy.excel.BsEpciuInspectionPointExcel; import org.springblade.desk.energy.pojo.entity.BsEpciuInspectionPointEntity; @@ -54,6 +57,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -179,14 +183,24 @@ public class BsEpciuInspectionPointController extends BladeController { @ApiOperationSupport(order = 11) @Operation(summary = "导入Excel", description = "MultipartFile") public R importExcel(@RequestParam("file") MultipartFile file) { - R checkR = ExcelExtUtil.importExcelCheck(file); - if (checkR != null) { - return checkR; - } - List importList = ExcelUtil.read( - file, 0, 1, BsEpciuInspectionPointEntity.class - ); - return R.status(bsEpciuInspectionPointService.saveBatch(importList)); + List noticeList = new ArrayList<>(); + + + List list = ExcelUtil.read(file, BsEpciuInspectionPointExcel.class); + list.forEach(noticeExcel -> { + BsEpciuInspectionPointEntity notice = BeanUtil.copy(noticeExcel, BsEpciuInspectionPointEntity.class); + noticeList.add(notice); + }); + + +// R checkR = ExcelExtUtil.importExcelCheck(file); +// if (checkR != null) { +// return checkR; +// } +// List importList = ExcelUtil.read( +// file, 0, 1, BsEpciuInspectionPointEntity.class +// ); + return R.status(bsEpciuInspectionPointService.saveBatch(noticeList)); } /** * 环保巡检点配置表 批量新增 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 b71c949d..8edac720 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 @@ -57,7 +57,7 @@ public class BsEpciuInspectionPointExcel implements Serializable { * ID */ @ColumnWidth(20) - @ExcelProperty("ID") +// @ExcelProperty("ID") private Short id; /** * 巡检点编号 @@ -75,7 +75,7 @@ public class BsEpciuInspectionPointExcel implements Serializable { * 上次巡检日期 */ @ColumnWidth(20) - @ExcelProperty("上次巡检日期") + @ExcelProperty("上次检验日期") private Date lastInsCycle; /** * 备注 @@ -87,7 +87,7 @@ public class BsEpciuInspectionPointExcel implements Serializable { * 是否已删除 */ @ColumnWidth(20) - @ExcelProperty("是否已删除") +// @ExcelProperty("是否已删除") private Long isDeleted; /** * 巡检点类型 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 4788ddf2..dabcdcfd 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 @@ -70,9 +70,9 @@ public class BsSafeInspectionPointEntity extends BaseEntity { /** * 巡检器 */ - @Schema(description = "巡检器") - @TableField(value = "ins_num") - private String patrolRegister; +// @Schema(description = "巡检器") +// @TableField(value = "ins_num") +// private String patrolRegister; /** * 巡检点 */ @@ -83,7 +83,7 @@ public class BsSafeInspectionPointEntity extends BaseEntity { */ @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) - @Schema(description = "上次巡检周期") + @Schema(description = "上次检验日期") private Date lastInsCycle; /** * 备注 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java index fbbf44a4..f047e267 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java @@ -214,7 +214,7 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl qw = Wrappers.lambdaQuery(RemindMsg.class) - .eq(RemindMsg::getPartId, parts.get(0).getId()) + .eq(RemindMsg::getPartCode, parts.get(0).getPartCode()) // .eq(RemindMsg::getQualityLevel, prodIdent) .eq(RemindMsg::getIsHeatTreatment, "1") .eq(RemindMsg::getIsDeleted, CommonConstant.DELETE_FALSE) @@ -240,7 +240,7 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl qw = Wrappers.lambdaQuery(RemindMsg.class) - .eq(RemindMsg::getPartId, parts.get(0).getId()) + .eq(RemindMsg::getPartCode, parts.get(0).getPartCode()) // .eq(RemindMsg::getQualityLevel, prodIdent) .eq(RemindMsg::getIsAfterPlating, "1") .eq(RemindMsg::getRemindMsgType, 0L)