diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectInventoryFieldEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectInventoryFieldEnum.java index 5dba798d8..686095d10 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectInventoryFieldEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectInventoryFieldEnum.java @@ -23,20 +23,20 @@ public enum ProjectInventoryFieldEnum { FA1_QI3_REN2("发起人", "fa1_qi3_ren2","Initiator"), ZE2_REN2_REN2("责任人", "ze2_ren4_ren2","Assignee"), - DESIGN_DELIVERABLE_TYPE("设计符合性确认-交付物类型", "deliverable_template","Type of deliverables"), - DESIGN_DELIVERABLE_TEMPLATE("设计符合性确认-交付物模板", "design_deliverable_template","Deliverable template"), - DESIGN_INITIATOR("设计符合性确认-发起人", "fa1_qi3_ren2","Initiator"), - DESIGN_DUTY("设计符合性确认-责任人", "ze2_ren4_ren2","Assignee"), + DESIGN_DELIVERABLE_TYPE("设计符合性确认-交付物类型", "deliverable_template"," Design Compliance Check Type of deliverables"), + DESIGN_DELIVERABLE_TEMPLATE("设计符合性确认-交付物模板", "design_deliverable_template"," Design Compliance Check Deliverable template"), + DESIGN_INITIATOR("设计符合性确认-发起人", "fa1_qi3_ren2"," Design Compliance Check Initiator"), + DESIGN_DUTY("设计符合性确认-责任人", "ze2_ren4_ren2"," Design Compliance Check Assignee"), - PREHOMO_DELIVERABLE_TYPE("prehomo确认-交付物类型", "deliverable_template","Type of deliverables"), - PREHOMO_DELIVERABLE_TEMPLATE("prehomo确认-交付物模板", "prehomo_deliverable_template","Deliverable template"), - PREHOMO_INITIATOR("prehomo确认-发起人", "fa1_qi3_ren2","Initiator"), - PREHOMO_DUTY("prehomo确认-责任人", "ze2_ren4_ren2","Assignee"), + PREHOMO_DELIVERABLE_TYPE("prehomo确认-交付物类型", "deliverable_template"," Pre-Homo Check Type of deliverables"), + PREHOMO_DELIVERABLE_TEMPLATE("prehomo确认-交付物模板", "prehomo_deliverable_template"," Pre-Homo Check Deliverable template"), + PREHOMO_INITIATOR("prehomo确认-发起人", "fa1_qi3_ren2"," Pre-Homo Check Initiator"), + PREHOMO_DUTY("prehomo确认-责任人", "ze2_ren4_ren2"," Pre-Homo Check Assignee"), - VERIFY_DELIVERABLE_TYPE("验证符合性确认-交付物类型", "deliverable_template","Type of deliverables"), - VERIFY_DELIVERABLE_TEMPLATE("验证符合性确认-交付物模板", "verify_deliverable_template","Deliverable template"), - VERIFY_INITIATOR("验证符合性确认-发起人", "fa1_qi3_ren2","Initiator"), - VERIFY_DUTY("验证符合性确认-责任人", "ze2_ren4_ren2","Assignee"), + VERIFY_DELIVERABLE_TYPE("验证符合性确认-交付物类型", "deliverable_template","Validation Compliance Check Type of deliverables"), + VERIFY_DELIVERABLE_TEMPLATE("验证符合性确认-交付物模板", "verify_deliverable_template","Validation Compliance Check Deliverable template"), + VERIFY_INITIATOR("验证符合性确认-发起人", "fa1_qi3_ren2","Validation Compliance Check Initiator"), + VERIFY_DUTY("验证符合性确认-责任人", "ze2_ren4_ren2","Validation Compliance Check Assignee"), ; 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 bc0fbc85b..5de7567b5 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 @@ -4283,13 +4283,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("designDeliverableTemplate").split(",")); + 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 + ","; - List listEn = Arrays.asList(infoDiffEn.get("designDeliverableTemplate").split(",")); + 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 + ","; @@ -4343,13 +4343,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("prehomoDeliverableTemplate").split(",")); + 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 + ","; - List listEn = Arrays.asList(infoDiffEn.get("prehomoDeliverableTemplate").split(",")); + 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 + ","; @@ -4404,13 +4404,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("verifyDeliverableTemplate").split(",")); + 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 + ","; - List listEn = Arrays.asList(infoDiffEn.get("verifyDeliverableTemplate").split(",")); + 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 + ",";