diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java
index d1b24903c..38be4e214 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryDetailEO.java
@@ -119,4 +119,8 @@ public class ProjectTaskInventoryDetailEO implements Serializable {
 
     @ApiModelProperty(value = "工程交付说明")
     private String deliveryInstructions;
+
+    /**是否发送过消息 对应枚举 SendMsgFlagEnum**/
+    @TableField(exist = false)
+    private String isSend;
 }
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 84697d47d..910f78f95 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
@@ -2103,8 +2103,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			//飞书跳转链接
 			String hrefFeishu = backUrl
-					+ JumpLinkEnum.TASK_AFFIRM_LINK.getLink()
-					+ "&projectName=" + projectNameInfoEO.getProjectName();
+					+ JumpLinkEnum.TASK_AFFIRM_LINK.getLink();
+
 			//系统内部跳转链接
 			String href = "<a href='" + JumpLinkEnum.TASK_AFFIRM_LINK.getLink() + "'>" + "Jump link" + "</a>";
 			String contentInfo = msgContentEN + " " + href;
@@ -2163,32 +2163,22 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				//实施类别 implementType
 				if(org.apache.commons.lang.StringUtils.isNotBlank(projectLawsInventoryEO.getImplementType())){
 					projectLawsInventoryEOTemp.setImplementType(projectLawsInventoryEO.getImplementType());
-				}else{
-					projectLawsInventoryEOTemp.setImplementType("");
 				}
 				//认证类型  attestationType
 				if(org.apache.commons.lang.StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationType())){
 					projectLawsInventoryEOTemp.setAttestationType(projectLawsInventoryEO.getAttestationType());
-				}else{
-					projectLawsInventoryEOTemp.setAttestationType("");
 				}
 				//认证级别  attestationRank
 				if(org.apache.commons.lang.StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationRank())){
 					projectLawsInventoryEOTemp.setAttestationRank(projectLawsInventoryEO.getAttestationRank());
-				}else{
-					projectLawsInventoryEOTemp.setAttestationRank("");
 				}
 				//责任领域  dutyTerritory
 				if(org.apache.commons.lang.StringUtils.isNotBlank(projectLawsInventoryEO.getDutyTerritory())){
 					projectLawsInventoryEOTemp.setDutyTerritory(projectLawsInventoryEO.getDutyTerritory());
-				}else{
-					projectLawsInventoryEOTemp.setDutyTerritory("");
 				}
 				//适用地区region
 				if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getRegion())){
 					projectLawsInventoryEOTemp.setRegion(projectLawsInventoryEO.getRegion());
-				}else{
-					projectLawsInventoryEOTemp.setRegion("");
 				}
 				//在产车实施日期implementTime
 				if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getImplementTime())){
@@ -2213,14 +2203,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();
@@ -4991,39 +4981,46 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				//子标题
 				if (StringUtils.isNotBlank(infoDiff.get("subtitle"))) {
 					List<String> list = Arrays.asList(infoDiff.get("subtitle").split(","));
-					String infoDiffOld = list.get(0);
-					String infoDiffNew = list.get(1);
-					contentLog += "'"+ProjectInventoryFieldEnum.SUBTITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+					if(list.size() > 1){
+						String infoDiffOld = list.get(0);
+						String infoDiffNew = list.get(1);
+						contentLog += "'"+ProjectInventoryFieldEnum.SUBTITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 
-					List<String> listEn = Arrays.asList(infoDiffEn.get("subtitle").split(","));
-					String infoDiffOldEn = listEn.get(0);
-					String infoDiffNewEn = listEn.get(1);
-					enContentLog += "'"+ProjectInventoryFieldEnum.SUBTITLE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						List<String> listEn = Arrays.asList(infoDiffEn.get("subtitle").split(","));
+						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"))) {
 					List<String> list = Arrays.asList(infoDiff.get("wvtaId").split(","));
-					String infoDiffOld = list.get(0);
-					String infoDiffNew = list.get(1);
-					contentLog += "'"+ProjectInventoryFieldEnum.WVTA_ID.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+					if(list.size() > 1){
+						String infoDiffOld = list.get(0);
+						String infoDiffNew = list.get(1);
+						contentLog += "'"+ProjectInventoryFieldEnum.WVTA_ID.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 
-					List<String> listEn = Arrays.asList(infoDiffEn.get("wvtaId").split(","));
-					String infoDiffOldEn = listEn.get(0);
-					String infoDiffNewEn = listEn.get(1);
-					enContentLog += "'"+ProjectInventoryFieldEnum.WVTA_ID.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						List<String> listEn = Arrays.asList(infoDiffEn.get("wvtaId").split(","));
+						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(infoDiff.get("implementType"))) {
 					List<String> list = Arrays.asList(infoDiff.get("implementType").split(","));
-					String infoDiffOld = list.get(0);
-					String infoDiffNew = list.get(1);
-					contentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+					if(list.size() > 1){
+						String infoDiffOld = list.get(0);
+						String infoDiffNew = list.get(1);
+						contentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
 
-					List<String> listEn = Arrays.asList(infoDiffEn.get("implementType").split(","));
-					String infoDiffOldEn = listEn.get(0);
-					String infoDiffNewEn = listEn.get(1);
-					enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+						List<String> listEn = Arrays.asList(infoDiffEn.get("implementType").split(","));
+						String infoDiffOldEn = listEn.get(0);
+						String infoDiffNewEn = listEn.get(1);
+						enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					}
 				}
 
 				//在产车实施日期
@@ -5042,298 +5039,371 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				//新车型实施日期
 				if (StringUtils.isNotBlank(infoDiff.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String"))) {
 					List<String> list = Arrays.asList(infoDiff.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String").split(","));
-					String infoDiffOld = list.get(0);
-					String infoDiffNew = list.get(1);
-					contentLog += "'"+ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
-
 					List<String> listEn = Arrays.asList(infoDiffEn.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String").split(","));
-					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(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(infoDiff.get("attestationType"))) {
 					List<String> list = Arrays.asList(infoDiff.get("attestationType").split("\\|"));
-					String infoDiffOld = list.get(0);
-					String infoDiffNew = list.get(1);
-					contentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
-
 					List<String> listEn = Arrays.asList(infoDiffEn.get("attestationType").split("\\|"));
-					String infoDiffOldEn = listEn.get(0);
-					String infoDiffNewEn = listEn.get(1);
-					enContentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					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(infoDiff.get("attestationRank"))) {
 					List<String> list = Arrays.asList(infoDiff.get("attestationRank").split(","));
-					String infoDiffOld = list.get(0);
-					String infoDiffNew = list.get(1);
-					contentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_RANK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
-
 					List<String> listEn = Arrays.asList(infoDiffEn.get("attestationRank").split(","));
-					String infoDiffOldEn = listEn.get(0);
-					String infoDiffNewEn = listEn.get(1);
-					enContentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_RANK.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					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(infoDiff.get("dutyTerritory"))) {
 					List<String> list = Arrays.asList(infoDiff.get("dutyTerritory").split("\\|"));
-					String infoDiffOld = list.get(0);
-					String infoDiffNew = list.get(1);
-					contentLog += "'"+ProjectInventoryFieldEnum.DUTY_TERRITORY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
-
 					List<String> listEn = Arrays.asList(infoDiffEn.get("dutyTerritory").split("\\|"));
-					String infoDiffOldEn = listEn.get(0);
-					String infoDiffNewEn = listEn.get(1);
-					enContentLog += "'"+ProjectInventoryFieldEnum.DUTY_TERRITORY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					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>";
+					}
 				}
 
 				//regulationOwnerName;//法规工程师名称
 				if (StringUtils.isNotBlank(infoDiff.get("regulationOwnerName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("regulationOwnerName").split(","));
-					String infoDiffOld = list.get(0);
-					String infoDiffNew = list.get(1);
-					contentLog += "'"+ProjectInventoryFieldEnum.REGULATION_OWNER_NAME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
-
 					List<String> listEn = Arrays.asList(infoDiffEn.get("regulationOwnerName").split(","));
-					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(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>";
+					}
 				}
 				//homologationEngineerName;//认证工程师名称
 				if (StringUtils.isNotBlank(infoDiff.get("homologationEngineerName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("homologationEngineerName").split(","));
-					String infoDiffOld = list.get(0);
-					String infoDiffNew = list.get(1);
-					contentLog += "'"+ProjectInventoryFieldEnum.HOMOLOGATION_ENGINEER_NAME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
-
 					List<String> listEn = Arrays.asList(infoDiffEn.get("homologationEngineerName").split(","));
-					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(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>";
+					}
 				}
 				//engineeringInterfacePersonName;//工程接口人名称
 				if (StringUtils.isNotBlank(infoDiff.get("engineeringInterfacePersonName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("engineeringInterfacePersonName").split(","));
-					String infoDiffOld = list.get(0);
-					String infoDiffNew = list.get(1);
-					contentLog += "'"+ProjectInventoryFieldEnum.ENGINEERING_INTERFACE_PERSON_NAME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
-
 					List<String> listEn = Arrays.asList(infoDiffEn.get("engineeringInterfacePersonName").split(","));
-					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(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>";
+					}
 				}
 
 				//适用地区region 多选
 				if (StringUtils.isNotBlank(infoDiff.get("region"))) {
 					List<String> list = Arrays.asList(infoDiff.get("region").split("\\|"));
-					String infoDiffOld = list.get(0);
-					String infoDiffNew = list.get(1);
-					contentLog += "'"+ProjectInventoryFieldEnum.REGION.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
-
 					List<String> listEn = Arrays.asList(infoDiffEn.get("region").split("\\|"));
-					String infoDiffOldEn = listEn.get(0);
-					String infoDiffNewEn = listEn.get(1);
-					enContentLog += "'"+ProjectInventoryFieldEnum.REGION.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					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(infoDiff.get("remark"))) {
 					List<String> list = Arrays.asList(infoDiff.get("remark").split(","));
-					String infoDiffOld = list.get(0);
-					String infoDiffNew = list.get(1);
-					contentLog += "'"+ProjectInventoryFieldEnum.REMARK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
-
 					List<String> listEn = Arrays.asList(infoDiffEn.get("remark").split(","));
-					String infoDiffOldEn = listEn.get(0);
-					String infoDiffNewEn = listEn.get(1);
-					enContentLog += "'"+ProjectInventoryFieldEnum.REMARK.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					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(infoDiff.get("designDeliverableTypeName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("designDeliverableTypeName").split("\\|"));
-					String infoDiffOld = list.get(0);
-					String infoDiffNew = list.get(1);
-					contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
-
 					List<String> listEn = Arrays.asList(infoDiffEn.get("designDeliverableTypeName").split("\\|"));
-					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(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(infoDiff.get("designDeliverableTemplateName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("designDeliverableTemplateName").split("\\|"));
-					String infoDiffOld = list.get(0);
-					String infoDiffNew = list.get(1);
-					contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
-
 					List<String> listEn = Arrays.asList(infoDiffEn.get("designDeliverableTemplateName").split("\\|"));
-					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(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(infoDiff.get("designInitiatorName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("designInitiatorName").split(","));
-					String infoDiffOld = list.get(0);
-					String infoDiffNew = list.get(1);
-					contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
-
 					List<String> listEn = Arrays.asList(infoDiffEn.get("designInitiatorName").split(","));
-					String infoDiffOldEn = listEn.get(0);
-					String infoDiffNewEn = listEn.get(1);
-					enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_INITIATOR.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					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(infoDiff.get("designDutyName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("designDutyName").split(","));
-					String infoDiffOld = list.get(0);
-					String infoDiffNew = list.get(1);
-					contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
-
 					List<String> listEn = Arrays.asList(infoDiffEn.get("designDutyName").split(","));
-					String infoDiffOldEn = listEn.get(0);
-					String infoDiffNewEn = listEn.get(1);
-					enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUTY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					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>";
+					}
 				}
 				//设计符合性确认-截止时间designDueDateString;
 				if (StringUtils.isNotBlank(infoDiff.get("designDueDateString"))) {
 					List<String> list = Arrays.asList(infoDiff.get("designDueDateString").split(","));
-					String infoDiffOld = list.get(0);
-					String infoDiffNew = list.get(1);
-					contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
-
 					List<String> listEn = Arrays.asList(infoDiffEn.get("designDueDateString").split(","));
-					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(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>";
+					}
 				}
 				//prehomo确认-交付物类型
 				if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTypeName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("prehomoDeliverableTypeName").split("\\|"));
-					String infoDiffOld = list.get(0);
-					String infoDiffNew = list.get(1);
-					contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
-
 					List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDeliverableTypeName").split("\\|"));
-					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(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>";
+					}
 				}
 				//prehomo确认-交付物模板
 				if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTemplateName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("prehomoDeliverableTemplateName").split("\\|"));
-					String infoDiffOld = list.get(0);
-					String infoDiffNew = list.get(1);
-					contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
-
 					List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDeliverableTemplateName").split("\\|"));
-					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(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>";
+					}
 				}
 				//prehomo确认-发起人
 				if (StringUtils.isNotBlank(infoDiff.get("prehomoInitiatorName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("prehomoInitiatorName").split(","));
-					String infoDiffOld = list.get(0);
-					String infoDiffNew = list.get(1);
-					contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
-
 					List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoInitiatorName").split(","));
-					String infoDiffOldEn = listEn.get(0);
-					String infoDiffNewEn = listEn.get(1);
-					enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_INITIATOR.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					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>";
+					}
 				}
 				//prehomo确认-责任人
 				if (StringUtils.isNotBlank(infoDiff.get("prehomoDutyName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("prehomoDutyName").split(","));
-					String infoDiffOld = list.get(0);
-					String infoDiffNew = list.get(1);
-					contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
-
 					List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDutyName").split(","));
-					String infoDiffOldEn = listEn.get(0);
-					String infoDiffNewEn = listEn.get(1);
-					enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DUTY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					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>";
+					}
 				}
 				//prehomo确认-截止时间prehomoDueDateString;
 				if (StringUtils.isNotBlank(infoDiff.get("prehomoDueDateString"))) {
 					List<String> list = Arrays.asList(infoDiff.get("prehomoDueDateString").split(","));
-					String infoDiffOld = list.get(0);
-					String infoDiffNew = list.get(1);
-					contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
-
 					List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDueDateString").split(","));
-					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(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(infoDiff.get("verifyDeliverableTypeName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("verifyDeliverableTypeName").split("\\|"));
-					String infoDiffOld = list.get(0);
-					String infoDiffNew = list.get(1);
-					contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
-
 					List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDeliverableTypeName").split("\\|"));
-					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(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(infoDiff.get("verifyDeliverableTemplateName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("verifyDeliverableTemplateName").split("\\|"));
-					String infoDiffOld = list.get(0);
-					String infoDiffNew = list.get(1);
-					contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
-
 					List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDeliverableTemplateName").split("\\|"));
-					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(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(infoDiff.get("verifyInitiatorName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("verifyInitiatorName").split(","));
-					String infoDiffOld = list.get(0);
-					String infoDiffNew = list.get(1);
-					contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
-
 					List<String> listEn = Arrays.asList(infoDiffEn.get("verifyInitiatorName").split(","));
-					String infoDiffOldEn = listEn.get(0);
-					String infoDiffNewEn = listEn.get(1);
-					enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_INITIATOR.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					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(infoDiff.get("verifyDutyName"))) {
 					List<String> list = Arrays.asList(infoDiff.get("verifyDutyName").split(","));
-					String infoDiffOld = list.get(0);
-					String infoDiffNew = list.get(1);
-					contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
-
 					List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDutyName").split(","));
-					String infoDiffOldEn = listEn.get(0);
-					String infoDiffNewEn = listEn.get(1);
-					enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DUTY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					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>";
+					}
 				}
 				//验证符合性确认-截止时间verifyDueDateString
 				if (StringUtils.isNotBlank(infoDiff.get("verifyDueDateString"))) {
 					List<String> list = Arrays.asList(infoDiff.get("verifyDueDateString").split(","));
-					String infoDiffOld = list.get(0);
-					String infoDiffNew = list.get(1);
-					contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
-
 					List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDueDateString").split(","));
-					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 (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>";
+					}
 				}
 
 				contentLog = contentLog.substring(0, contentLog.length()-1);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
index 64f7b3868..1734c2ea5 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
@@ -13,7 +13,9 @@ import com.jero.modules.feishu.vo.FeishuMsgVo;
 import com.jero.modules.project.entity.*;
 import com.jero.modules.project.enums.JumpLinkEnum;
 import com.jero.modules.project.enums.MsgTypeEnum;
+import com.jero.modules.project.enums.SendMsgFlagEnum;
 import com.jero.modules.project.mapper.*;
+import com.jero.modules.project.service.IFeedbackHistoryService;
 import com.jero.modules.project.service.IProjectTaskInventoryDetailEOService;
 import com.jero.modules.project.service.IProjectTaskInventoryFeedbackEOService;
 import com.jero.modules.project.util.SendMessageUtils;
@@ -27,6 +29,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 项目库-任务清单明细表
@@ -55,6 +58,9 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 	@Autowired
 	private IProjectTaskInventoryFeedbackEOService projectTaskInventoryFeedbackEOService;
 
+	@Autowired
+	private IFeedbackHistoryService feedbackHistoryService;
+
 	@Value(value = "${jero.backUrl}")
 	private String backUrl;
 
@@ -150,7 +156,19 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 			this.baseMapper.delete(deleteWrapper);
 
 			super.saveBatch(projectTaskInventoryDetailEOAddList);
-			sendMessage(taskInventoryDetail,userIdList);
+			//获取没有发送过消息的用户
+			List<String> sendUserIdList = projectTaskInventoryDetailEOAddList.stream().filter(e -> {
+				boolean flag = true;
+				if(StringUtils.isNotEmpty(e.getIsSend())){
+					if(StringUtils.equals(e.getIsSend(), SendMsgFlagEnum.FALSE.getValue())){
+						flag = false;
+					}
+				}
+				return flag;
+			}).map(ProjectTaskInventoryDetailEO::getUserId).distinct().collect(Collectors.toList());
+			if(CollectionUtils.isNotEmpty(sendUserIdList)){
+				sendMessage(taskInventoryDetail,sendUserIdList);
+			}
 		}
 		if(CollectionUtils.isNotEmpty(projectTaskInventoryDetailEOUpdateList)){
 
@@ -188,7 +206,17 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 	@Override
     public void deleteById(String id) {
         removeById(id);
-    }
+        QueryWrapper<ProjectTaskInventoryFeedbackEO> queryWrapper = new QueryWrapper<>();
+		queryWrapper.lambda().eq(ProjectTaskInventoryFeedbackEO::getProjectTaskInventoryId,id);
+		List<ProjectTaskInventoryFeedbackEO> list = this.projectTaskInventoryFeedbackEOService.list(queryWrapper);
+		if(CollectionUtils.isNotEmpty(list)){
+			List<String> projectTaskInventoryFeedbackIdList = list.stream().map(ProjectTaskInventoryFeedbackEO::getId).distinct().collect(Collectors.toList());
+			this.projectTaskInventoryFeedbackEOService.deleteByIds(projectTaskInventoryFeedbackIdList);
+			QueryWrapper<FeedbackHistory> historyDeleteWrapper = new QueryWrapper<>();
+			historyDeleteWrapper.lambda().in(FeedbackHistory::getFeedbackId,projectTaskInventoryFeedbackIdList);
+			this.feedbackHistoryService.remove(historyDeleteWrapper);
+		}
+	}
 
 	/**
 	 * 批量删除
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
index 399267b15..ac0ea57c2 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
@@ -662,6 +662,10 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 
 		SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, currentUserId));
 
+		ProjectLawsInventoryEO projectLawsInventoryEO = this.projectLawsInventoryEOService.getOne(
+				new QueryWrapper<ProjectLawsInventoryEO>().lambda().eq(ProjectLawsInventoryEO::getId, id)
+		);
+
 		String msgContentEN = "";
 		List<String> userIdList = new ArrayList<>();
 		String dreUserIds = jsonObject.getString("dreUserIds"); //dre用户id
@@ -695,8 +699,15 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 
 
 		FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		String dutDateStr = "";
+
 		if (StringUtils.equals(msgType, MsgTypeEnum.DESIGN_ISSUE_DRE_MSG.getValue())) {
-			taskKey = "dreDispose";
+			taskKey = DesignComplianceNodeEnum.DRE_DISPOSE.getKey();
+
+			if(projectLawsInventoryEO.getDesignDueDate() != null){
+				dutDateStr = sdf.format(projectLawsInventoryEO.getDesignDueDate());
+			}
 
 			msgContentEN = sysUser.getUsername() + "has assigned the design compliance confirmation process of " + serialNumber + " in "
 					+ projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
@@ -710,6 +721,10 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 
 			taskKey = DesignComplianceNodeEnum.THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK.getKey();
 
+			if(projectLawsInventoryEO.getDesignDueDate() != null){
+				dutDateStr = sdf.format(projectLawsInventoryEO.getDesignDueDate());
+			}
+
 			msgContentEN = "The design compliance information of " + serialNumber + " in "
 					+ projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
 					+ " you sumitted has been rejected after review.  Please check and address it in time.";
@@ -722,6 +737,10 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 
 			taskKey = DesignComplianceNodeEnum.THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK.getKey();
 
+			if(projectLawsInventoryEO.getPrehomoDueDate() != null){
+				dutDateStr = sdf.format(projectLawsInventoryEO.getPrehomoDueDate());
+			}
+
 			msgContentEN = "The Pre-Homo confirmation of " + serialNumber + " in "
 					+ projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
 					+ " you sumitted has been rejected after review. Please check and address it in time.";
@@ -734,6 +753,10 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 
 			taskKey = DesignComplianceNodeEnum.THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK.getKey();
 
+			if(projectLawsInventoryEO.getVerifyDueDate() != null){
+				dutDateStr = sdf.format(projectLawsInventoryEO.getVerifyDueDate());
+			}
+
 			msgContentEN = "The validation compliance information of " + serialNumber + " in "
 					+ projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
 					+ " you sumitted has been rejected after review. Please check and address it in time.";
@@ -741,6 +764,8 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 			feishuMsgVo.setContent("Hello! The compliance information you submitted has been rejected after review. Please check and address it in a timely manner.");
 			feishuMsgVo.setTaskType("Validation Compliance Confirmation");
 		}
+		feishuMsgVo.setDueDate(dutDateStr);
+		feishuMsgVo.setInitiator(sysUser.getUsername());
 		feishuMsgVo.setRegulationNo(serialNumber);
 		feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket());
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/DesignComplianceNodeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/DesignComplianceNodeEnum.java
index 9865b861d..f79868e9e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/DesignComplianceNodeEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/DesignComplianceNodeEnum.java
@@ -12,6 +12,8 @@ public enum DesignComplianceNodeEnum {
     INITIATE_PROCESS("fqlc","发起流程","Initiate process"),
     THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK("zrrclrw","责任人处理任务","The responsible person handles the task"),
     SPONSOR_REVIEW("fqrsh","发起人审核","Sponsor review"),
+
+    DRE_DISPOSE("dreDispose","dre处理","dreDispose"),
     ;
 
     String key;
diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue
index efc3a9f0d..3a73f74ab 100644
--- a/jero-web/src/components/CollectionType/index.vue
+++ b/jero-web/src/components/CollectionType/index.vue
@@ -729,10 +729,9 @@
     font-weight: bold;
   }
 
-  .ant-table td {
-    white-space: nowrap;
-  }
-
+  /*.ant-table td {*/
+  /*  white-space: nowrap;*/
+  /*}*/
   .selectWid .ant-select-selection--multiple {
     overflow: auto;
   }
diff --git a/jero-web/src/components/SplitDetailTable/index.vue b/jero-web/src/components/SplitDetailTable/index.vue
index 930453350..6d2e41c15 100644
--- a/jero-web/src/components/SplitDetailTable/index.vue
+++ b/jero-web/src/components/SplitDetailTable/index.vue
@@ -277,9 +277,6 @@
     font-weight: bold;
   }
 
-  .ant-table td {
-    white-space: nowrap;
-  }
   .split-detail-wrap{
     .table{
       .ant-table-row-cell-break-word{
@@ -305,6 +302,9 @@
   }
 </style>
 <style lang="less" scoped>
+  .ant-table td {
+    white-space: nowrap;
+  }
   .box {
     width: 100%;
     height: calc(100% - 100px);
diff --git a/jero-web/src/components/jero/JLoading.vue b/jero-web/src/components/jero/JLoading.vue
index 8266f08ee..f6f42d096 100644
--- a/jero-web/src/components/jero/JLoading.vue
+++ b/jero-web/src/components/jero/JLoading.vue
@@ -54,7 +54,7 @@
     position: absolute;
     top: 0;
     left: 0;
-    z-index: 111999;
+    z-index: 1009;
     width: 100%;
     height: 100%;
     background-color: rgba(255, 255, 255, 0.9);
diff --git a/jero-web/src/components/libraryAddForm/index.vue b/jero-web/src/components/libraryAddForm/index.vue
index 47a13b0ec..6e340f31f 100644
--- a/jero-web/src/components/libraryAddForm/index.vue
+++ b/jero-web/src/components/libraryAddForm/index.vue
@@ -327,6 +327,7 @@
                 this.$emit('addFormClick')
               } else {
                 this.confirmLoading = false
+                this.$emit('addFormWarning')
                 if (res.message.indexOf('发布日期不能大于') >= 0) {
                   this.$message.warning(res.message)
                 } else if (res.message.indexOf('编号已存在') >= 0) {
@@ -337,6 +338,7 @@
               }
             })
           } else {
+            this.$emit('addFormWarning')
             return false
           }
         })
diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index d4e712fbe..5b10cf122 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -671,10 +671,6 @@
     font-weight: bold;
   }
 
-  .ant-table td {
-    white-space: nowrap;
-  }
-
   .content-text {
     width: 100%;
     display: flex;
diff --git a/jero-web/src/views/documentManage/library/modules/addForm.vue b/jero-web/src/views/documentManage/library/modules/addForm.vue
index 712b31133..214cd6b4b 100644
--- a/jero-web/src/views/documentManage/library/modules/addForm.vue
+++ b/jero-web/src/views/documentManage/library/modules/addForm.vue
@@ -11,6 +11,7 @@
     <addFormData
       ref="addFormDataRef"
       @addFormClick="addFormClick"
+      @addFormWarning="addFormWarning"
       :flag="'1'"
       v-if="visible"
       :url="url"
@@ -59,6 +60,7 @@
         this.visible = false
       },
       add() {
+        this.confirmLoading = false
         this.title = this.$t('add')
         this.visible = true
         this.$nextTick(() => {
@@ -66,6 +68,7 @@
         })
       },
       edit(item) {
+        this.confirmLoading = false
         this.title = this.$t('edit')
         this.visible = true
         this.$nextTick(() => {
@@ -73,8 +76,12 @@
         })
       },
       handleSubmit() {
+        this.confirmLoading = true
         this.$refs.addFormDataRef.sumber()
       },
+      addFormWarning(){
+        this.confirmLoading = false
+      },
       addFormClick() {
         this.visible = false
       }
diff --git a/jero-web/src/views/processCenter/components/PersonnelSelection/index.vue b/jero-web/src/views/processCenter/components/PersonnelSelection/index.vue
index fb8bcc291..23f3160b7 100644
--- a/jero-web/src/views/processCenter/components/PersonnelSelection/index.vue
+++ b/jero-web/src/views/processCenter/components/PersonnelSelection/index.vue
@@ -58,7 +58,7 @@
 
   export default {
     name: 'index',
-    props: ['query', 'value', 'personneQuery', 'isSingleChoice', 'isInput', 'isClass','isDelete','distributionEngineerList'],
+    props: ['query', 'value', 'personneQuery', 'isSingleChoice', 'isInput', 'isClass', 'isDelete', 'distributionEngineerList'],
     data() {
       return {
         loading: true,
@@ -90,10 +90,10 @@
         this.queryDepartUserTreeList()
         this.visible = true
       },
-      standardDelete(){
+      standardDelete() {
         this.$emit('input', null)
         this.$forceUpdate()
-        this.$emit('deleteData',this.query.db_field_name)
+        this.$emit('deleteData', this.query.db_field_name)
       },
       // onSelect(selectedKeys, info) {
       //   console.log(selectedKeys)
@@ -155,23 +155,23 @@
           for (var i = 0; i < arr.length - 1; i++) {
             for (var j = i + 1; j < arr.length; j++) {
               if (arr[i] === arr[j]) {
-                arr.splice(j, 1);
-                j--;
+                arr.splice(j, 1)
+                j--
               }
             }
           }
-          return arr;
+          return arr
         }
-        if (this.distributionEngineerList && this.distributionEngineerList.length > 0){
-          this.distributionEngineerList.forEach(res=>{
-            userIds.shift(res.userId)
-            userName.shift(res.name)
+        if (this.distributionEngineerList && this.distributionEngineerList.length > 0) {
+          this.distributionEngineerList.forEach(res => {
+            userIds.unshift(res.userId)
+            userName.unshift(res.name)
           })
         }
         userIds = noRepeat1(userIds)
         userName = noRepeat1(userName)
         this.$emit('input', userName.join(','))
-        this.$emit('change', this.query.db_field_name, userIds.join(','),this.query.subscript)
+        this.$emit('change', this.query.db_field_name, userIds.join(','), this.query.subscript)
         this.visible = false
         this.treeVisible = false
         // } else {
@@ -198,8 +198,8 @@
       },
       getUserAndDepart() {
         getAction('sys/user/getUserAndDepart', { name: this.searchModel }).then((res) => {
-          if (res){
-            this.gData = res.filter(ele => ele.flag === 'DEPART');
+          if (res) {
+            this.gData = res.filter(ele => ele.flag === 'DEPART')
           } else {
             this.gData = []
           }
diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
index 61624e98e..39898a7ed 100644
--- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
+++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
@@ -505,6 +505,7 @@
           for (let j = 0; j < this.distributionEngineerList.length; j++) {
             if (this.dataSourceTable[i].userId == this.distributionEngineerList[j].userId) {
               this.distributionEngineerList[j].isSend = '1'
+              this.distributionEngineerList[j].id = this.dataSourceTable[i].id
             }
           }
         }
@@ -688,19 +689,49 @@
               userId: this.formInline[value].split(',')[index]
             })
           })
+          for (let i = 0; i < this.dataSourceTable.length; i++) {
+            for (let j = 0; j < this.distributionEngineerList.length; j++) {
+              if (this.dataSourceTable[i].userId == this.distributionEngineerList[j].userId) {
+                this.distributionEngineerList[j].deliveryInstructions = this.dataSourceTable[i].deliveryInstructions
+              }
+            }
+          }
         }
+        this.distributionEngineerList = [...this.distributionEngineerList]
         this.formInline = { ...this.formInline }
       },
       deleteText(num) {
-        this.distributionEngineerList.splice(num, 1)
-        this.distributionEngineerList = [...this.distributionEngineerList]
-        this.formInline.userName = this.formInline.userName.split(',')
-        this.formInline.userName.splice(num, 1)
-        this.formInline.userName = this.formInline.userName.join(',')
-        this.formInline.userId = this.formInline.userId.split(',')
-        this.formInline.userId.splice(num, 1)
-        this.formInline.userId = this.formInline.userId.join(',')
-        this.formInline = { ...this.formInline }
+        let _this = this
+        this.$confirm({
+          content: _this.$t('ConfirmDelete'),
+          onOk() {
+            let id = ''
+            _this.dataSourceTable.forEach(res => {
+              if (res.userName == _this.distributionEngineerList[num].name) {
+                id = res.id
+              }
+            })
+            _this.distributionEngineerList.splice(num, 1)
+            _this.distributionEngineerList = [..._this.distributionEngineerList]
+            _this.formInline.userName = _this.formInline.userName.split(',')
+            _this.formInline.userName.splice(num, 1)
+            _this.formInline.userName = _this.formInline.userName.join(',')
+            _this.formInline.userId = _this.formInline.userId.split(',')
+            _this.formInline.userId.splice(num, 1)
+            _this.formInline.userId = _this.formInline.userId.join(',')
+            _this.formInline = { ..._this.formInline }
+            if (id){
+              deleteAction('/project/projectTaskInventoryDetailEO/delete', { id: id }).then((res) => {
+                if (res.success) {
+                  _this.$message.success(_this.$t('OperationSuccessful'))
+                  _this.getList()
+                } else {
+                  _this.$message.warning(res.message)
+                }
+              })
+            }
+          }
+        })
       },
       edit(val, title) {
         this.title = title
diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue
index 785f780ab..41ad6963e 100644
--- a/jero-web/src/views/projectManagement/components/TaskList.vue
+++ b/jero-web/src/views/projectManagement/components/TaskList.vue
@@ -55,8 +55,8 @@
       >
         <div slot="standardInformation" slot-scope="text,result" class="box-left">
           <div class="content">
-            <a class="box-content-a" :title="result.serialNumber">{{result.serialNumber}}</a>
-            <a class="box-content-buttom" :title="result.title">{{result.title}}</a>
+            <a class="box-content-a" :title="result.serialNumber">{{result.serialNumber}}dsf jdslfkj dsflkdsjfdslkfjds fldskfjdsklfds</a>
+            <a class="box-content-buttom" :title="result.title">{{result.title}}sdfdsfdsfdsfjds lfdjsfdslfjsflkdsfjdsklfdjsfklsd</a>
           </div>
         </div>
         <div slot="areaOfResponsibility" slot-scope="text,result" class="box-left">
diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
index e9bd13cd4..3a0c09d0e 100644
--- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
+++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
@@ -429,9 +429,9 @@
 <style lang="less" scoped>
   @import '~@assets/less/common.less';
 
-  /deep/ .ant-table td {
-    white-space: normal;
-  }
+  /*/deep/ .ant-table td {*/
+  /*  white-space: normal;*/
+  /*}*/
 
   .doc-detail {
     background: #fff;