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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wangzhijiang
2022-05-30 10:42:22 +08:00
parent 993e47ba48 f5270c2d52
commit 3795959af8
2 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectInventoryFieldEnum.java
+12 -12
View File
@@ -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"),
;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+11 -10
View File
@@ -1730,6 +1730,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
this.updateBatchById(projectLawsInventoryEOList);
contentLog = contentLogBuilder.substring(0, contentLogBuilder.length() - 1);
enContentLog = enContentLogBuilder.substring(0, enContentLogBuilder.length() - 1);
projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue());
projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue());
}
@@ -4283,13 +4284,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ",";
}
//设计符合性确认-交付物模板
if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTemplate"))) {
List<String> list = Arrays.asList(infoDiff.get("designDeliverableTemplate").split(","));
if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTemplateName"))) {
List<String> list = Arrays.asList(infoDiff.get("designDeliverableTemplateName").split("\\|"));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
List<String> listEn = Arrays.asList(infoDiffEn.get("designDeliverableTemplate").split(","));
List<String> listEn = Arrays.asList(infoDiffEn.get("designDeliverableTemplateName").split("\\|"));
String infoDiffOldEn = listEn.get(0);
String infoDiffNewEn = listEn.get(1);
enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ",";
@@ -4343,13 +4344,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ",";
}
//prehomo确认-交付物模板
if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTemplate"))) {
List<String> list = Arrays.asList(infoDiff.get("prehomoDeliverableTemplate").split(","));
if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTemplateName"))) {
List<String> list = Arrays.asList(infoDiff.get("prehomoDeliverableTemplateName").split("\\|"));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDeliverableTemplate").split(","));
List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDeliverableTemplateName").split("\\|"));
String infoDiffOldEn = listEn.get(0);
String infoDiffNewEn = listEn.get(1);
enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ",";
@@ -4404,13 +4405,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ",";
}
//验证符合性确认-交付物模板
if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTemplate"))) {
List<String> list = Arrays.asList(infoDiff.get("verifyDeliverableTemplate").split(","));
if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTemplateName"))) {
List<String> list = Arrays.asList(infoDiff.get("verifyDeliverableTemplateName").split("\\|"));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDeliverableTemplate").split(","));
List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDeliverableTemplateName").split("\\|"));
String infoDiffOldEn = listEn.get(0);
String infoDiffNewEn = listEn.get(1);
enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ",";
@@ -4455,7 +4456,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
contentLog = contentLog.substring(0, contentLog.length()-1);
enContentLog =enContentLog.substring(0, contentLog.length()-1);
enContentLog =enContentLog.substring(0, enContentLog.length()-1);
projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue());
projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue());
}