WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage

Browse Source
This commit is contained in:
wangzhijiang
2022-07-08 18:38:33 +08:00
parent 3e740529c8 ed5c273bc1
commit c729d99559
3 changed files with 234 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/db/蔚来标准sql/first_bug_fix_record.sql
+7
View File
@@ -27,5 +27,12 @@ ALTER TABLE `project_laws_inventory`
ALTER TABLE `project_task_inventory` ALTER TABLE `project_task_inventory`
ADD COLUMN `stand_id` varchar(100) NULL COMMENT '文档库id/标准id' AFTER `process_end_time`; ADD COLUMN `stand_id` varchar(100) NULL COMMENT '文档库id/标准id' AFTER `process_end_time`;
-- 2022年7月8日增加字段
ALTER TABLE `dummy_inventory_info` ALTER TABLE `dummy_inventory_info`
ADD COLUMN `buss_document_library_id` varchar(32) NULL COMMENT '文档库id' AFTER `design_remark`; 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`;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+224 -146
View File
@@ -5010,12 +5010,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String infoDiffNew = list.get(1); String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.SUBTITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>"; contentLog += "'"+ProjectInventoryFieldEnum.SUBTITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
} }
List<String> listEn = Arrays.asList(infoDiffEn.get("subtitle").split(",")); if(StringUtils.isNotBlank(infoDiffEn.get("subtitle"))){
if(listEn.size() > 1){ List<String> listEn = Arrays.asList(infoDiffEn.get("subtitle").split(","));
String infoDiffOldEn = listEn.get(0); if(listEn.size() > 1){
String infoDiffNewEn = listEn.get(1); String infoDiffOldEn = listEn.get(0);
enContentLog += "'"+ProjectInventoryFieldEnum.SUBTITLE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>"; String infoDiffNewEn = listEn.get(1);
} enContentLog += "'"+ProjectInventoryFieldEnum.SUBTITLE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
}
}
} }
//WVTA ID //WVTA ID
if (StringUtils.isNotBlank(infoDiff.get("wvtaId"))) { if (StringUtils.isNotBlank(infoDiff.get("wvtaId"))) {
@@ -5025,12 +5027,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String infoDiffNew = list.get(1); String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.WVTA_ID.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>"; contentLog += "'"+ProjectInventoryFieldEnum.WVTA_ID.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
} }
List<String> listEn = Arrays.asList(infoDiffEn.get("wvtaId").split(",")); if(StringUtils.isNotBlank(infoDiffEn.get("wvtaId"))){
if(listEn.size() > 1){ List<String> listEn = Arrays.asList(infoDiffEn.get("wvtaId").split(","));
String infoDiffOldEn = listEn.get(0); if(listEn.size() > 1){
String infoDiffNewEn = listEn.get(1); String infoDiffOldEn = listEn.get(0);
enContentLog += "'"+ProjectInventoryFieldEnum.WVTA_ID.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>"; String infoDiffNewEn = listEn.get(1);
} enContentLog += "'"+ProjectInventoryFieldEnum.WVTA_ID.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
}
}
} }
//实施类别 //实施类别
@@ -5041,12 +5045,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String infoDiffNew = list.get(1); String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>"; contentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
} }
List<String> listEn = Arrays.asList(infoDiffEn.get("implementType").split(",")); if(StringUtils.isNotBlank(infoDiffEn.get("implementType"))){
if(listEn.size() > 1){ List<String> listEn = Arrays.asList(infoDiffEn.get("implementType").split(","));
String infoDiffOldEn = listEn.get(0); if(listEn.size() > 1){
String infoDiffNewEn = listEn.get(1); String infoDiffOldEn = listEn.get(0);
enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>"; String infoDiffNewEn = listEn.get(1);
} enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
}
}
} }
//在产车实施日期 //在产车实施日期
@@ -5057,382 +5063,454 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String infoDiffNew = list.get(1); String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>"; contentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
} }
if(StringUtils.isNotBlank(infoDiffEn.get("implementTimeString"))){
List<String> listEn = Arrays.asList(infoDiffEn.get("implementTimeString").split(",")); List<String> listEn = Arrays.asList(infoDiffEn.get("implementTimeString").split(","));
if(listEn.size() > 1){ if(listEn.size() > 1){
String infoDiffOldEn = listEn.get(0); String infoDiffOldEn = listEn.get(0);
String infoDiffNewEn = listEn.get(1); String infoDiffNewEn = listEn.get(1);
enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>"; enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
} }
}
} }
//新车型实施日期 //新车型实施日期
if (StringUtils.isNotBlank(infoDiff.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String"))) { if (StringUtils.isNotBlank(infoDiff.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String"))) {
List<String> list = Arrays.asList(infoDiff.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String").split(",")); List<String> list = Arrays.asList(infoDiff.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String").split(","));
List<String> listEn = Arrays.asList(infoDiffEn.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String").split(","));
if(list.size() > 1){ if(list.size() > 1){
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1); String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>"; contentLog += "'"+ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
} }
if(listEn.size() > 1){ if(StringUtils.isNotBlank(infoDiffEn.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String"))){
String infoDiffOldEn = listEn.get(0); List<String> listEn = Arrays.asList(infoDiffEn.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String").split(","));
String infoDiffNewEn = listEn.get(1); if(listEn.size() > 1){
enContentLog += "'"+ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>"; 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"))) { if (StringUtils.isNotBlank(infoDiff.get("attestationType"))) {
List<String> list = Arrays.asList(infoDiff.get("attestationType").split("\\|")); List<String> list = Arrays.asList(infoDiff.get("attestationType").split("\\|"));
List<String> listEn = Arrays.asList(infoDiffEn.get("attestationType").split("\\|"));
if(list.size() > 1){ if(list.size() > 1){
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1); String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>"; contentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
} }
if(listEn.size() > 1){ if(StringUtils.isNotBlank(infoDiffEn.get("attestationType"))){
String infoDiffOldEn = listEn.get(0); List<String> listEn = Arrays.asList(infoDiffEn.get("attestationType").split("\\|"));
String infoDiffNewEn = listEn.get(1); if(listEn.size() > 1){
enContentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>"; 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"))) { if (StringUtils.isNotBlank(infoDiff.get("attestationRank"))) {
List<String> list = Arrays.asList(infoDiff.get("attestationRank").split(",")); List<String> list = Arrays.asList(infoDiff.get("attestationRank").split(","));
List<String> listEn = Arrays.asList(infoDiffEn.get("attestationRank").split(","));
if(list.size() > 1){ if(list.size() > 1){
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1); String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_RANK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>"; contentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_RANK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
} }
if(listEn.size() > 1){ if(StringUtils.isNotBlank(infoDiffEn.get("attestationRank"))){
String infoDiffOldEn = listEn.get(0); List<String> listEn = Arrays.asList(infoDiffEn.get("attestationRank").split(","));
String infoDiffNewEn = listEn.get(1); if(listEn.size() > 1){
enContentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_RANK.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>"; 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"))) { if (StringUtils.isNotBlank(infoDiff.get("dutyTerritory"))) {
List<String> list = Arrays.asList(infoDiff.get("dutyTerritory").split("\\|")); List<String> list = Arrays.asList(infoDiff.get("dutyTerritory").split("\\|"));
List<String> listEn = Arrays.asList(infoDiffEn.get("dutyTerritory").split("\\|"));
if(list.size() > 1){ if(list.size() > 1){
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1); String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.DUTY_TERRITORY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>"; contentLog += "'"+ProjectInventoryFieldEnum.DUTY_TERRITORY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
} }
if(listEn.size() > 1){ if(StringUtils.isNotBlank(infoDiffEn.get("dutyTerritory"))){
String infoDiffOldEn = listEn.get(0); List<String> listEn = Arrays.asList(infoDiffEn.get("dutyTerritory").split("\\|"));
String infoDiffNewEn = listEn.get(1); if(listEn.size() > 1){
enContentLog += "'"+ProjectInventoryFieldEnum.DUTY_TERRITORY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>"; String infoDiffOldEn = listEn.get(0);
String infoDiffNewEn = listEn.get(1);
enContentLog += "'"+ProjectInventoryFieldEnum.DUTY_TERRITORY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
}
} }
} }
//regulationOwnerName;//法规工程师名称 //regulationOwnerName;//法规工程师名称
if (StringUtils.isNotBlank(infoDiff.get("regulationOwnerName"))) { if (StringUtils.isNotBlank(infoDiff.get("regulationOwnerName"))) {
List<String> list = Arrays.asList(infoDiff.get("regulationOwnerName").split(",")); List<String> list = Arrays.asList(infoDiff.get("regulationOwnerName").split(","));
List<String> listEn = Arrays.asList(infoDiffEn.get("regulationOwnerName").split(","));
if(list.size() > 1){ if(list.size() > 1){
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1); String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.REGULATION_OWNER_NAME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>"; contentLog += "'"+ProjectInventoryFieldEnum.REGULATION_OWNER_NAME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
} }
if(listEn.size() > 1){ if(StringUtils.isNotBlank(infoDiffEn.get("regulationOwnerName"))){
String infoDiffOldEn = listEn.get(0); List<String> listEn = Arrays.asList(infoDiffEn.get("regulationOwnerName").split(","));
String infoDiffNewEn = listEn.get(1); if(listEn.size() > 1){
enContentLog += "'"+ProjectInventoryFieldEnum.REGULATION_OWNER_NAME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>"; 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;//认证工程师名称 //homologationEngineerName;//认证工程师名称
if (StringUtils.isNotBlank(infoDiff.get("homologationEngineerName"))) { if (StringUtils.isNotBlank(infoDiff.get("homologationEngineerName"))) {
List<String> list = Arrays.asList(infoDiff.get("homologationEngineerName").split(",")); List<String> list = Arrays.asList(infoDiff.get("homologationEngineerName").split(","));
List<String> listEn = Arrays.asList(infoDiffEn.get("homologationEngineerName").split(","));
if(list.size() > 1){ if(list.size() > 1){
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1); String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.HOMOLOGATION_ENGINEER_NAME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>"; contentLog += "'"+ProjectInventoryFieldEnum.HOMOLOGATION_ENGINEER_NAME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
} }
if(listEn.size() > 1){ if(StringUtils.isNotBlank(infoDiffEn.get("homologationEngineerName"))){
String infoDiffOldEn = listEn.get(0); List<String> listEn = Arrays.asList(infoDiffEn.get("homologationEngineerName").split(","));
String infoDiffNewEn = listEn.get(1); if(listEn.size() > 1){
enContentLog += "'"+ProjectInventoryFieldEnum.HOMOLOGATION_ENGINEER_NAME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>"; 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;//工程接口人名称 //engineeringInterfacePersonName;//工程接口人名称
if (StringUtils.isNotBlank(infoDiff.get("engineeringInterfacePersonName"))) { if (StringUtils.isNotBlank(infoDiff.get("engineeringInterfacePersonName"))) {
List<String> list = Arrays.asList(infoDiff.get("engineeringInterfacePersonName").split(",")); List<String> list = Arrays.asList(infoDiff.get("engineeringInterfacePersonName").split(","));
List<String> listEn = Arrays.asList(infoDiffEn.get("engineeringInterfacePersonName").split(","));
if(list.size() > 1){ if(list.size() > 1){
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1); String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.ENGINEERING_INTERFACE_PERSON_NAME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>"; contentLog += "'"+ProjectInventoryFieldEnum.ENGINEERING_INTERFACE_PERSON_NAME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
} }
if(listEn.size() > 1){ if(StringUtils.isNotBlank(infoDiffEn.get("engineeringInterfacePersonName"))){
String infoDiffOldEn = listEn.get(0); List<String> listEn = Arrays.asList(infoDiffEn.get("engineeringInterfacePersonName").split(","));
String infoDiffNewEn = listEn.get(1); if(listEn.size() > 1){
enContentLog += "'"+ProjectInventoryFieldEnum.ENGINEERING_INTERFACE_PERSON_NAME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>"; 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 多选 //适用地区region 多选
if (StringUtils.isNotBlank(infoDiff.get("region"))) { if (StringUtils.isNotBlank(infoDiff.get("region"))) {
List<String> list = Arrays.asList(infoDiff.get("region").split("\\|")); List<String> list = Arrays.asList(infoDiff.get("region").split("\\|"));
List<String> listEn = Arrays.asList(infoDiffEn.get("region").split("\\|"));
if(list.size() > 1){ if(list.size() > 1){
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1); String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.REGION.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>"; contentLog += "'"+ProjectInventoryFieldEnum.REGION.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
} }
if(listEn.size() > 1){ if(StringUtils.isNotBlank(infoDiffEn.get("region"))){
String infoDiffOldEn = listEn.get(0); List<String> listEn = Arrays.asList(infoDiffEn.get("region").split("\\|"));
String infoDiffNewEn = listEn.get(1); if(listEn.size() > 1){
enContentLog += "'"+ProjectInventoryFieldEnum.REGION.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>"; 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"))) { if (StringUtils.isNotBlank(infoDiff.get("remark"))) {
List<String> list = Arrays.asList(infoDiff.get("remark").split(",")); List<String> list = Arrays.asList(infoDiff.get("remark").split(","));
List<String> listEn = Arrays.asList(infoDiffEn.get("remark").split(","));
if(list.size() > 1){ if(list.size() > 1){
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1); String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.REMARK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>"; contentLog += "'"+ProjectInventoryFieldEnum.REMARK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
} }
if(listEn.size() > 1){ if(StringUtils.isNotBlank(infoDiffEn.get("remark"))){
String infoDiffOldEn = listEn.get(0); List<String> listEn = Arrays.asList(infoDiffEn.get("remark").split(","));
String infoDiffNewEn = listEn.get(1); if(listEn.size() > 1){
enContentLog += "'"+ProjectInventoryFieldEnum.REMARK.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>"; 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"))) { if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTypeName"))) {
List<String> list = Arrays.asList(infoDiff.get("designDeliverableTypeName").split("\\|")); List<String> list = Arrays.asList(infoDiff.get("designDeliverableTypeName").split("\\|"));
List<String> listEn = Arrays.asList(infoDiffEn.get("designDeliverableTypeName").split("\\|"));
if(list.size() > 1){ if(list.size() > 1){
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1); String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>"; contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
} }
if(listEn.size() > 1){ if(StringUtils.isNotBlank(infoDiffEn.get("designDeliverableTypeName"))){
String infoDiffOldEn = listEn.get(0); List<String> listEn = Arrays.asList(infoDiffEn.get("designDeliverableTypeName").split("\\|"));
String infoDiffNewEn = listEn.get(1); if(listEn.size() > 1){
enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>"; 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"))) { if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTemplateName"))) {
List<String> list = Arrays.asList(infoDiff.get("designDeliverableTemplateName").split("\\|")); List<String> list = Arrays.asList(infoDiff.get("designDeliverableTemplateName").split("\\|"));
List<String> listEn = Arrays.asList(infoDiffEn.get("designDeliverableTemplateName").split("\\|"));
if(list.size() > 1){ if(list.size() > 1){
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1); String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>"; contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
} }
if(listEn.size() > 1){ if(StringUtils.isNotBlank(infoDiffEn.get("designDeliverableTemplateName"))){
String infoDiffOldEn = listEn.get(0); List<String> listEn = Arrays.asList(infoDiffEn.get("designDeliverableTemplateName").split("\\|"));
String infoDiffNewEn = listEn.get(1); if(listEn.size() > 1){
enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>"; 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"))) { if (StringUtils.isNotBlank(infoDiff.get("designInitiatorName"))) {
List<String> list = Arrays.asList(infoDiff.get("designInitiatorName").split(",")); List<String> list = Arrays.asList(infoDiff.get("designInitiatorName").split(","));
List<String> listEn = Arrays.asList(infoDiffEn.get("designInitiatorName").split(","));
if(list.size() > 1){ if(list.size() > 1){
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1); String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>"; contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
} }
if(listEn.size() > 1){ if(StringUtils.isNotBlank(infoDiffEn.get("designInitiatorName"))){
String infoDiffOldEn = listEn.get(0); List<String> listEn = Arrays.asList(infoDiffEn.get("designInitiatorName").split(","));
String infoDiffNewEn = listEn.get(1); if(listEn.size() > 1){
enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_INITIATOR.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>"; 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"))) { if (StringUtils.isNotBlank(infoDiff.get("designDutyName"))) {
List<String> list = Arrays.asList(infoDiff.get("designDutyName").split(",")); List<String> list = Arrays.asList(infoDiff.get("designDutyName").split(","));
List<String> listEn = Arrays.asList(infoDiffEn.get("designDutyName").split(","));
if(list.size() > 1){ if(list.size() > 1){
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1); String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>"; contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
} }
if(listEn.size() > 1){ if(StringUtils.isNotBlank(infoDiffEn.get("designDutyName"))){
String infoDiffOldEn = listEn.get(0); List<String> listEn = Arrays.asList(infoDiffEn.get("designDutyName").split(","));
String infoDiffNewEn = listEn.get(1); if(listEn.size() > 1){
enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUTY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>"; String infoDiffOldEn = listEn.get(0);
String infoDiffNewEn = listEn.get(1);
enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUTY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
}
} }
} }
//设计符合性确认-截止时间designDueDateString; //设计符合性确认-截止时间designDueDateString;
if (StringUtils.isNotBlank(infoDiff.get("designDueDateString"))) { if (StringUtils.isNotBlank(infoDiff.get("designDueDateString"))) {
List<String> list = Arrays.asList(infoDiff.get("designDueDateString").split(",")); List<String> list = Arrays.asList(infoDiff.get("designDueDateString").split(","));
List<String> listEn = Arrays.asList(infoDiffEn.get("designDueDateString").split(","));
if(list.size() > 1){ if(list.size() > 1){
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1); String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>"; contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
} }
if(listEn.size() > 1){ if(StringUtils.isNotBlank(infoDiffEn.get("designDueDateString"))){
String infoDiffOldEn = listEn.get(0); List<String> listEn = Arrays.asList(infoDiffEn.get("designDueDateString").split(","));
String infoDiffNewEn = listEn.get(1); if(listEn.size() > 1){
enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>"; 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确认-交付物类型 //prehomo确认-交付物类型
if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTypeName"))) { if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTypeName"))) {
List<String> list = Arrays.asList(infoDiff.get("prehomoDeliverableTypeName").split("\\|")); List<String> list = Arrays.asList(infoDiff.get("prehomoDeliverableTypeName").split("\\|"));
List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDeliverableTypeName").split("\\|"));
if(list.size() > 1){ if(list.size() > 1){
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1); String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>"; contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
} }
if(listEn.size() > 1){ if(StringUtils.isNotBlank(infoDiffEn.get("prehomoDeliverableTypeName"))){
String infoDiffOldEn = listEn.get(0); List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDeliverableTypeName").split("\\|"));
String infoDiffNewEn = listEn.get(1); if(listEn.size() > 1){
enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>"; 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确认-交付物模板 //prehomo确认-交付物模板
if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTemplateName"))) { if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTemplateName"))) {
List<String> list = Arrays.asList(infoDiff.get("prehomoDeliverableTemplateName").split("\\|")); List<String> list = Arrays.asList(infoDiff.get("prehomoDeliverableTemplateName").split("\\|"));
List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDeliverableTemplateName").split("\\|"));
if(list.size() > 1){ if(list.size() > 1){
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1); String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>"; contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
} }
if(listEn.size() > 1){ if(StringUtils.isNotBlank(infoDiffEn.get("prehomoDeliverableTemplateName"))){
String infoDiffOldEn = listEn.get(0); List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDeliverableTemplateName").split("\\|"));
String infoDiffNewEn = listEn.get(1); if(listEn.size() > 1){
enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>"; 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确认-发起人 //prehomo确认-发起人
if (StringUtils.isNotBlank(infoDiff.get("prehomoInitiatorName"))) { if (StringUtils.isNotBlank(infoDiff.get("prehomoInitiatorName"))) {
List<String> list = Arrays.asList(infoDiff.get("prehomoInitiatorName").split(",")); List<String> list = Arrays.asList(infoDiff.get("prehomoInitiatorName").split(","));
List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoInitiatorName").split(","));
if(list.size() > 1){ if(list.size() > 1){
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1); String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>"; contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
} }
if(listEn.size() > 1){ if(StringUtils.isNotBlank(infoDiffEn.get("prehomoInitiatorName"))){
String infoDiffOldEn = listEn.get(0); List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoInitiatorName").split(","));
String infoDiffNewEn = listEn.get(1); if(listEn.size() > 1){
enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_INITIATOR.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>"; String infoDiffOldEn = listEn.get(0);
String infoDiffNewEn = listEn.get(1);
enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_INITIATOR.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
}
} }
} }
//prehomo确认-责任人 //prehomo确认-责任人
if (StringUtils.isNotBlank(infoDiff.get("prehomoDutyName"))) { if (StringUtils.isNotBlank(infoDiff.get("prehomoDutyName"))) {
List<String> list = Arrays.asList(infoDiff.get("prehomoDutyName").split(",")); List<String> list = Arrays.asList(infoDiff.get("prehomoDutyName").split(","));
List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDutyName").split(","));
if(list.size() > 1){ if(list.size() > 1){
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1); String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>"; contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
} }
if(listEn.size() > 1){ if(StringUtils.isNotBlank(infoDiffEn.get("prehomoDutyName"))){
String infoDiffOldEn = listEn.get(0); List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDutyName").split(","));
String infoDiffNewEn = listEn.get(1); if(listEn.size() > 1){
enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DUTY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>"; 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; //prehomo确认-截止时间prehomoDueDateString;
if (StringUtils.isNotBlank(infoDiff.get("prehomoDueDateString"))) { if (StringUtils.isNotBlank(infoDiff.get("prehomoDueDateString"))) {
List<String> list = Arrays.asList(infoDiff.get("prehomoDueDateString").split(",")); List<String> list = Arrays.asList(infoDiff.get("prehomoDueDateString").split(","));
List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDueDateString").split(","));
if(list.size() > 1){ if(list.size() > 1){
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1); String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>"; contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
} }
if(listEn.size() > 1){ if(StringUtils.isNotBlank(infoDiffEn.get("prehomoDueDateString"))){
String infoDiffOldEn = listEn.get(0); List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDueDateString").split(","));
String infoDiffNewEn = listEn.get(1); if(listEn.size() > 1){
enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>"; 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"))) { if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTypeName"))) {
List<String> list = Arrays.asList(infoDiff.get("verifyDeliverableTypeName").split("\\|")); List<String> list = Arrays.asList(infoDiff.get("verifyDeliverableTypeName").split("\\|"));
List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDeliverableTypeName").split("\\|"));
if(list.size() > 1){ if(list.size() > 1){
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1); String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>"; contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
} }
if(listEn.size() > 1){ if(StringUtils.isNotBlank(infoDiffEn.get("verifyDeliverableTypeName"))){
String infoDiffOldEn = listEn.get(0); List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDeliverableTypeName").split("\\|"));
String infoDiffNewEn = listEn.get(1); if(listEn.size() > 1){
enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>"; 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"))) { if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTemplateName"))) {
List<String> list = Arrays.asList(infoDiff.get("verifyDeliverableTemplateName").split("\\|")); List<String> list = Arrays.asList(infoDiff.get("verifyDeliverableTemplateName").split("\\|"));
List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDeliverableTemplateName").split("\\|"));
if(list.size() > 1){ if(list.size() > 1){
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1); String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>"; contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
} }
if(listEn.size() > 1){ if(StringUtils.isNotBlank(infoDiffEn.get("verifyDeliverableTemplateName"))){
String infoDiffOldEn = listEn.get(0); List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDeliverableTemplateName").split("\\|"));
String infoDiffNewEn = listEn.get(1); if(listEn.size() > 1){
enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>"; 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"))) { if (StringUtils.isNotBlank(infoDiff.get("verifyInitiatorName"))) {
List<String> list = Arrays.asList(infoDiff.get("verifyInitiatorName").split(",")); List<String> list = Arrays.asList(infoDiff.get("verifyInitiatorName").split(","));
List<String> listEn = Arrays.asList(infoDiffEn.get("verifyInitiatorName").split(","));
if(list.size() > 1){ if(list.size() > 1){
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1); String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>"; contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
} }
if(listEn.size() > 1){ if(StringUtils.isNotBlank(infoDiffEn.get("verifyInitiatorName"))){
String infoDiffOldEn = listEn.get(0); List<String> listEn = Arrays.asList(infoDiffEn.get("verifyInitiatorName").split(","));
String infoDiffNewEn = listEn.get(1); if(listEn.size() > 1){
enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_INITIATOR.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>"; 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"))) { if (StringUtils.isNotBlank(infoDiff.get("verifyDutyName"))) {
List<String> list = Arrays.asList(infoDiff.get("verifyDutyName").split(",")); List<String> list = Arrays.asList(infoDiff.get("verifyDutyName").split(","));
List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDutyName").split(","));
if(list.size() > 1){ if(list.size() > 1){
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1); String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>"; contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
} }
if(listEn.size() > 1){ if(StringUtils.isNotBlank(infoDiffEn.get("verifyDutyName"))){
String infoDiffOldEn = listEn.get(0); List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDutyName").split(","));
String infoDiffNewEn = listEn.get(1); if(listEn.size() > 1){
enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DUTY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>"; String infoDiffOldEn = listEn.get(0);
String infoDiffNewEn = listEn.get(1);
enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DUTY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
}
} }
} }
//验证符合性确认-截止时间verifyDueDateString //验证符合性确认-截止时间verifyDueDateString
if (StringUtils.isNotBlank(infoDiff.get("verifyDueDateString"))) { if (StringUtils.isNotBlank(infoDiff.get("verifyDueDateString"))) {
List<String> list = Arrays.asList(infoDiff.get("verifyDueDateString").split(",")); List<String> list = Arrays.asList(infoDiff.get("verifyDueDateString").split(","));
List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDueDateString").split(","));
if (list.size() > 1) { if (list.size() > 1) {
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1); String infoDiffNew = list.get(1);
contentLog += "'" + ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>"; contentLog += "'" + ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
} }
if(listEn.size() > 1){ if(StringUtils.isNotBlank(infoDiffEn.get("verifyDueDateString"))){
String infoDiffOldEn = listEn.get(0); List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDueDateString").split(","));
String infoDiffNewEn = listEn.get(1); if(listEn.size() > 1){
enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>"; String infoDiffOldEn = listEn.get(0);
String infoDiffNewEn = listEn.get(1);
enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
}
} }
} }
jero-web/src/views/system/MessageDetails.vue
+3 -3
View File
@@ -75,11 +75,11 @@
} }
.box-content { .box-content {
padding: 40px 120px; padding: 40px 70px;
box-sizing: border-box; box-sizing: border-box;
color: #040B29; color: #040B29;
font-size: 16px; font-size: 16px;
text-indent: 30px; text-indent: 24px;
letter-spacing: 3px /*letter-spacing: 1px*/
} }
</style> </style>