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 00000000..b8eb939c Binary files /dev/null and b/blade-service/blade-desk/src/main/resources/Excel/QA/镀层厚度对应.xls differ