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

bug67980和67987修改

Browse Source
This commit is contained in:
cuijiaming
2023-04-07 16:21:54 +08:00
parent c1595267d9
commit 63f00512cc
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+17 -14
View File
@@ -294,11 +294,11 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
List<Map<String,String>> infoDiffListEn = new ArrayList<>(); List<Map<String,String>> infoDiffListEn = new ArrayList<>();
infoDiffListEn.add(infoDiffEn); infoDiffListEn.add(infoDiffEn);
if(infoDiff.size()>1) { if(infoDiff.size()>1) {
// contentLog = dummyInventoryBaseEOService.setInfoDiffListContent(null, infoDiffList, contentLog); contentLog = dummyInventoryBaseEOService.setInfoDiffListContent(null, infoDiffList, contentLog);
// enContentLog = dummyInventoryBaseEOService.setInfoDiffListContent(enContentLog, infoDiffListEn, null); enContentLog = dummyInventoryBaseEOService.setInfoDiffListContent(enContentLog, infoDiffListEn, null);
// dummyLogEOService.updateLog(contentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.CN.getValue()); dummyLogEOService.updateLog(contentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.CN.getValue());
// dummyLogEOService.updateLog(enContentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.EN.getValue()); dummyLogEOService.updateLog(enContentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.EN.getValue());
} }
}else{ }else{
if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){ if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){
@@ -900,14 +900,14 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
this.saveBatch(dummyInventoryInfoEOList); this.saveBatch(dummyInventoryInfoEOList);
//更新log //更新log
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// String username = sysUser.getUsername(); String username = sysUser.getUsername();
// String projectId = dummyInventoryInfoEOList.get(0).getDummyInventoryBaseId(); String projectId = dummyInventoryInfoEOList.get(0).getDummyInventoryBaseId();
// String serialNumber = dummyInventoryInfoEOList.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(",")); String serialNumber = dummyInventoryInfoEOList.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+"”.";
// dummyLogEOService.updateLog(contentLog, projectId,CutEnum.CN.getValue()); dummyLogEOService.updateLog(contentLog, projectId,CutEnum.CN.getValue());
// dummyLogEOService.updateLog(enContentLog, projectId,CutEnum.EN.getValue()); dummyLogEOService.updateLog(enContentLog, projectId,CutEnum.EN.getValue());
} }
}else{ }else{
if(CutEnum.CN.getValue().equals(cut)){ if(CutEnum.CN.getValue().equals(cut)){
@@ -1138,12 +1138,12 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
if(StringUtils.isNotBlank(content)){ if(StringUtils.isNotBlank(content)){
contentLog = contentLog.substring(0, contentLog.length() - 5) + "”"; contentLog = contentLog.substring(0, contentLog.length() - 5) + "”";
// dummyLogEOService.updateLog(contentLog, projectId,CutEnum.CN.getValue()); dummyLogEOService.updateLog(contentLog, projectId,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) + "”";
// dummyLogEOService.updateLog(enContentLog, projectId,CutEnum.EN.getValue()); dummyLogEOService.updateLog(enContentLog, projectId,CutEnum.EN.getValue());
} }
} }
}else{ }else{
@@ -2831,6 +2831,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
} }
if(oSSFileList.size() != 0){ if(oSSFileList.size() != 0){
if(serialNumber.contains("/")){
serialNumber = serialNumber.replaceAll("/","-");
}
String fileNowPath = uploadpath + "/tempZip/" + serialNumber; String fileNowPath = uploadpath + "/tempZip/" + serialNumber;
File file = new File(fileNowPath); File file = new File(fileNowPath);
if (file.exists()) { if (file.exists()) {