From d43a16fd50b3366ec6b26c8114f8bd391ec13b2c Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 8 Jul 2022 17:52:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E4=BA=A4=E4=BB=98=E7=89=A9=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/first_bug_fix_record.sql | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql index 2358aa416..47d3c62c6 100644 --- a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql +++ b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql @@ -27,5 +27,12 @@ ALTER TABLE `project_laws_inventory` ALTER TABLE `project_task_inventory` ADD COLUMN `stand_id` varchar(100) NULL COMMENT '文档库id/标准id' AFTER `process_end_time`; +-- 2022年7月8日增加字段 ALTER TABLE `dummy_inventory_info` ADD COLUMN `buss_document_library_id` varchar(32) NULL COMMENT '文档库id' AFTER `design_remark`; + +-- 2022年7月8日法规清单交付物类型字段长度 +ALTER TABLE `project_laws_inventory` +MODIFY COLUMN `design_deliverable_type` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '设计符合性确认-交付物类型' AFTER `remark`, +MODIFY COLUMN `prehomo_deliverable_type` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'prehomo确认-交付物类型' AFTER `design_due_date`, +MODIFY COLUMN `verify_deliverable_type` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '验证符合性确认-交付物类型' AFTER `prehomo_due_date`; From f879261d7545c59076d00df195914eaec04a336b Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 8 Jul 2022 18:02:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/system/MessageDetails.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/system/MessageDetails.vue b/jero-web/src/views/system/MessageDetails.vue index a9b866dfe..309fe3c4a 100644 --- a/jero-web/src/views/system/MessageDetails.vue +++ b/jero-web/src/views/system/MessageDetails.vue @@ -75,11 +75,11 @@ } .box-content { - padding: 40px 120px; + padding: 40px 70px; box-sizing: border-box; color: #040B29; font-size: 16px; - text-indent: 30px; - letter-spacing: 3px + text-indent: 24px; + /*letter-spacing: 1px*/ } \ No newline at end of file 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 3/3] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E7=BC=96=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"; } - List 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 + "
"; - } + if(StringUtils.isNotBlank(infoDiffEn.get("subtitle"))){ + List 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 + "
"; + } + } } //WVTA ID if (StringUtils.isNotBlank(infoDiff.get("wvtaId"))) { @@ -5025,12 +5027,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl"; } - List 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 + "
"; - } + if(StringUtils.isNotBlank(infoDiffEn.get("wvtaId"))){ + List 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 + "
"; + } + } } //实施类别 @@ -5041,12 +5045,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl"; } - List 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 + "
"; - } + if(StringUtils.isNotBlank(infoDiffEn.get("implementType"))){ + List 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 + "
"; + } + } } //在产车实施日期 @@ -5057,382 +5063,454 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl"; } - - List 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 + "
"; - } + if(StringUtils.isNotBlank(infoDiffEn.get("implementTimeString"))){ + List 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 + "
"; + } + } } //新车型实施日期 if (StringUtils.isNotBlank(infoDiff.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String"))) { List list = Arrays.asList(infoDiff.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String").split(",")); - List 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 + "
"; } - 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 + "
"; - + if(StringUtils.isNotBlank(infoDiffEn.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String"))){ + List 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 + "
"; + } } } //认证类型 if (StringUtils.isNotBlank(infoDiff.get("attestationType"))) { List list = Arrays.asList(infoDiff.get("attestationType").split("\\|")); - List 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 + "
"; } - 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 + "
"; + if(StringUtils.isNotBlank(infoDiffEn.get("attestationType"))){ + List 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 + "
"; + } } } //认证级别 if (StringUtils.isNotBlank(infoDiff.get("attestationRank"))) { List list = Arrays.asList(infoDiff.get("attestationRank").split(",")); - List 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 + "
"; } - 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 + "
"; + if(StringUtils.isNotBlank(infoDiffEn.get("attestationRank"))){ + List 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 + "
"; + } } } //责任领域 if (StringUtils.isNotBlank(infoDiff.get("dutyTerritory"))) { List list = Arrays.asList(infoDiff.get("dutyTerritory").split("\\|")); - List 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 + "
"; } - 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 + "
"; + if(StringUtils.isNotBlank(infoDiffEn.get("dutyTerritory"))){ + List 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 + "
"; + } } } //regulationOwnerName;//法规工程师名称 if (StringUtils.isNotBlank(infoDiff.get("regulationOwnerName"))) { List list = Arrays.asList(infoDiff.get("regulationOwnerName").split(",")); - List 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 + "
"; } - 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 + "
"; + if(StringUtils.isNotBlank(infoDiffEn.get("regulationOwnerName"))){ + List 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 + "
"; + } } } //homologationEngineerName;//认证工程师名称 if (StringUtils.isNotBlank(infoDiff.get("homologationEngineerName"))) { List list = Arrays.asList(infoDiff.get("homologationEngineerName").split(",")); - List 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 + "
"; } - 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 + "
"; + if(StringUtils.isNotBlank(infoDiffEn.get("homologationEngineerName"))){ + List 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 + "
"; + } } } //engineeringInterfacePersonName;//工程接口人名称 if (StringUtils.isNotBlank(infoDiff.get("engineeringInterfacePersonName"))) { List list = Arrays.asList(infoDiff.get("engineeringInterfacePersonName").split(",")); - List 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 + "
"; } - 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 + "
"; + if(StringUtils.isNotBlank(infoDiffEn.get("engineeringInterfacePersonName"))){ + List 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 + "
"; + } } } //适用地区region 多选 if (StringUtils.isNotBlank(infoDiff.get("region"))) { List list = Arrays.asList(infoDiff.get("region").split("\\|")); - List 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 + "
"; } - 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 + "
"; + if(StringUtils.isNotBlank(infoDiffEn.get("region"))){ + List 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 + "
"; + } } } //备注 if (StringUtils.isNotBlank(infoDiff.get("remark"))) { List list = Arrays.asList(infoDiff.get("remark").split(",")); - List 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 + "
"; } - 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 + "
"; + if(StringUtils.isNotBlank(infoDiffEn.get("remark"))){ + List 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 + "
"; + } } } //设计符合性确认-交付物类型 if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTypeName"))) { List list = Arrays.asList(infoDiff.get("designDeliverableTypeName").split("\\|")); - List 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 + "
"; } - 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 + "
"; + if(StringUtils.isNotBlank(infoDiffEn.get("designDeliverableTypeName"))){ + List 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 + "
"; + } } } //设计符合性确认-交付物模板 if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTemplateName"))) { List list = Arrays.asList(infoDiff.get("designDeliverableTemplateName").split("\\|")); - List 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 + "
"; } - 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 + "
"; + if(StringUtils.isNotBlank(infoDiffEn.get("designDeliverableTemplateName"))){ + List 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 + "
"; + } } } //设计符合性确认-发起人 if (StringUtils.isNotBlank(infoDiff.get("designInitiatorName"))) { List list = Arrays.asList(infoDiff.get("designInitiatorName").split(",")); - List 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 + "
"; } - 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 + "
"; + if(StringUtils.isNotBlank(infoDiffEn.get("designInitiatorName"))){ + List 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 + "
"; + } } } //设计符合性确认-责任人 if (StringUtils.isNotBlank(infoDiff.get("designDutyName"))) { List list = Arrays.asList(infoDiff.get("designDutyName").split(",")); - List 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 + "
"; } - 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 + "
"; + if(StringUtils.isNotBlank(infoDiffEn.get("designDutyName"))){ + List 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 + "
"; + } } } //设计符合性确认-截止时间designDueDateString; if (StringUtils.isNotBlank(infoDiff.get("designDueDateString"))) { List list = Arrays.asList(infoDiff.get("designDueDateString").split(",")); - List 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 + "
"; } - 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 + "
"; + if(StringUtils.isNotBlank(infoDiffEn.get("designDueDateString"))){ + List 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 + "
"; + } } } //prehomo确认-交付物类型 if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTypeName"))) { List list = Arrays.asList(infoDiff.get("prehomoDeliverableTypeName").split("\\|")); - List 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 + "
"; } - 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 + "
"; + if(StringUtils.isNotBlank(infoDiffEn.get("prehomoDeliverableTypeName"))){ + List 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 + "
"; + } } } //prehomo确认-交付物模板 if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTemplateName"))) { List list = Arrays.asList(infoDiff.get("prehomoDeliverableTemplateName").split("\\|")); - List 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 + "
"; } - 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 + "
"; + if(StringUtils.isNotBlank(infoDiffEn.get("prehomoDeliverableTemplateName"))){ + List 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 + "
"; + } } } //prehomo确认-发起人 if (StringUtils.isNotBlank(infoDiff.get("prehomoInitiatorName"))) { List list = Arrays.asList(infoDiff.get("prehomoInitiatorName").split(",")); - List 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 + "
"; } - 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 + "
"; + if(StringUtils.isNotBlank(infoDiffEn.get("prehomoInitiatorName"))){ + List 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 + "
"; + } } } //prehomo确认-责任人 if (StringUtils.isNotBlank(infoDiff.get("prehomoDutyName"))) { List list = Arrays.asList(infoDiff.get("prehomoDutyName").split(",")); - List 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 + "
"; } - 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 + "
"; + if(StringUtils.isNotBlank(infoDiffEn.get("prehomoDutyName"))){ + List 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 + "
"; + } } } //prehomo确认-截止时间prehomoDueDateString; if (StringUtils.isNotBlank(infoDiff.get("prehomoDueDateString"))) { List list = Arrays.asList(infoDiff.get("prehomoDueDateString").split(",")); - List 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 + "
"; } - 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 + "
"; + if(StringUtils.isNotBlank(infoDiffEn.get("prehomoDueDateString"))){ + List 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 + "
"; + } } } //验证符合性确认-交付物类型 if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTypeName"))) { List list = Arrays.asList(infoDiff.get("verifyDeliverableTypeName").split("\\|")); - List 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 + "
"; } - 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 + "
"; + if(StringUtils.isNotBlank(infoDiffEn.get("verifyDeliverableTypeName"))){ + List 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 + "
"; + } } } //验证符合性确认-交付物模板 if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTemplateName"))) { List list = Arrays.asList(infoDiff.get("verifyDeliverableTemplateName").split("\\|")); - List 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 + "
"; } - 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 + "
"; + if(StringUtils.isNotBlank(infoDiffEn.get("verifyDeliverableTemplateName"))){ + List 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 + "
"; + } } } //验证符合性确认-发起人 if (StringUtils.isNotBlank(infoDiff.get("verifyInitiatorName"))) { List list = Arrays.asList(infoDiff.get("verifyInitiatorName").split(",")); - List 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 + "
"; } - 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 + "
"; + if(StringUtils.isNotBlank(infoDiffEn.get("verifyInitiatorName"))){ + List 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 + "
"; + } } } //验证符合性确认-责任人 if (StringUtils.isNotBlank(infoDiff.get("verifyDutyName"))) { List list = Arrays.asList(infoDiff.get("verifyDutyName").split(",")); - List 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 + "
"; } - 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 + "
"; + if(StringUtils.isNotBlank(infoDiffEn.get("verifyDutyName"))){ + List 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 + "
"; + } } } //验证符合性确认-截止时间verifyDueDateString if (StringUtils.isNotBlank(infoDiff.get("verifyDueDateString"))) { List list = Arrays.asList(infoDiff.get("verifyDueDateString").split(",")); - List 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 + "
"; } - 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 + "
"; + if(StringUtils.isNotBlank(infoDiffEn.get("verifyDueDateString"))){ + List 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 + "
"; + } } }