法规清单--更新log去掉编辑,复制,批量设置信息
This commit is contained in:
+17
-17
@@ -426,7 +426,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
|||||||
Map<String, String> infoDiffEn = ListDiff.compareObject(dataListCopy.get(0),projectLawsInventoryEOCopy);
|
Map<String, String> infoDiffEn = ListDiff.compareObject(dataListCopy.get(0),projectLawsInventoryEOCopy);
|
||||||
|
|
||||||
//设置更新log
|
//设置更新log
|
||||||
setContentLog(infoDiff,contentLog,infoDiffEn,enContentLog,projectLawsInventoryEO.getProjectLibraryId());
|
// setContentLog(infoDiff,contentLog,infoDiffEn,enContentLog,projectLawsInventoryEO.getProjectLibraryId());
|
||||||
|
|
||||||
|
|
||||||
//验证用户是否是该法规上级 项目库的studio, 如果是,则同步更新流程
|
//验证用户是否是该法规上级 项目库的studio, 如果是,则同步更新流程
|
||||||
@@ -2593,14 +2593,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
|||||||
this.saveBatch(projectLawsInventoryEOList);
|
this.saveBatch(projectLawsInventoryEOList);
|
||||||
|
|
||||||
//更新log
|
//更新log
|
||||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
String username = sysUser.getUsername();
|
// String username = sysUser.getUsername();
|
||||||
String projectLibraryId = projectLawsInventoryEOList.get(0).getProjectLibraryId();
|
// String projectLibraryId = projectLawsInventoryEOList.get(0).getProjectLibraryId();
|
||||||
String serialNumber = projectLawsInventoryEOList.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(","));
|
// String serialNumber = projectLawsInventoryEOList.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(","));
|
||||||
String contentLog = username+"复制了“"+serialNumber+"”";
|
// String contentLog = username+"复制了“"+serialNumber+"”";
|
||||||
String enContentLog = username+" copied “"+serialNumber+"”";
|
// String enContentLog = username+" copied “"+serialNumber+"”";
|
||||||
projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue());
|
// projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue());
|
||||||
projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue());
|
// projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue());
|
||||||
this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList);
|
this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2867,15 +2867,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
|||||||
String enContentIndexStart = enContentLog.substring(0,enContentLog.indexOf("“"));
|
String enContentIndexStart = enContentLog.substring(0,enContentLog.indexOf("“"));
|
||||||
String enContent= enContentLog.substring(enContentIndexStart.length()+1,enContentLog.length());
|
String enContent= enContentLog.substring(enContentIndexStart.length()+1,enContentLog.length());
|
||||||
|
|
||||||
if(StringUtils.isNotBlank(content)){
|
// if(StringUtils.isNotBlank(content)){
|
||||||
contentLog = contentLog.substring(0, contentLog.length() - 5) + "”";
|
// contentLog = contentLog.substring(0, contentLog.length() - 5) + "”";
|
||||||
projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue());
|
// projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue());
|
||||||
}
|
// }
|
||||||
|
|
||||||
if(StringUtils.isNotBlank(enContent)){
|
// if(StringUtils.isNotBlank(enContent)){
|
||||||
enContentLog = enContentLog.substring(0, enContentLog.length() - 5) + "”";
|
// enContentLog = enContentLog.substring(0, enContentLog.length() - 5) + "”";
|
||||||
projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue());
|
// projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue());
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user