From ed5c273bc1da30c68528843790142033cce111c3 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 8 Jul 2022 18:29:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91-=E5=88=A4=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLawsInventoryEOServiceImpl.java    | 370 +++++++++++-------
 1 file changed, 224 insertions(+), 146 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 3917a5532..f9e144bbc 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
@@ -5010,12 +5010,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.SUBTITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-                    List<String> listEn = Arrays.asList(infoDiffEn.get("subtitle").split(","));
-					if(listEn.size() > 1){
-                        String infoDiffOldEn = listEn.get(0);
-                        String infoDiffNewEn = listEn.get(1);
-                        enContentLog += "'"+ProjectInventoryFieldEnum.SUBTITLE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
-                    }
+					if(StringUtils.isNotBlank(infoDiffEn.get("subtitle"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("subtitle").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.SUBTITLE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
+					}
                 }
 				//WVTA ID
 				if (StringUtils.isNotBlank(infoDiff.get("wvtaId"))) {
@@ -5025,12 +5027,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.WVTA_ID.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 						}
-                    List<String> listEn = Arrays.asList(infoDiffEn.get("wvtaId").split(","));
-					if(listEn.size() > 1){
-                        String infoDiffOldEn = listEn.get(0);
-                        String infoDiffNewEn = listEn.get(1);
-                        enContentLog += "'"+ProjectInventoryFieldEnum.WVTA_ID.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
-                    }
+					if(StringUtils.isNotBlank(infoDiffEn.get("wvtaId"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("wvtaId").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.WVTA_ID.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
+					}
                 }
 
 				//实施类别
@@ -5041,12 +5045,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 						}
-                    List<String> listEn = Arrays.asList(infoDiffEn.get("implementType").split(","));
-					if(listEn.size() > 1){
-                        String infoDiffOldEn = listEn.get(0);
-                        String infoDiffNewEn = listEn.get(1);
-                        enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
-                    }
+					if(StringUtils.isNotBlank(infoDiffEn.get("implementType"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("implementType").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
+					}
                 }
 
 				//在产车实施日期
@@ -5057,382 +5063,454 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
                         String infoDiffNew = list.get(1);
                         contentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
                     }
-
-					List<String> listEn = Arrays.asList(infoDiffEn.get("implementTimeString").split(","));
-					if(listEn.size() > 1){
-                        String infoDiffOldEn = listEn.get(0);
-                        String infoDiffNewEn = listEn.get(1);
-                        enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
-                    }
+					if(StringUtils.isNotBlank(infoDiffEn.get("implementTimeString"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("implementTimeString").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
+					}
 				}
 
 				//新车型实施日期
 				if (StringUtils.isNotBlank(infoDiff.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String"))) {
 					List<String> list = Arrays.asList(infoDiff.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String").split(","));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String").split(","));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
-
+					if(StringUtils.isNotBlank(infoDiffEn.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 
 				//认证类型
 				if (StringUtils.isNotBlank(infoDiff.get("attestationType"))) {
 					List<String> list = Arrays.asList(infoDiff.get("attestationType").split("\\|"));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("attestationType").split("\\|"));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("attestationType"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("attestationType").split("\\|"));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 
 				//认证级别
 				if (StringUtils.isNotBlank(infoDiff.get("attestationRank"))) {
 					List<String> list = Arrays.asList(infoDiff.get("attestationRank").split(","));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("attestationRank").split(","));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_RANK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_RANK.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("attestationRank"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("attestationRank").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_RANK.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 
 				//责任领域
 				if (StringUtils.isNotBlank(infoDiff.get("dutyTerritory"))) {
 					List<String> list = Arrays.asList(infoDiff.get("dutyTerritory").split("\\|"));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("dutyTerritory").split("\\|"));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.DUTY_TERRITORY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.DUTY_TERRITORY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("dutyTerritory"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("dutyTerritory").split("\\|"));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.DUTY_TERRITORY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 
 				//regulationOwnerName;//法规工程师名称
 				if (StringUtils.isNotBlank(infoDiff.get("regulationOwnerName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("regulationOwnerName").split(","));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("regulationOwnerName").split(","));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.REGULATION_OWNER_NAME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.REGULATION_OWNER_NAME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("regulationOwnerName"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("regulationOwnerName").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.REGULATION_OWNER_NAME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 				//homologationEngineerName;//认证工程师名称
 				if (StringUtils.isNotBlank(infoDiff.get("homologationEngineerName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("homologationEngineerName").split(","));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("homologationEngineerName").split(","));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.HOMOLOGATION_ENGINEER_NAME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.HOMOLOGATION_ENGINEER_NAME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("homologationEngineerName"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("homologationEngineerName").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.HOMOLOGATION_ENGINEER_NAME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 				//engineeringInterfacePersonName;//工程接口人名称
 				if (StringUtils.isNotBlank(infoDiff.get("engineeringInterfacePersonName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("engineeringInterfacePersonName").split(","));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("engineeringInterfacePersonName").split(","));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.ENGINEERING_INTERFACE_PERSON_NAME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.ENGINEERING_INTERFACE_PERSON_NAME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("engineeringInterfacePersonName"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("engineeringInterfacePersonName").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.ENGINEERING_INTERFACE_PERSON_NAME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 
 				//适用地区region 多选
 				if (StringUtils.isNotBlank(infoDiff.get("region"))) {
 					List<String> list = Arrays.asList(infoDiff.get("region").split("\\|"));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("region").split("\\|"));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.REGION.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.REGION.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("region"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("region").split("\\|"));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.REGION.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 
 				//备注
 				if (StringUtils.isNotBlank(infoDiff.get("remark"))) {
 					List<String> list = Arrays.asList(infoDiff.get("remark").split(","));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("remark").split(","));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.REMARK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.REMARK.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("remark"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("remark").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.REMARK.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 
 				//设计符合性确认-交付物类型
 				if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTypeName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("designDeliverableTypeName").split("\\|"));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("designDeliverableTypeName").split("\\|"));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("designDeliverableTypeName"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("designDeliverableTypeName").split("\\|"));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 				//设计符合性确认-交付物模板
 				if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTemplateName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("designDeliverableTemplateName").split("\\|"));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("designDeliverableTemplateName").split("\\|"));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("designDeliverableTemplateName"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("designDeliverableTemplateName").split("\\|"));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 				//设计符合性确认-发起人
 				if (StringUtils.isNotBlank(infoDiff.get("designInitiatorName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("designInitiatorName").split(","));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("designInitiatorName").split(","));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_INITIATOR.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("designInitiatorName"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("designInitiatorName").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_INITIATOR.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 				//设计符合性确认-责任人
 				if (StringUtils.isNotBlank(infoDiff.get("designDutyName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("designDutyName").split(","));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("designDutyName").split(","));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUTY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("designDutyName"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("designDutyName").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUTY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 				//设计符合性确认-截止时间designDueDateString;
 				if (StringUtils.isNotBlank(infoDiff.get("designDueDateString"))) {
 					List<String> list = Arrays.asList(infoDiff.get("designDueDateString").split(","));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("designDueDateString").split(","));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("designDueDateString"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("designDueDateString").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 				//prehomo确认-交付物类型
 				if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTypeName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("prehomoDeliverableTypeName").split("\\|"));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDeliverableTypeName").split("\\|"));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("prehomoDeliverableTypeName"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDeliverableTypeName").split("\\|"));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 				//prehomo确认-交付物模板
 				if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTemplateName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("prehomoDeliverableTemplateName").split("\\|"));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDeliverableTemplateName").split("\\|"));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("prehomoDeliverableTemplateName"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDeliverableTemplateName").split("\\|"));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 				//prehomo确认-发起人
 				if (StringUtils.isNotBlank(infoDiff.get("prehomoInitiatorName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("prehomoInitiatorName").split(","));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoInitiatorName").split(","));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_INITIATOR.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("prehomoInitiatorName"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoInitiatorName").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_INITIATOR.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 				//prehomo确认-责任人
 				if (StringUtils.isNotBlank(infoDiff.get("prehomoDutyName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("prehomoDutyName").split(","));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDutyName").split(","));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DUTY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("prehomoDutyName"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDutyName").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DUTY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 				//prehomo确认-截止时间prehomoDueDateString;
 				if (StringUtils.isNotBlank(infoDiff.get("prehomoDueDateString"))) {
 					List<String> list = Arrays.asList(infoDiff.get("prehomoDueDateString").split(","));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDueDateString").split(","));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("prehomoDueDateString"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDueDateString").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 
 				//验证符合性确认-交付物类型
 				if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTypeName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("verifyDeliverableTypeName").split("\\|"));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDeliverableTypeName").split("\\|"));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("verifyDeliverableTypeName"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDeliverableTypeName").split("\\|"));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 				//验证符合性确认-交付物模板
 				if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTemplateName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("verifyDeliverableTemplateName").split("\\|"));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDeliverableTemplateName").split("\\|"));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("verifyDeliverableTemplateName"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDeliverableTemplateName").split("\\|"));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 				//验证符合性确认-发起人
 				if (StringUtils.isNotBlank(infoDiff.get("verifyInitiatorName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("verifyInitiatorName").split(","));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("verifyInitiatorName").split(","));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_INITIATOR.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("verifyInitiatorName"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("verifyInitiatorName").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_INITIATOR.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 				//验证符合性确认-责任人
 				if (StringUtils.isNotBlank(infoDiff.get("verifyDutyName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("verifyDutyName").split(","));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDutyName").split(","));
+
 					if(list.size() > 1){
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DUTY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("verifyDutyName"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDutyName").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DUTY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}
 				//验证符合性确认-截止时间verifyDueDateString
 				if (StringUtils.isNotBlank(infoDiff.get("verifyDueDateString"))) {
 					List<String> list = Arrays.asList(infoDiff.get("verifyDueDateString").split(","));
-					List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDueDateString").split(","));
+
 					if (list.size() > 1) {
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'" + ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 					}
-					if(listEn.size() > 1){
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(StringUtils.isNotBlank(infoDiffEn.get("verifyDueDateString"))){
+						List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDueDateString").split(","));
+						if(listEn.size() > 1){
+							String infoDiffOldEn = listEn.get(0);
+							String infoDiffNewEn = listEn.get(1);
+							enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						}
 					}
 				}