From 86335d7a6668d55c1d7a781df36797796a0ef437 Mon Sep 17 00:00:00 2001 From: pangyang <475446853@qq.com> Date: Fri, 6 Feb 2026 17:51:38 +0800 Subject: [PATCH] =?UTF-8?q?=E9=95=80=E5=B1=82=E5=8E=9A=E5=BA=A6=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/pojo/entity/CoatingThickness.java | 5 ++ .../CoatingThicknessController.java | 54 ++++++++++++++---- .../resources/Excel/QA/镀层厚度对应.xls | Bin 0 -> 6656 bytes 3 files changed, 49 insertions(+), 10 deletions(-) create mode 100644 blade-service/blade-desk/src/main/resources/Excel/QA/镀层厚度对应.xls diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java index 3c96971a..04ee8cf6 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java @@ -3,6 +3,7 @@ */ package org.springblade.desk.basic.pojo.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -10,6 +11,7 @@ import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; import java.io.Serial; +import java.util.List; /** * [镀层厚度对应] 实体类 @@ -90,4 +92,7 @@ public class CoatingThickness extends BaseEntity { */ @Schema(description = "备注") private String remark; + + @TableField(exist = false) + private List ids; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CoatingThicknessController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CoatingThicknessController.java index cf4366b9..f334946e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CoatingThicknessController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CoatingThicknessController.java @@ -22,6 +22,7 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.BladeUser; 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.constant.BAModuleConst; @@ -31,10 +32,13 @@ import org.springblade.desk.basic.pojo.vo.CoatingThicknessVO; import org.springblade.desk.basic.service.ICoatingThicknessService; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.basic.wrapper.CoatingThicknessWrapper; +import org.springblade.system.cache.DictCache; import org.springframework.http.ResponseEntity; +import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -179,6 +183,24 @@ public class CoatingThicknessController extends BladeController { return R.status(service.saveOrUpdateBatch(mergeList)); } + @PostMapping("/submitBatThickness") + @ApiOperationSupport(order = 51) + @Operation(summary = "批量维护厚度", description = "传入CoatingThickness List") + public R submitBatThickness(@Valid @RequestBody CoatingThickness mergeOne) { + + List ids = mergeOne.getIds(); + if(CollectionUtils.isEmpty(ids)){ + return R.fail("数据为空"); + } + for(Long id : ids){ + CoatingThickness one = service.getById(id); + one.setThickness(mergeOne.getThickness()); + service.updateById(one); + } + + return R.status(true); + } + /** * [镀层厚度对应] 逻辑删除 */ @@ -215,8 +237,8 @@ public class CoatingThicknessController extends BladeController { @Operation(summary = "下载Excel模板", description = "") public ResponseEntity downloadExcelTemplate() { return ExcelExtUtil.downloadXlsTemplate( - "Excel/QA/ImportTemplate-CycleTestItem.xls", - "导入模版-周期试验项目.xls"); + "Excel/QA/镀层厚度对应.xls", + "导入模版-镀层厚度对应.xls"); } /** @@ -226,13 +248,25 @@ public class CoatingThicknessController extends BladeController { @ApiOperationSupport(order = 72) @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, CoatingThickness.class - ); - return R.status(service.saveBatch(importList)); +// R checkR = ExcelExtUtil.importExcelCheck(file); +// if (checkR != null) { +// return checkR; +// } +// List importList = ExcelUtil.read( +// file, 0, 1, CoatingThickness.class +// ); +// return R.status(service.saveBatch(importList)); + + + List noticeList = new ArrayList<>(); + List list = ExcelUtil.read(file, CoatingThicknessExcel.class); + list.forEach(noticeExcel -> { + + CoatingThickness notice = BeanUtil.copy(noticeExcel, CoatingThickness.class); + noticeList.add(notice); + }); + return R.data(service.saveBatch(noticeList)); + + } } diff --git a/blade-service/blade-desk/src/main/resources/Excel/QA/镀层厚度对应.xls b/blade-service/blade-desk/src/main/resources/Excel/QA/镀层厚度对应.xls new file mode 100644 index 0000000000000000000000000000000000000000..b8eb939cff1c27721fbc0549509acc1a70f35f9e GIT binary patch literal 6656 zcmeI0Yiv|S6vxlq?$Rw#TPQ*SscW%N+ES!~f`~1o7>L>;ML}3Cr3E1>5Q0WR#8t%j zB7vYmiHQ=8kC-4nqDD=G#Hfi9j7p4#51`TbO*9&OK-b@Y?%sC0>|%*%gmBvboS8Fc zUgw;dJF}ne8*p&PE5i<123=u!)|o7@K524~yx^$VEJQ}-&SWy_3(d%$rPIg)$Czv1 zln=x32$0Y7K@=2#en37J&eEA>fjPF4zcm)K8MXqx+ScOj-qT0EG zl|J*+RrPr-*K9lB>vM zUwgN=D?9(izYn6oPYr+{Y)t27rN}1PlV_g27-2Cb4-!qQ$Z9j_KDa#g?sb&G>|1A4iOQ%!h2j?e1pB>whG^SSKAUoai!e> zV*fTxcXMd-6q~!5(^PUE(WEkap0vcJFFTEQT{_i8B5}B&u|mFAbk7epIK53SEqCcT zq@KO$+I;OKF1KG*KGP{vfOib3$0M(+c`pz zJ3IX5O9Q!HD^4DWyYy?a>PHC5Z2d%d>tvJX?!T(n`ddTXtrC_LFHYpaOSn1Zn>XpE z_aAJvqYMAIcGZ#THpx(AtPe zcj-lEVJ{eOd$iQHJDG1gg|bK&y+^nXUeDhiFAB^yO$c%Lsi&P@n4tHz-d{C{6RIxSz>)yog{W76_FFl7O=I`X4#VIgiQ^FtRq`n*2iX4lbo z)b4U?XI+I_L)ew`xUYX$;+HL?`?&82|NR~f`KMIGzs*>KS7gVW_56FgrAi)Fk-hx7 zkh4)x%A=$=fnOJWnxIExGg`k>Y_kEZQF0ub(WOjsGnAz{Y<3?37Zyh?vdp)T{8n=5Arm8fo+JtrNH_ z#WU-J@{uCNeSv+BtsdgpbG*4aSzBM3ID<6I!HrM-{Co4V;+M8Wt$OrpU$M390V?!n zQ~lEbO1wa#9(Dow{9Pb#e+0CRe*ki|K5)*+G?p*>!}a^nd2r3M60Y~*1h`_d0j_uA zOt>O)He7GT`Eb1#6YxxO^I&k*hZ#ig#6T@GuQ%y5-X?9dOX@3T^!2cH1#{V#y_#6h6FuD!3lei&%4>+Xw0|@?2ir-&G%Lyx$-)5t|I=M*~6>Z6&>t~c6P*c_;NHm pxDG9$MwD%>+JkjmU?!4|E$aV9e*r=6M;rhE literal 0 HcmV?d00001