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 05d759a67..9e52b0c6b 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 @@ -372,8 +372,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl"; + String enContentLog = username+" edited the “" + projectLawsInventoryEO.getSerialNumber() + "” in the list:
"; List infoEOList = new ArrayList<>(); infoEOList.add(projectLawsInventoryEO); @@ -548,7 +548,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl infoListCopy = DeepCopyListUtil.depCopy(infoList); @@ -1846,19 +1846,29 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl"); } public StringBuilder setUpdateEnContentLog(StringBuilder contentLogBuilder,String fieldName,String oldValue,String newValue){ - return contentLogBuilder.append("\'"+ fieldName + "\' changed from " + oldValue + " to " + newValue).append(","); + return contentLogBuilder.append("\'"+ fieldName + "\' changed from " + oldValue + " to " + newValue).append("
"); } private void translateData(List infoList) { for (ProjectLawsInventoryEO projectLawsInventoryEO : infoList) { @@ -4440,24 +4450,24 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("subtitle").split(",")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.SUBTITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.SUBTITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; List 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 + ","; + enContentLog += "'"+ProjectInventoryFieldEnum.SUBTITLE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } //WVTA ID if (StringUtils.isNotBlank(infoDiff.get("wvtaId"))) { List list = Arrays.asList(infoDiff.get("wvtaId").split(",")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.WVTA_ID.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.WVTA_ID.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; List 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 + ","; + enContentLog += "'"+ProjectInventoryFieldEnum.WVTA_ID.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } //实施类别 @@ -4465,12 +4475,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("implementType").split(",")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; List 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 + ","; + enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } //在产车实施日期 @@ -4482,8 +4492,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl listEn = Arrays.asList(infoDiffEn.get("implementTimeString").split(",")); String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; - enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; + contentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; + enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } //新车型实施日期 @@ -4491,12 +4501,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl 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 + ","; + contentLog += "'"+ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; List 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 + ","; + enContentLog += "'"+ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } //认证类型 @@ -4504,12 +4514,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("attestationType").split("\\|")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; List 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 + ","; + enContentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } //认证级别 @@ -4517,12 +4527,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("attestationRank").split(",")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_RANK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_RANK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; List 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 + ","; + enContentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_RANK.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } //责任领域 @@ -4530,12 +4540,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("dutyTerritory").split("\\|")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.DUTY_TERRITORY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.DUTY_TERRITORY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; List 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 + ","; + enContentLog += "'"+ProjectInventoryFieldEnum.DUTY_TERRITORY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } //regulationOwnerName;//法规工程师名称 @@ -4543,36 +4553,36 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl 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 + ","; + contentLog += "'"+ProjectInventoryFieldEnum.REGULATION_OWNER_NAME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; List 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 + ","; + enContentLog += "'"+ProjectInventoryFieldEnum.REGULATION_OWNER_NAME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } //homologationEngineerName;//认证工程师名称 if (StringUtils.isNotBlank(infoDiff.get("homologationEngineerName"))) { List 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 + ","; + contentLog += "'"+ProjectInventoryFieldEnum.HOMOLOGATION_ENGINEER_NAME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; List 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 + ","; + enContentLog += "'"+ProjectInventoryFieldEnum.HOMOLOGATION_ENGINEER_NAME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } //engineeringInterfacePersonName;//工程接口人名称 if (StringUtils.isNotBlank(infoDiff.get("engineeringInterfacePersonName"))) { List 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 + ","; + contentLog += "'"+ProjectInventoryFieldEnum.ENGINEERING_INTERFACE_PERSON_NAME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; List 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 + ","; + enContentLog += "'"+ProjectInventoryFieldEnum.ENGINEERING_INTERFACE_PERSON_NAME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } //适用地区region 多选 @@ -4580,12 +4590,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("region").split("\\|")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.REGION.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.REGION.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; List 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 + ","; + enContentLog += "'"+ProjectInventoryFieldEnum.REGION.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } //备注 @@ -4593,12 +4603,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("remark").split(",")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.REMARK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.REMARK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; List 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 + ","; + enContentLog += "'"+ProjectInventoryFieldEnum.REMARK.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } //设计符合性确认-交付物类型 @@ -4606,120 +4616,120 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl 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 + ","; + contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; List 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 + ","; + enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } //设计符合性确认-交付物模板 if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTemplateName"))) { List 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 + ","; + contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; List 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 + ","; + enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } //设计符合性确认-发起人 if (StringUtils.isNotBlank(infoDiff.get("designInitiatorName"))) { List list = Arrays.asList(infoDiff.get("designInitiatorName").split(",")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; List 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 + ","; + enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_INITIATOR.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } //设计符合性确认-责任人 if (StringUtils.isNotBlank(infoDiff.get("designDutyName"))) { List list = Arrays.asList(infoDiff.get("designDutyName").split(",")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; List 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 + ","; + enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUTY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } //设计符合性确认-截止时间designDueDateString; if (StringUtils.isNotBlank(infoDiff.get("designDueDateString"))) { List 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 + ","; + contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; List 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 + ","; + enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } //prehomo确认-交付物类型 if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTypeName"))) { List 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 + ","; + contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; List 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 + ","; + enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } //prehomo确认-交付物模板 if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTemplateName"))) { List 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 + ","; + contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; List 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 + ","; + enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } //prehomo确认-发起人 if (StringUtils.isNotBlank(infoDiff.get("prehomoInitiatorName"))) { List list = Arrays.asList(infoDiff.get("prehomoInitiatorName").split(",")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; List 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 + ","; + enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_INITIATOR.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } //prehomo确认-责任人 if (StringUtils.isNotBlank(infoDiff.get("prehomoDutyName"))) { List list = Arrays.asList(infoDiff.get("prehomoDutyName").split(",")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; List 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 + ","; + enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DUTY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } //prehomo确认-截止时间prehomoDueDateString; if (StringUtils.isNotBlank(infoDiff.get("prehomoDueDateString"))) { List 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 + ","; + contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; List 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 + ","; + enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } //验证符合性确认-交付物类型 @@ -4727,60 +4737,60 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl 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 + ","; + contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; List 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 + ","; + enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } //验证符合性确认-交付物模板 if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTemplateName"))) { List 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 + ","; + contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; List 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 + ","; + enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } //验证符合性确认-发起人 if (StringUtils.isNotBlank(infoDiff.get("verifyInitiatorName"))) { List list = Arrays.asList(infoDiff.get("verifyInitiatorName").split(",")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; List 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 + ","; + enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_INITIATOR.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } //验证符合性确认-责任人 if (StringUtils.isNotBlank(infoDiff.get("verifyDutyName"))) { List list = Arrays.asList(infoDiff.get("verifyDutyName").split(",")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; List 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 + ","; + enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DUTY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } //验证符合性确认-截止时间verifyDueDateString if (StringUtils.isNotBlank(infoDiff.get("verifyDueDateString"))) { List 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 + ","; + contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; List 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 + ","; + enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; } contentLog = contentLog.substring(0, contentLog.length()-1);