Merge remote-tracking branch 'origin/dev_20230912_Platform' into dev_20230912_Platform
This commit is contained in:
+2
-2
@@ -1277,7 +1277,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
|
|||||||
public Map<String,Object> listPlatform(Map<String,Object> params) {
|
public Map<String,Object> listPlatform(Map<String,Object> params) {
|
||||||
String cut = (String) params.get("cut");//
|
String cut = (String) params.get("cut");//
|
||||||
String ids = (String) params.get("ids");//法规清单id
|
String ids = (String) params.get("ids");//法规清单id
|
||||||
String projectLibraryIds = (String) params.get("projectLibraryIds");//平台件项目id
|
String projectLibraryIds = (String) params.get("projectLibraryIds");//平台件法规清单id
|
||||||
|
|
||||||
//法规清单数据
|
//法规清单数据
|
||||||
LambdaQueryWrapper<ProjectLawsInventoryEO> wrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<ProjectLawsInventoryEO> wrapper = new LambdaQueryWrapper<>();
|
||||||
@@ -1286,7 +1286,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
|
|||||||
|
|
||||||
//平台件项目对应的法规清单数据
|
//平台件项目对应的法规清单数据
|
||||||
LambdaQueryWrapper<ProjectLawsInventoryEO> wrapper1 = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<ProjectLawsInventoryEO> wrapper1 = new LambdaQueryWrapper<>();
|
||||||
wrapper1.in(ProjectLawsInventoryEO::getProjectLibraryId,Arrays.asList(projectLibraryIds.split(",")));
|
wrapper1.in(ProjectLawsInventoryEO::getId,Arrays.asList(projectLibraryIds.split(",")));
|
||||||
List<ProjectLawsInventoryEO> lawsInventoryEOS = projectLawsInventoryEOService.list(wrapper1);
|
List<ProjectLawsInventoryEO> lawsInventoryEOS = projectLawsInventoryEOService.list(wrapper1);
|
||||||
|
|
||||||
//平台件项目信息
|
//平台件项目信息
|
||||||
|
|||||||
Reference in New Issue
Block a user