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

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

Browse Source
This commit is contained in:
zyx.net
2023-08-29 14:20:22 +08:00
parent 2307ae598d 6e804a4063
commit 854fe491aa
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRxswinEOMapper.java
+2 -1
View File
@@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/ */
public interface ProjectRxswinEOMapper extends BaseMapper<ProjectRxswinEO> { public interface ProjectRxswinEOMapper extends BaseMapper<ProjectRxswinEO> {
List<ProjectLibraryBase> queryProjectLibraryBaseList(@Param("projectLibraryId") String projectLibraryId); List<ProjectLibraryBase> queryProjectLibraryBaseList(@Param("id") String id,
@Param("parentId") String parentId);
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml
+2 -2
View File
@@ -34,7 +34,7 @@
LEFT JOIN project_name_info AS pni ON plb.project_name_id = pni.id LEFT JOIN project_name_info AS pni ON plb.project_name_id = pni.id
LEFT JOIN project_year_name_info AS pyni ON plb.year_name_id = pyni.id LEFT JOIN project_year_name_info AS pyni ON plb.year_name_id = pyni.id
LEFT JOIN sys_dict_item AS sdi ON sdi.item_value = plb.target_market LEFT JOIN sys_dict_item AS sdi ON sdi.item_value = plb.target_market
where plb.parent_id = #{projectLibraryId} where plb.parent_id = #{parentId}
or plb.id = #{projectLibraryId} or plb.id = #{id}
</select> </select>
</mapper> </mapper>
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java
+13 -1
View File
@@ -51,6 +51,8 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl<ProjectRxswinEOMappe
private ProjectRxswinEOMapper projectRxswinEOMapper; private ProjectRxswinEOMapper projectRxswinEOMapper;
@Autowired @Autowired
private BussDocumentLibraryEOServiceImpl bussDocumentLibraryEOService; private BussDocumentLibraryEOServiceImpl bussDocumentLibraryEOService;
@Autowired
private ProjectLibraryBaseServiceImpl projectLibraryBaseService;
/** /**
* 保存 * 保存
* *
@@ -190,7 +192,17 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl<ProjectRxswinEOMappe
*/ */
@Override @Override
public Page<ProjectLibraryBase> getOnePage(Integer pageNo,Integer pageSize,ProjectRxswinEO projectRxswinEO) { public Page<ProjectLibraryBase> getOnePage(Integer pageNo,Integer pageSize,ProjectRxswinEO projectRxswinEO) {
List<ProjectLibraryBase> libraryBaseList = projectRxswinEOMapper.queryProjectLibraryBaseList(projectRxswinEO.getProjectId()); ProjectLibraryBase libraryBase = projectLibraryBaseService.getById(projectRxswinEO.getProjectId());
String id = "";
String parentId = "";
if(StringUtils.isBlank(libraryBase.getParentId())){
id = libraryBase.getId();
parentId = libraryBase.getId();
}else{
id = libraryBase.getParentId();
parentId = libraryBase.getParentId();
}
List<ProjectLibraryBase> libraryBaseList = projectRxswinEOMapper.queryProjectLibraryBaseList(id,parentId);
for (ProjectLibraryBase projectLibraryBase : libraryBaseList) { for (ProjectLibraryBase projectLibraryBase : libraryBaseList) {
//项目名称 //项目名称
String projectName = ""; String projectName = "";