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

---
 .../impl/DummyInventoryInfoEOServiceImpl.java | 62 +++++++++++++++++--
 1 file changed, 57 insertions(+), 5 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 16e8bb268..58309efbc 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
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.aliyuncs.utils.IOUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -35,8 +36,19 @@ import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.SerializationUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.hssf.usermodel.*;
-import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFCellStyle;
+import org.apache.poi.hssf.usermodel.HSSFDateUtil;
+import org.apache.poi.hssf.usermodel.HSSFRichTextString;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.VerticalAlignment;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.WorkbookFactory;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.shiro.SecurityUtils;
@@ -54,10 +66,20 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 import static com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl.copyFile;
@@ -341,30 +363,44 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 				//实施类别 implementType
 				if(StringUtils.isNotBlank(dummyInventoryInfoEO.getImplementType())){
 					dummyInventoryInfoEOTemp.setImplementType(dummyInventoryInfoEO.getImplementType());
+				}else{
+					dummyInventoryInfoEOTemp.setImplementType("");
 				}
 				//认证类型  attestationType
 				if(StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationType())){
 					dummyInventoryInfoEOTemp.setAttestationType(dummyInventoryInfoEO.getAttestationType());
+				}else{
+					dummyInventoryInfoEOTemp.setAttestationType("");
 				}
 				//认证级别  attestationRank
 				if(StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationRank())){
 					dummyInventoryInfoEOTemp.setAttestationRank(dummyInventoryInfoEO.getAttestationRank());
+				}else{
+					dummyInventoryInfoEOTemp.setAttestationRank("");
 				}
 				//责任领域  dutyTerritory
 				if(StringUtils.isNotBlank(dummyInventoryInfoEO.getDutyTerritory())){
 					dummyInventoryInfoEOTemp.setDutyTerritory(dummyInventoryInfoEO.getDutyTerritory());
+				}else{
+					dummyInventoryInfoEOTemp.setDutyTerritory("");
 				}
 				//适用范围  shi4Yong4Fan4Wei2
 				if(StringUtils.isNotBlank(dummyInventoryInfoEO.getShi4Yong4Fan4Wei2())){
 					dummyInventoryInfoEOTemp.setShi4Yong4Fan4Wei2(dummyInventoryInfoEO.getShi4Yong4Fan4Wei2());
+				}else{
+					dummyInventoryInfoEOTemp.setShi4Yong4Fan4Wei2("");
 				}
 				//技术领域  technologyTerritory
 				if(StringUtils.isNotBlank(dummyInventoryInfoEO.getTechnologyTerritory())){
 					dummyInventoryInfoEOTemp.setTechnologyTerritory(dummyInventoryInfoEO.getTechnologyTerritory());
+				}else{
+					dummyInventoryInfoEOTemp.setTechnologyTerritory("");
 				}
 				//适用地区  region
 				if(StringUtils.isNotBlank(dummyInventoryInfoEO.getRegion())){
 					dummyInventoryInfoEOTemp.setRegion(dummyInventoryInfoEO.getRegion());
+				}else{
+					dummyInventoryInfoEOTemp.setRegion("");
 				}
 				//新车实施日期
 				if(ObjectUtils.isNotEmpty(dummyInventoryInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1())){
@@ -376,7 +412,15 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 				}
 				dummyInventoryInfoEOList.add(dummyInventoryInfoEOTemp);
 			}
-			this.updateBatchById(dummyInventoryInfoEOList);
+
+//			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();
@@ -489,6 +533,14 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 			dummyLogEOService.updateLog(enContentLog, projectId,CutEnum.EN.getValue());
 		}
 	}
+	private void setDateNull(DummyInventoryInfoEO inventoryInfoEO, LambdaUpdateWrapper<DummyInventoryInfoEO> updateWrapper) {
+		if(ObjectUtils.isEmpty(inventoryInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1())){
+			updateWrapper.set(DummyInventoryInfoEO::getXin1Che1Xing2Shi2Shi1Ri4Qi1,null);
+		}
+		if(ObjectUtils.isEmpty(inventoryInfoEO.getImplementTime())){
+			updateWrapper.set(DummyInventoryInfoEO::getImplementTime,null);
+		}
+	}
 	public StringBuilder setUpdateContentLog(StringBuilder contentLogBuilder,String fieldName,String oldValue,String newValue){
 		return contentLogBuilder.append("\'"+ fieldName + "\'由" + oldValue + "改为了" + newValue).append(",");
 	}