From 5b68848cc007ca85bcbe6eb89513de4db05446a7 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 9 May 2022 18:39:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5--=E8=BE=93=E5=85=A5=E6=A1=86=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLawsInventoryEOServiceImpl.java    | 61 +++++++++++++------
 1 file changed, 43 insertions(+), 18 deletions(-)

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 e2275259b..dbe686dee 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
@@ -1833,20 +1833,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			}
 		}
 		workbook.close();
-
-
-//		//树形数据字典
-		List<SysCategory> categoryList = sysCategoryService.list();
 		//普通数据字典
 		List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsAll();
-		importDatas(datas, categoryList, dictItemList, zipEntryName,saveDirectory,projectLawsInventoryEO);
+		importDatas(datas, dictItemList, zipEntryName,saveDirectory,projectLawsInventoryEO);
 		//删除原上传文件
 		FileUnZip.deleteDir(saveDirectory);
 
 	}
 
 	private void importDatas(List<ProjectLawsInventoryEO> dataList,
-							 List<SysCategory> categoryList,
 							 List<SysDictItem> dictItemList,
 							 String zipEntryName,
 							 File saveDirectory,
@@ -1868,6 +1863,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			}
 			//编号
 			String serialNumber = projectLawsInventoryEO.getSerialNumber();
+			//子标题subtitle
+			String subtitle = projectLawsInventoryEO.getSubtitle();
+			//WVTA ID
+			String wvtaId = projectLawsInventoryEO.getWvtaId();
+			//备注 remark
+			String remark = projectLawsInventoryEO.getRemark();
 			//认证级别
 			String attestationRank = projectLawsInventoryEO.getAttestationRank();
 			//责任领域
@@ -1920,24 +1921,48 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			//编号(输入框必填)
 			flag = must(projectLawsInventoryEO, errorMsg, msgList, serialNumber, "编号", "serial number");
 
+			//子标题
+			if(StringUtils.isNotBlank(subtitle)){
+				if(subtitle.length() > 100){
+					String message = "";
+					if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){
+						message = errorMsg + "子标题不能超过100个字符";
+					}else{
+						message = errorMsg + " Subheadings cannot be checked more than 100 characters";
+					}
+					msgList.add(message);
+				}
+			}
+			//WVTA ID
+			if(StringUtils.isNotBlank(wvtaId)){
+				if(wvtaId.length() > 100){
+					String message = "";
+					if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){
+						message = errorMsg + "WVTA ID不能超过100个字符";
+					}else{
+						message = errorMsg + " The WVTA ID cannot contain more than 100 characters";
+					}
+					msgList.add(message);
+				}
+			}
+			//备注 remark
+			if(StringUtils.isNotBlank(remark)){
+				if(remark.length() > 300){
+					String message = "";
+					if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){
+						message = errorMsg + "备注不能超过300个字符";
+					}else{
+						message = errorMsg + " Note The value cannot exceed 300 characters";
+					}
+					msgList.add(message);
+				}
+			}
 
 			//实施类别(单选不必填)
 			value = pullSingle(dictItemList, projectLawsInventoryEO, errorMsg, implementType,msgList,"实施类别","implementation category","implement_type");
 			if(StringUtils.isNotBlank(value)){
 				projectLawsInventoryEO.setImplementType(value);
 			}
-
-			//新车实施日期  xin1Che1Xing2Shi2Shi1Ri4Qi1
-//			flag = dateVerify(dummyInventoryInfoEO, errorMsg, xin1Che1Xing2Shi2Shi1Ri4Qi1,msgList,"新车实施日期","new car implementation date");
-//			if(flag){
-//				dummyInventoryInfoEO.setXin1Che1Xing2Shi2Shi1Ri4Qi1(xin1Che1Xing2Shi2Shi1Ri4Qi1);
-//			}
-
-			//在产车实施日期  implementTime
-//			flag = dateVerify(dummyInventoryInfoEO, errorMsg, implementTime,msgList,"在产车实施日期","on the production vehicle implementation date");
-//			if(flag){
-//				dummyInventoryInfoEO.setImplementTime(implementTime);
-//			}
 			//认证类型(单选不必填)
 			value = pullSingle(dictItemList, projectLawsInventoryEO, errorMsg, attestationType,msgList,"认证类型","certification type","attestation_type");
 			if(StringUtils.isNotBlank(value)){