diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 1995efe..acb55ab 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -11,6 +11,11 @@
+
+
+
+
+
@@ -22,4 +27,4 @@
-
\ No newline at end of file
+
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/HomePageController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/HomePageController.java
index 3f06f51..27eea7a 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/HomePageController.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/HomePageController.java
@@ -4,14 +4,16 @@ package com.chinaunicom.zyhy.ebtp.supplier.base.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.UpConstant;
+import com.chinaunicom.zyhy.ebtp.supplier.base.vo.LinksClassificationVo;
import com.chinaunicom.zyhy.ebtp.supplier.common.PublicStatus;
import com.chinaunicom.zyhy.ebtp.supplier.portals.entity.*;
import com.chinaunicom.zyhy.ebtp.supplier.portals.service.*;
-import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
/**
* 首页数据controller
*/
@@ -34,6 +36,8 @@ public class HomePageController {
@Autowired
private ICoscoPortalsDownloadsService coscoPortalsDownloadsService;
+ @Autowired
+ private ICoscoPortalsLinksClassificationService coscoPortalsLinksClassificationService;
/**
@@ -127,6 +131,16 @@ public class HomePageController {
return BaseResponse.success(coscoPortalsDownloadsService.selectCoscoPortalsDownloadsById(id));
}
+ /**
+ * 获取所有列表
+ * @param
+ * @return
+ */
+ @GetMapping("/coscoPortalsLinksClassification/getAll")
+ public BaseResponse getAllList() {
+ List list = coscoPortalsLinksClassificationService.getAll();
+ return BaseResponse.success(list);
+ }
}
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/vo/LinksClassificationVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/vo/LinksClassificationVo.java
new file mode 100644
index 0000000..5d8d155
--- /dev/null
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/vo/LinksClassificationVo.java
@@ -0,0 +1,24 @@
+package com.chinaunicom.zyhy.ebtp.supplier.base.vo;
+
+import com.chinaunicom.zyhy.ebtp.supplier.portals.entity.CoscoPortalsLinks;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class LinksClassificationVo {
+ /**
+ * id
+ */
+ private String id;
+ /**
+ * 分类名称
+ */
+ private String name;
+ /**
+ * 分类详情
+ */
+ private List links;
+
+
+}
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/controller/DictProjectController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/controller/DictProjectController.java
new file mode 100644
index 0000000..a8d053b
--- /dev/null
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/controller/DictProjectController.java
@@ -0,0 +1,94 @@
+package com.chinaunicom.zyhy.ebtp.supplier.dict.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.chinaunicom.mall.ebtp.common.base.controller.BaseController;
+import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
+import com.chinaunicom.zyhy.ebtp.supplier.dict.entity.DictProject;
+import com.chinaunicom.zyhy.ebtp.supplier.dict.service.IDictProjectService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 项目字典Controller
+ *
+ * @author ruoyi
+ * @date 2025-06-23
+ */
+@RestController
+@RequestMapping("/cosco/dictProject")
+public class DictProjectController extends BaseController {
+ @Autowired
+ private IDictProjectService dictProjectService;
+
+ /**
+ * 顶级列表查询
+ * @param dictProject
+ * @return
+ */
+ @PostMapping("/getTopLevelList")
+ public BaseResponse> getTopLevelList(@RequestBody DictProject dictProject){
+ dictProject.setParentCode("/");
+ return BaseResponse.success(dictProjectService.getPage(dictProject));
+ }
+
+ /**
+ * 二级列表查询
+ * @param dictProject
+ * @return
+ */
+ @PostMapping("/getSecondaryList")
+ public BaseResponse> getSecondaryList(@RequestBody DictProject dictProject){
+ return BaseResponse.success(dictProjectService.getPage(dictProject));
+ }
+
+
+ /**
+ * 获取所有列表
+ * @param parentCode
+ * @return
+ */
+ @GetMapping("/getAllList/{parentCode}")
+ public BaseResponse getAllList(@PathVariable String parentCode) {
+ DictProject dictProject = new DictProject();
+ dictProject.setParentCode(parentCode);
+ List list = dictProjectService.selectDictProjectList(dictProject);
+ return BaseResponse.success(list);
+ }
+
+
+
+ /**
+ * 获取项目字典详细信息
+ */
+ @GetMapping(value = "/{id}")
+ public BaseResponse getInfo(@PathVariable("id") Long id) {
+ return BaseResponse.success(dictProjectService.selectDictProjectById(id));
+ }
+
+ /**
+ * 新增项目字典
+ */
+ @PostMapping
+ public BaseResponse add(@RequestBody DictProject dictProject) {
+ return BaseResponse.success(dictProjectService.insertDictProject(dictProject));
+ }
+
+ /**
+ * 修改项目字典
+ */
+ @PutMapping
+ public BaseResponse edit(@RequestBody DictProject dictProject) {
+ return BaseResponse.success(dictProjectService.updateDictProject(dictProject));
+ }
+
+ /**
+ * 删除项目字典
+ */
+ @DeleteMapping("/{ids}")
+ public BaseResponse remove(@PathVariable Long[] ids) {
+ return BaseResponse.success(dictProjectService.deleteDictProjectByIds(ids));
+ }
+}
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/dao/DictProjectMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/dao/DictProjectMapper.java
new file mode 100644
index 0000000..7c20697
--- /dev/null
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/dao/DictProjectMapper.java
@@ -0,0 +1,71 @@
+package com.chinaunicom.zyhy.ebtp.supplier.dict.dao;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.chinaunicom.zyhy.ebtp.supplier.dict.entity.DictProject;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+/**
+ * 项目字典Mapper接口
+ *
+ * @author ruoyi
+ * @date 2025-06-23
+ */
+public interface DictProjectMapper {
+ /**
+ * 查询项目字典
+ *
+ * @param id 项目字典主键
+ * @return 项目字典
+ */
+ public DictProject selectDictProjectById(Long id);
+
+ /**
+ * 查询项目字典列表
+ *
+ * @param dictProject 项目字典
+ * @return 项目字典集合
+ */
+ public List selectDictProjectList(DictProject dictProject);
+
+ /**
+ * 新增项目字典
+ *
+ * @param dictProject 项目字典
+ * @return 结果
+ */
+ public int insertDictProject(DictProject dictProject);
+
+ /**
+ * 修改项目字典
+ *
+ * @param dictProject 项目字典
+ * @return 结果
+ */
+ public int updateDictProject(DictProject dictProject);
+
+ /**
+ * 删除项目字典
+ *
+ * @param id 项目字典主键
+ * @return 结果
+ */
+ public int deleteDictProjectById(Long id);
+
+ /**
+ * 批量删除项目字典
+ *
+ * @param ids 需要删除的数据主键集合
+ * @return 结果
+ */
+ public int deleteDictProjectByIds(Long[] ids);
+
+ /**
+ * 列表信息
+ * @param p
+ * @param vo
+ * @return
+ */
+ IPage selectPage(IPage p,@Param("vo") DictProject vo);
+}
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/dao/mapper/DictProjectMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/dao/mapper/DictProjectMapper.xml
new file mode 100644
index 0000000..b2069ad
--- /dev/null
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/dao/mapper/DictProjectMapper.xml
@@ -0,0 +1,180 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ select id,
+ code,
+ dic_name,
+ parent_code,
+ parent_type,
+ default_flag,
+ use_flag,
+ order_flag,
+ description,
+ dict_type_code,
+ dict_type_name
+ from dict_project
+
+
+
+
+
+
+
+
+
+ insert into dict_project
+
+ code,
+ dic_name,
+ parent_code,
+ parent_type,
+ default_flag,
+ use_flag,
+ order_flag,
+ description,
+ dict_type_code,
+ dict_type_name,
+
+
+ #{code},
+ #{dicName},
+ #{parentCode},
+ #{parentType},
+ #{defaultFlag},
+ #{useFlag},
+ #{orderFlag},
+ #{description},
+ #{dictTypeCode},
+ #{dictTypeName},
+
+
+
+ insert into dict_project
+ ( id, code, dic_name, parent_code, parent_type, default_flag, use_flag, order_flag, description, dict_type_code,
+ dict_type_name)
+ values
+
+ ( #{item.id}, #{item.code}, #{item.dicName}, #{item.parentCode}, #{item.parentType}, #{item.defaultFlag},
+ #{item.useFlag}, #{item.orderFlag}, #{item.description}, #{item.dictTypeCode}, #{item.dictTypeName})
+
+
+
+ update dict_project
+
+ code =
+ #{code},
+
+ dic_name =
+ #{dicName},
+
+ parent_code =
+ #{parentCode},
+
+ parent_type =
+ #{parentType},
+
+ default_flag =
+ #{defaultFlag},
+
+ use_flag =
+ #{useFlag},
+
+ order_flag =
+ #{orderFlag},
+
+ description =
+ #{description},
+
+ dict_type_code =
+ #{dictTypeCode},
+
+ dict_type_name =
+ #{dictTypeName},
+
+
+ where id = #{id}
+
+
+
+ update dict_project
+ set del_flag = 2
+ where id = #{id}
+
+
+
+ update dict_project set del_flag = 2 where id in
+
+ #{id}
+
+
+
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/entity/DictProject.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/entity/DictProject.java
new file mode 100644
index 0000000..92b20fe
--- /dev/null
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/entity/DictProject.java
@@ -0,0 +1,53 @@
+package com.chinaunicom.zyhy.ebtp.supplier.dict.entity;
+
+import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity;
+import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 项目字典对象 dict_project
+ *
+ * @author ruoyi
+ * @date 2025-06-23
+ */
+@Data
+public class DictProject extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /** 编号 */
+ private Long id;
+
+ /** 字典code */
+ private String code;
+
+ /** 字典名称 */
+ private String dicName;
+
+ /** 父类code */
+ private String parentCode;
+
+ /** 父类类型 */
+ private String parentType;
+
+ /** 是否默认 */
+ private String defaultFlag;
+
+ /** 是否应用 */
+ private String useFlag;
+
+ /** 排序 */
+ private Long orderFlag;
+
+ /** 描述 */
+ private String description;
+
+ /** 分组编码 */
+ private String dictTypeCode;
+
+ /** 分组名称 */
+ private String dictTypeName;
+
+ @ApiModelProperty(value = "分页对象信息")
+ private BasePageRequest basePageRequest;
+}
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/service/IDictProjectService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/service/IDictProjectService.java
new file mode 100644
index 0000000..298552a
--- /dev/null
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/service/IDictProjectService.java
@@ -0,0 +1,69 @@
+package com.chinaunicom.zyhy.ebtp.supplier.dict.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.chinaunicom.zyhy.ebtp.supplier.dict.entity.DictProject;
+
+import java.util.List;
+
+/**
+ * 项目字典Service接口
+ *
+ * @author ruoyi
+ * @date 2025-06-23
+ */
+public interface IDictProjectService {
+ /**
+ * 查询项目字典
+ *
+ * @param id 项目字典主键
+ * @return 项目字典
+ */
+ public DictProject selectDictProjectById(Long id);
+
+ /**
+ * 查询项目字典列表
+ *
+ * @param dictProject 项目字典
+ * @return 项目字典集合
+ */
+ public List selectDictProjectList(DictProject dictProject);
+
+ /**
+ * 新增项目字典
+ *
+ * @param dictProject 项目字典
+ * @return 结果
+ */
+ public int insertDictProject(DictProject dictProject);
+
+ /**
+ * 修改项目字典
+ *
+ * @param dictProject 项目字典
+ * @return 结果
+ */
+ public int updateDictProject(DictProject dictProject);
+
+ /**
+ * 批量删除项目字典
+ *
+ * @param ids 需要删除的项目字典主键集合
+ * @return 结果
+ */
+ public int deleteDictProjectByIds(Long[] ids);
+
+ /**
+ * 删除项目字典信息
+ *
+ * @param id 项目字典主键
+ * @return 结果
+ */
+ public int deleteDictProjectById(Long id);
+
+ /**
+ * 顶级列表
+ * @param dictProject
+ * @return
+ */
+ IPage getPage(DictProject dictProject);
+}
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/service/impl/DictProjectServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/service/impl/DictProjectServiceImpl.java
new file mode 100644
index 0000000..46aa865
--- /dev/null
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dict/service/impl/DictProjectServiceImpl.java
@@ -0,0 +1,97 @@
+package com.chinaunicom.zyhy.ebtp.supplier.dict.service.impl;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chinaunicom.zyhy.ebtp.supplier.dict.dao.DictProjectMapper;
+import com.chinaunicom.zyhy.ebtp.supplier.dict.entity.DictProject;
+import com.chinaunicom.zyhy.ebtp.supplier.dict.service.IDictProjectService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 项目字典Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2025-06-23
+ */
+@Service
+public class DictProjectServiceImpl implements IDictProjectService {
+ @Autowired
+ private DictProjectMapper dictProjectMapper;
+
+ /**
+ * 查询项目字典
+ *
+ * @param id 项目字典主键
+ * @return 项目字典
+ */
+ @Override
+ public DictProject selectDictProjectById(Long id) {
+ return dictProjectMapper.selectDictProjectById(id);
+ }
+
+ /**
+ * 查询项目字典列表
+ *
+ * @param dictProject 项目字典
+ * @return 项目字典
+ */
+ @Override
+ public List selectDictProjectList(DictProject dictProject) {
+ return dictProjectMapper.selectDictProjectList(dictProject);
+ }
+
+ /**
+ * 新增项目字典
+ *
+ * @param dictProject 项目字典
+ * @return 结果
+ */
+ @Override
+ public int insertDictProject(DictProject dictProject) {
+ return dictProjectMapper.insertDictProject(dictProject);
+ }
+
+ /**
+ * 修改项目字典
+ *
+ * @param dictProject 项目字典
+ * @return 结果
+ */
+ @Override
+ public int updateDictProject(DictProject dictProject) {
+ return dictProjectMapper.updateDictProject(dictProject);
+ }
+
+ /**
+ * 批量删除项目字典
+ *
+ * @param ids 需要删除的项目字典主键
+ * @return 结果
+ */
+ @Override
+ public int deleteDictProjectByIds(Long[] ids) {
+ return dictProjectMapper.deleteDictProjectByIds(ids);
+ }
+
+ /**
+ * 删除项目字典信息
+ *
+ * @param id 项目字典主键
+ * @return 结果
+ */
+ @Override
+ public int deleteDictProjectById(Long id) {
+ return dictProjectMapper.deleteDictProjectById(id);
+ }
+
+ @Override
+ public IPage getPage(DictProject dictProject) {
+ IPage p = new Page<>(dictProject.getBasePageRequest().getPageNo(),
+ dictProject.getBasePageRequest().getPageSize());
+ return dictProjectMapper.selectPage(p, dictProject);
+ }
+}
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/controller/CoscoPortalsAboutUsController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/controller/CoscoPortalsAboutUsController.java
index 21e0cbe..494d023 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/controller/CoscoPortalsAboutUsController.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/controller/CoscoPortalsAboutUsController.java
@@ -1,18 +1,12 @@
package com.chinaunicom.zyhy.ebtp.supplier.portals.controller;
-import cn.hutool.core.lang.Snowflake;
-import cn.hutool.core.util.IdUtil;
import com.chinaunicom.mall.ebtp.common.base.controller.BaseController;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
-import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
import com.chinaunicom.zyhy.ebtp.supplier.portals.entity.CoscoPortalsAboutUs;
import com.chinaunicom.zyhy.ebtp.supplier.portals.service.ICoscoPortalsAboutUsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.Date;
-import java.util.List;
-
/**
* 中远门户_关于我们信息Controller
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/ICoscoPortalsLinksClassificationService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/ICoscoPortalsLinksClassificationService.java
index 5e23634..fd521e4 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/ICoscoPortalsLinksClassificationService.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/ICoscoPortalsLinksClassificationService.java
@@ -1,6 +1,8 @@
package com.chinaunicom.zyhy.ebtp.supplier.portals.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.chinaunicom.zyhy.ebtp.supplier.base.vo.LinksClassificationVo;
+import com.chinaunicom.zyhy.ebtp.supplier.dict.entity.DictProject;
import com.chinaunicom.zyhy.ebtp.supplier.portals.entity.CoscoPortalsLinksClassification;
import java.util.List;
@@ -66,4 +68,11 @@ public interface ICoscoPortalsLinksClassificationService {
* @return
*/
IPage getPage(CoscoPortalsLinksClassification coscoPortalsLinksClassification);
+
+ /**
+ * 获取首页分类详情
+ * @param
+ * @return
+ */
+ List getAll();
}
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsLinksClassificationServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsLinksClassificationServiceImpl.java
index 975e9f3..fb202f3 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsLinksClassificationServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsLinksClassificationServiceImpl.java
@@ -1,12 +1,17 @@
package com.chinaunicom.zyhy.ebtp.supplier.portals.service.impl;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
+import com.chinaunicom.zyhy.ebtp.supplier.base.constant.UpConstant;
+import com.chinaunicom.zyhy.ebtp.supplier.base.vo.LinksClassificationVo;
+import com.chinaunicom.zyhy.ebtp.supplier.dict.entity.DictProject;
import com.chinaunicom.zyhy.ebtp.supplier.portals.dao.CoscoPortalsKeywordsMapper;
import com.chinaunicom.zyhy.ebtp.supplier.portals.dao.CoscoPortalsLinksClassificationMapper;
import com.chinaunicom.zyhy.ebtp.supplier.portals.entity.CoscoPortalsKeywords;
@@ -115,4 +120,22 @@ public class CoscoPortalsLinksClassificationServiceImpl extends BaseServiceImpl<
coscoPortalsLinksClassification.getBasePageRequest().getPageSize());
return coscoPortalsLinksClassificationMapper.getPageList(p,coscoPortalsLinksClassification);
}
+
+ @Override
+ public List getAll() {
+ List coscoPortalsLinksClassifications = coscoPortalsLinksClassificationMapper.selectCoscoPortalsLinksClassificationList(new CoscoPortalsLinksClassification());
+ CoscoPortalsLinks coscoPortalsLinks = new CoscoPortalsLinks();
+ coscoPortalsLinks.setStatus(UpConstant.ENABLE);
+ List coscoPortalsLinks1 = coscoPortalsLinkService.selectCoscoPortalsLinksList(coscoPortalsLinks);
+ List returnList=new ArrayList<>();
+ for (CoscoPortalsLinksClassification coscoPortalsLinksClassification : coscoPortalsLinksClassifications) {
+ LinksClassificationVo vo=new LinksClassificationVo();
+ vo.setId(coscoPortalsLinksClassification.getId());
+ vo.setName(coscoPortalsLinksClassification.getName());
+ List collect = coscoPortalsLinks1.stream().filter(coscoPortalsLink -> coscoPortalsLink.getClassificationId().equals(coscoPortalsLinksClassification.getId())).collect(Collectors.toList());
+ vo.setLinks(collect);
+ returnList.add(vo);
+ }
+ return returnList;
+ }
}