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

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

Browse Source
This commit is contained in:
zyx.net
2023-09-28 14:00:24 +08:00
parent a7f813040e 25b7273c1a
commit 5d4f843b17
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+6 -2
View File
@@ -760,7 +760,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
String contentLog = username + "删除了清单中的“" + serialNumber + "”";
String enContentLog = username + " deleted “" + serialNumber + "” from the list";
projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId, CutEnum.CN.getValue());
projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId, CutEnum.EN.getValue());
projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId, CutEnum.EN.getValue());
removeByIds(ids);
this.projectTaskInventoryEOService.deleteByProjectLawsInventoryIds(ids);
@@ -11619,8 +11619,12 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
dutyTerritoryStr = dutyTerritorys.stream().map(SysDictItem::getItemValue).distinct().collect(Collectors.joining(","));
}
}
String serialNumber = projectLawsInventoryEO.getSerialNumber();
projectLawsInventoryEO.setSerialNumber(null);
QueryWrapper<ProjectLawsInventoryEO> queryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryEO, req.getParameterMap());
if(StringUtils.isNotBlank(serialNumber)){
queryWrapper.lambda().like(ProjectLawsInventoryEO::getSerialNumber,serialNumber);
}
queryWrapper.orderByDesc("create_time","serial_number");
if (StringUtils.isNotEmpty(dutyTerritoryStr)) {
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+1 -1
View File
@@ -708,7 +708,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String contentLog = username + "删除了清单中的“" + serialNumber + "”";
String enContentLog = username + " deleted “" + serialNumber + "” from the list";
projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId, CutEnum.CN.getValue());
projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId, CutEnum.EN.getValue());
projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId, CutEnum.EN.getValue());
removeByIds(ids);
this.projectTaskInventoryEOService.deleteByProjectLawsInventoryIds(ids);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+14 -2
View File
@@ -1367,10 +1367,16 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
if(ObjectUtils.isEmpty(projectLawsInventoryEOS)){
emptyList.add(projectLawsInventoryEO);
}
String msg = "";
if(CutEnum.CN.getValue().equals(cut)){
msg = "在平台件项目中包含多条匹配内容，请选择关联";
}else{
msg = " multiple matching contents are included in the platform component project, please select association";
}
if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() > 1){
map.put("lawsInventoryId",projectLawsInventoryEO.getId());
map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle+"在平台件项目中包含多条匹配内容，请选择关联");
map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle+msg);
map.put("result",projectLawsInventoryEOS);
mapList.add(map);
}else if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() == 1){
@@ -1526,10 +1532,16 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
emptyList.add(projectLawsInventoryEO);
}
String msg = "";
if(CutEnum.CN.getValue().equals(cut)){
msg = "在平台件项目中包含多条匹配内容，请选择关联";
}else{
msg = " multiple matching contents are included in the platform component project, please select association";
}
if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() > 1){
map.put("lawsInventoryId",projectLawsInventoryEO.getId());
map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle+"在平台件项目中包含多条匹配内容，请选择关联");
map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle+msg);
map.put("result",projectLawsInventoryEOS);
mapList.add(map);
}else if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() == 1){