From f26012460613238bb7ce65e2ece9005a7245bbe0 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 21 Jun 2022 11:14:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95,=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95--=E6=89=B9=E9=87=8F=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DummyInventoryInfoEOServiceImpl.java | 51 +++++++++++--------
 .../ProjectLawsInventoryEOServiceImpl.java    | 41 ++++++++-------
 2 files changed, 52 insertions(+), 40 deletions(-)

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 c486e1588..02027ed49 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
@@ -411,45 +411,52 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 					//实施类别 implementType
 					if(StringUtils.isNotBlank(dummyInventoryInfoEO.getImplementType())){
 						dummyInventoryInfoEOTemp.setImplementType(dummyInventoryInfoEO.getImplementType());
-					}else{
-						dummyInventoryInfoEOTemp.setImplementType("");
 					}
+//					else{
+//						dummyInventoryInfoEOTemp.setImplementType("");
+//					}
 					//认证类型  attestationType
 					if(StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationType())){
 						dummyInventoryInfoEOTemp.setAttestationType(dummyInventoryInfoEO.getAttestationType());
-					}else{
-						dummyInventoryInfoEOTemp.setAttestationType("");
 					}
+//					else{
+//						dummyInventoryInfoEOTemp.setAttestationType("");
+//					}
 					//认证级别  attestationRank
 					if(StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationRank())){
 						dummyInventoryInfoEOTemp.setAttestationRank(dummyInventoryInfoEO.getAttestationRank());
-					}else{
-						dummyInventoryInfoEOTemp.setAttestationRank("");
 					}
+//					else{
+//						dummyInventoryInfoEOTemp.setAttestationRank("");
+//					}
 					//责任领域  dutyTerritory
 					if(StringUtils.isNotBlank(dummyInventoryInfoEO.getDutyTerritory())){
 						dummyInventoryInfoEOTemp.setDutyTerritory(dummyInventoryInfoEO.getDutyTerritory());
-					}else{
-						dummyInventoryInfoEOTemp.setDutyTerritory("");
 					}
+//					else{
+//						dummyInventoryInfoEOTemp.setDutyTerritory("");
+//					}
 					//适用范围  shi4Yong4Fan4Wei2
 					if(StringUtils.isNotBlank(dummyInventoryInfoEO.getShi4Yong4Fan4Wei2())){
 						dummyInventoryInfoEOTemp.setShi4Yong4Fan4Wei2(dummyInventoryInfoEO.getShi4Yong4Fan4Wei2());
-					}else{
-						dummyInventoryInfoEOTemp.setShi4Yong4Fan4Wei2("");
 					}
+//					else{
+//						dummyInventoryInfoEOTemp.setShi4Yong4Fan4Wei2("");
+//					}
 					//技术领域  technologyTerritory
 					if(StringUtils.isNotBlank(dummyInventoryInfoEO.getTechnologyTerritory())){
 						dummyInventoryInfoEOTemp.setTechnologyTerritory(dummyInventoryInfoEO.getTechnologyTerritory());
-					}else{
-						dummyInventoryInfoEOTemp.setTechnologyTerritory("");
 					}
+//					else{
+//						dummyInventoryInfoEOTemp.setTechnologyTerritory("");
+//					}
 					//适用地区  region
 					if(StringUtils.isNotBlank(dummyInventoryInfoEO.getRegion())){
 						dummyInventoryInfoEOTemp.setRegion(dummyInventoryInfoEO.getRegion());
-					}else{
-						dummyInventoryInfoEOTemp.setRegion("");
 					}
+//					else{
+//						dummyInventoryInfoEOTemp.setRegion("");
+//					}
 					//新车实施日期
 					if(ObjectUtils.isNotEmpty(dummyInventoryInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1())){
 						dummyInventoryInfoEOTemp.setXin1Che1Xing2Shi2Shi1Ri4Qi1(dummyInventoryInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1());
@@ -461,14 +468,14 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 					dummyInventoryInfoEOList.add(dummyInventoryInfoEOTemp);
 				}
 
-//       this.updateBatchById(dummyInventoryInfoEOList);
-				for (DummyInventoryInfoEO inventoryInfoEO : dummyInventoryInfoEOList) {
-					LambdaUpdateWrapper<DummyInventoryInfoEO> updateWrapper = new LambdaUpdateWrapper<>();
-					updateWrapper.in(DummyInventoryInfoEO::getId,inventoryInfoEO.getId());
-					setDateNull(inventoryInfoEO, updateWrapper);
-					//保存
-					this.update(inventoryInfoEO,updateWrapper);
-				}
+       this.updateBatchById(dummyInventoryInfoEOList);
+//				for (DummyInventoryInfoEO inventoryInfoEO : dummyInventoryInfoEOList) {
+//					LambdaUpdateWrapper<DummyInventoryInfoEO> updateWrapper = new LambdaUpdateWrapper<>();
+//					updateWrapper.in(DummyInventoryInfoEO::getId,inventoryInfoEO.getId());
+//					setDateNull(inventoryInfoEO, updateWrapper);
+//					//保存
+//					this.update(inventoryInfoEO,updateWrapper);
+//				}
 
 				//更新log
 				LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 52dbff51b..ed7f56542 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -1705,33 +1705,38 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				//实施类别 implementType
 				if(org.apache.commons.lang.StringUtils.isNotBlank(projectLawsInventoryEO.getImplementType())){
 					projectLawsInventoryEOTemp.setImplementType(projectLawsInventoryEO.getImplementType());
-				}else{
-					projectLawsInventoryEOTemp.setImplementType("");
 				}
+//				else{
+//					projectLawsInventoryEOTemp.setImplementType("");
+//				}
 				//认证类型  attestationType
 				if(org.apache.commons.lang.StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationType())){
 					projectLawsInventoryEOTemp.setAttestationType(projectLawsInventoryEO.getAttestationType());
-				}else{
-					projectLawsInventoryEOTemp.setAttestationType("");
 				}
+//				else{
+//					projectLawsInventoryEOTemp.setAttestationType("");
+//				}
 				//认证级别  attestationRank
 				if(org.apache.commons.lang.StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationRank())){
 					projectLawsInventoryEOTemp.setAttestationRank(projectLawsInventoryEO.getAttestationRank());
-				}else{
-					projectLawsInventoryEOTemp.setAttestationRank("");
 				}
+//				else{
+//					projectLawsInventoryEOTemp.setAttestationRank("");
+//				}
 				//责任领域  dutyTerritory
 				if(org.apache.commons.lang.StringUtils.isNotBlank(projectLawsInventoryEO.getDutyTerritory())){
 					projectLawsInventoryEOTemp.setDutyTerritory(projectLawsInventoryEO.getDutyTerritory());
-				}else{
-					projectLawsInventoryEOTemp.setDutyTerritory("");
 				}
+//				else{
+//					projectLawsInventoryEOTemp.setDutyTerritory("");
+//				}
 				//适用地区region
 				if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getRegion())){
 					projectLawsInventoryEOTemp.setRegion(projectLawsInventoryEO.getRegion());
-				}else{
-					projectLawsInventoryEOTemp.setRegion("");
 				}
+//				else{
+//					projectLawsInventoryEOTemp.setRegion("");
+//				}
 				//在产车实施日期implementTime
 				if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getImplementTime())){
 					projectLawsInventoryEOTemp.setImplementTime(projectLawsInventoryEO.getImplementTime());
@@ -1755,14 +1760,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				projectLawsInventoryEOList.add(projectLawsInventoryEOTemp);
 			}
 
-//			this.updateBatchById(projectLawsInventoryEOList);
-			for (ProjectLawsInventoryEO lawsInventoryEO : projectLawsInventoryEOList) {
-				LambdaUpdateWrapper<ProjectLawsInventoryEO> updateWrapper = new LambdaUpdateWrapper<>();
-				updateWrapper.in(ProjectLawsInventoryEO::getId,lawsInventoryEO.getId());
-				setDateNull(lawsInventoryEO, updateWrapper);
-				//保存
-				this.update(lawsInventoryEO,updateWrapper);
-			}
+			this.updateBatchById(projectLawsInventoryEOList);
+//			for (ProjectLawsInventoryEO lawsInventoryEO : projectLawsInventoryEOList) {
+//				LambdaUpdateWrapper<ProjectLawsInventoryEO> updateWrapper = new LambdaUpdateWrapper<>();
+//				updateWrapper.in(ProjectLawsInventoryEO::getId,lawsInventoryEO.getId());
+//				setDateNull(lawsInventoryEO, updateWrapper);
+//				//保存
+//				this.update(lawsInventoryEO,updateWrapper);
+//			}
 
 			//更新log
 			LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();