From 23ed92b7c7b0360524065d80e5b87dcbe0747a7e Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 14 Apr 2022 17:17:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DummyInventoryInfoEOController.java       | 12 +++----
 .../service/IDummyInventoryInfoEOService.java |  4 +--
 .../impl/DummyInventoryInfoEOServiceImpl.java | 31 ++++++++++++++++---
 3 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java
index 2f30bd52f..785846c35 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java
@@ -228,20 +228,16 @@ public class DummyInventoryInfoEOController extends JeroController<DummyInventor
 	 /**
 	  *  批量设置
 	  *
-	  * @param dummyInventoryInfoEOList
+	  * @param dummyInventoryInfoEO
 	  * @return
 	  */
 	 @AutoLog(value = "虚拟清单详情表-添加")
 	 @ApiOperation(value="虚拟清单详情表-添加", notes="虚拟清单详情表-添加")
 	 @PostMapping(value = "/setBatch")
-	 public Result<?> setBatch(@Validated @RequestBody List<DummyInventoryInfoEO> dummyInventoryInfoEOList) {
-	 	String cut = "";
-	 	if(dummyInventoryInfoEOList.size() != 0){
-			cut = dummyInventoryInfoEOList.get(0).getCut();
-		}
-
+	 public Result<?> setBatch(@RequestBody DummyInventoryInfoEO dummyInventoryInfoEO) {
+	 	String cut = dummyInventoryInfoEO.getCut();
 		 try {
-			 dummyInventoryInfoEOService.setBatch(dummyInventoryInfoEOList);
+			 dummyInventoryInfoEOService.setBatch(dummyInventoryInfoEO);
 		 } catch (Exception e) {
 		 	if(CutEnum.CN.getValue().equals(cut)){
 				return Result.error("批量设置失败！");
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java
index 1781a5fe9..fc1bf8e1b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java
@@ -70,9 +70,9 @@ public interface IDummyInventoryInfoEOService extends IService<DummyInventoryInf
 
 	/**
 	 * 批量设置
-	 * @param dummyInventoryInfoEOList
+	 * @param dummyInventoryInfoEO
 	 */
-	void setBatch(List<DummyInventoryInfoEO> dummyInventoryInfoEOList);
+	void setBatch(DummyInventoryInfoEO dummyInventoryInfoEO);
 
 	/**
 	 * 模板下载
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
index 73dc81ec1..da7e880b9 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
@@ -190,12 +190,35 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 
 	/**
 	 * 批量设置
-	 * @param dummyInventoryInfoEOList
+	 * @param dummyInventoryInfoEO
 	 */
 	@Override
-	public void setBatch(List<DummyInventoryInfoEO> dummyInventoryInfoEOList) {
-		this.updateBatchById(dummyInventoryInfoEOList);
-
+	public void setBatch(DummyInventoryInfoEO dummyInventoryInfoEO) {
+		if(StringUtils.isNotBlank(dummyInventoryInfoEO.getIds())){
+			List<DummyInventoryInfoEO> dummyInventoryInfoEOList = new ArrayList<>();
+			for (String id : dummyInventoryInfoEO.getIds().split(",")) {
+				DummyInventoryInfoEO dummyInventoryInfoEOTemp = new DummyInventoryInfoEO();
+				dummyInventoryInfoEOTemp.setId(id);
+				//实施类别 implementType
+				if(StringUtils.isNotBlank(dummyInventoryInfoEO.getImplementType())){
+					dummyInventoryInfoEOTemp.setImplementType(dummyInventoryInfoEO.getImplementType());
+				}
+				//认证类型  attestationType
+				if(StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationType())){
+					dummyInventoryInfoEOTemp.setAttestationType(dummyInventoryInfoEO.getAttestationType());
+				}
+				//认证级别  attestationRank
+				if(StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationRank())){
+					dummyInventoryInfoEOTemp.setAttestationRank(dummyInventoryInfoEO.getAttestationRank());
+				}
+				//责任领域  dutyTerritory
+				if(StringUtils.isNotBlank(dummyInventoryInfoEO.getDutyTerritory())){
+					dummyInventoryInfoEOTemp.setDutyTerritory(dummyInventoryInfoEO.getDutyTerritory());
+				}
+				dummyInventoryInfoEOList.add(dummyInventoryInfoEOTemp);
+			}
+			this.updateBatchById(dummyInventoryInfoEOList);
+		}
 	}
 
 	/**