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

关联平台件-法规清单模糊查询，英文提示语

Browse Source
This commit is contained in:
zhn
2023-09-28 13:59:42 +08:00
parent 2da4375803
commit 25b7273c1a
2 changed files with 19 additions and 3 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
+5 -1
View File
@@ -11619,8 +11619,12 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
dutyTerritoryStr = dutyTerritorys.stream().map(SysDictItem::getItemValue).distinct().collect(Collectors.joining(",")); 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()); QueryWrapper<ProjectLawsInventoryEO> queryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryEO, req.getParameterMap());
if(StringUtils.isNotBlank(serialNumber)){
queryWrapper.lambda().like(ProjectLawsInventoryEO::getSerialNumber,serialNumber);
}
queryWrapper.orderByDesc("create_time","serial_number"); queryWrapper.orderByDesc("create_time","serial_number");
if (StringUtils.isNotEmpty(dutyTerritoryStr)) { if (StringUtils.isNotEmpty(dutyTerritoryStr)) {
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)){ if(ObjectUtils.isEmpty(projectLawsInventoryEOS)){
emptyList.add(projectLawsInventoryEO); 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){ if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() > 1){
map.put("lawsInventoryId",projectLawsInventoryEO.getId()); map.put("lawsInventoryId",projectLawsInventoryEO.getId());
map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle+"在平台件项目中包含多条匹配内容，请选择关联"); map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle+msg);
map.put("result",projectLawsInventoryEOS); map.put("result",projectLawsInventoryEOS);
mapList.add(map); mapList.add(map);
}else if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() == 1){ }else if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() == 1){
@@ -1526,10 +1532,16 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
emptyList.add(projectLawsInventoryEO); 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){ if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() > 1){
map.put("lawsInventoryId",projectLawsInventoryEO.getId()); map.put("lawsInventoryId",projectLawsInventoryEO.getId());
map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle+"在平台件项目中包含多条匹配内容，请选择关联"); map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle+msg);
map.put("result",projectLawsInventoryEOS); map.put("result",projectLawsInventoryEOS);
mapList.add(map); mapList.add(map);
}else if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() == 1){ }else if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() == 1){