From d074abcf583c06c403627cbf20cc0d91522032bf Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 9 May 2022 18:33:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=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

---
 .../impl/DummyInventoryInfoEOServiceImpl.java | 55 +++++++++++++++----
 1 file changed, 44 insertions(+), 11 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 b4a585b69..f6eee357d 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
@@ -856,6 +856,13 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 			}
 			//编号
 			String serialNumber = dummyInventoryInfoEO.getSerialNumber();
+			//子标题
+			String subtitle = dummyInventoryInfoEO.getSubtitle();
+			//wvtaId
+			String wvtaId = dummyInventoryInfoEO.getWvtaId();
+			//备注remark
+			String remark = dummyInventoryInfoEO.getRemark();
+
 			//认证级别
 			String attestationRank = dummyInventoryInfoEO.getAttestationRank();
 			//责任领域
@@ -890,6 +897,43 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 			//编号(输入框必填)
 			flag = must(dummyInventoryInfoEO, errorMsg, msgList, serialNumber, "编号", "serial number");
 
+			//子标题
+			if(StringUtils.isNotBlank(subtitle)){
+				if(subtitle.length() > 100){
+					String message = "";
+					if(CutEnum.CN.getValue().equals(dummyInventoryInfoEOTemp.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(dummyInventoryInfoEOTemp.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(dummyInventoryInfoEOTemp.getCut())){
+						message = errorMsg + "备注不能超过300个字符";
+					}else{
+						message = errorMsg + " Note The value cannot exceed 300 characters";
+					}
+					msgList.add(message);
+				}
+			}
+
 
 			//实施类别(单选不必填)
 			value = pullSingle(dictItemList, dummyInventoryInfoEO, errorMsg, implementType,msgList,"实施类别","implementation category","implement_type");
@@ -897,17 +941,6 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 				dummyInventoryInfoEO.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, dummyInventoryInfoEO, errorMsg, attestationType,msgList,"认证类型","certification type","attestation_type");
 			if(StringUtils.isNotBlank(value)){