open_platform/ss-common-purchase
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

oms采购单新增修改、回显详情、删除接口开发完成

Browse Source 
附件新增回显删除开发完成
This commit is contained in:
God
2024-07-05 14:25:44 +08:00
parent 617caf9e54
commit 645b3d4571
12 changed files with 474 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/main/java/com/yxt/purchase/apiadmin/PurchaseAppendixRest.java Normal file
View File

@@ -0,0 +1,40 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.purchase.apiadmin;
import com.yxt.purchase.biz.purchaseappendix.*;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@Api(tags = "附件表")
@RestController
@RequestMapping("/apiadmin/purchaseappendix")
public class PurchaseAppendixRest {
@Autowired
private PurchaseAppendixService purchaseAppendixService;
}

66
src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseAppendix.java Normal file
View File

@@ -0,0 +1,66 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.purchase.biz.purchaseappendix;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: caigou(采购) <br/>
* File: PurchaseAppendix.java <br/>
* Class: com.yxt.purchase.api.purchaseappendix.PurchaseAppendix <br/>
* Description: 附件表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-07-03 14:44:55 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "附件表", description = "附件表")
@TableName("purchase_appendix")
public class PurchaseAppendix extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("文件名")
private String fileName; // 文件名
@ApiModelProperty("文件类型")
private String fileType; // 文件类型
@ApiModelProperty("关联业务对象sid")
private String linkSid; // 关联业务对象sid
@ApiModelProperty("附件类型")
private String attachType; // 附件类型
@ApiModelProperty("文件大小")
private String fileSize; // 文件大小
@ApiModelProperty("文件的路径")
private String filePath; // 文件的路径
}

67
src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseAppendixDetailsVo.java Normal file
View File

@@ -0,0 +1,67 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.purchase.biz.purchaseappendix;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: caigou(采购) <br/>
* File: PurchaseAppendixVo.java <br/>
* Class: com.yxt.purchase.api.purchaseappendix.PurchaseAppendixVo <br/>
* Description: 附件表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-07-03 14:44:55 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "附件表 视图数据详情", description = "附件表 视图数据详情")
public class PurchaseAppendixDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("文件名")
private String fileName; // 文件名
@ApiModelProperty("文件类型")
private String fileType; // 文件类型
@ApiModelProperty("关联业务对象sid")
private String linkSid; // 关联业务对象sid
@ApiModelProperty("附件类型")
private String attachType; // 附件类型
@ApiModelProperty("文件大小")
private String fileSize; // 文件大小
@ApiModelProperty("文件的路径")
private String filePath; // 文件的路径
}

67
src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseAppendixDto.java Normal file
View File

@@ -0,0 +1,67 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.purchase.biz.purchaseappendix;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: caigou(采购) <br/>
* File: PurchaseAppendixDto.java <br/>
* Class: com.yxt.purchase.api.purchaseappendix.PurchaseAppendixDto <br/>
* Description: 附件表 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-07-03 14:44:55 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "附件表 数据传输对象", description = "附件表 数据传输对象")
public class PurchaseAppendixDto implements Dto {
private String sid; // sid
@ApiModelProperty("文件名")
private String fileName; // 文件名
@ApiModelProperty("文件类型")
private String fileType; // 文件类型
@ApiModelProperty("关联业务对象sid")
private String linkSid; // 关联业务对象sid
@ApiModelProperty("附件类型")
private String attachType; // 附件类型
@ApiModelProperty("文件大小")
private String fileSize; // 文件大小
@ApiModelProperty("文件的路径")
private String filePath; // 文件的路径
}

43
src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseAppendixMapper.java Normal file
View File

@@ -0,0 +1,43 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.purchase.biz.purchaseappendix;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@Mapper
public interface PurchaseAppendixMapper extends BaseMapper<PurchaseAppendix> {
@Delete("delete from purchase_appendix where linkSid = #{dtoSid}")
void delByLinkSid(String dtoSid);
@Select("select * from purchase_appendix where linkSid = #{dtoSid}")
List<PurchaseAppendixDetailsVo> selByLinkSid(String sid);
}

6
src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseAppendixMapper.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.purchase.biz.purchaseappendix.PurchaseAppendixMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
</mapper>

51
src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseAppendixService.java Normal file
View File

@@ -0,0 +1,51 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.purchase.biz.purchaseappendix;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.common.base.service.MybatisBaseService;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class PurchaseAppendixService extends MybatisBaseService<PurchaseAppendixMapper, PurchaseAppendix> {
public void insertByDto(PurchaseAppendixDto dto){
PurchaseAppendix entity = new PurchaseAppendix();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void delByLinkSid(String dtoSid) {
baseMapper.delByLinkSid(dtoSid);
}
public List<PurchaseAppendixDetailsVo> selByLinkSid(String sid) {
return baseMapper.selByLinkSid(sid);
}
}

53
src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseAppendixUrl.java Normal file
View File

@@ -0,0 +1,53 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.purchase.biz.purchaseappendix;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: caigou(采购) <br/>
* File: PurchaseAppendixDto.java <br/>
* Class: com.yxt.purchase.api.purchaseappendix.PurchaseAppendixDto <br/>
* Description: 附件表 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-07-03 14:44:55 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "附件表 数据传输对象", description = "附件表 数据传输对象")
public class PurchaseAppendixUrl implements Dto {
@ApiModelProperty("附件路径")
private String url;
}

38
src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseFileEnum.java Normal file
View File

@@ -0,0 +1,38 @@
package com.yxt.purchase.biz.purchaseappendix;
/**
* @Author fan
* @Date 2022/11/14 22:46
* @Description
*/
public enum PurchaseFileEnum {
PURCHASEBILL("001", "采购单附件"),
;
/**
* 附件类型
*/
private final String attachType;
/**
* 代号
*/
private final String mark;
PurchaseFileEnum(String attachType, String mark) {
this.attachType = attachType;
this.mark = mark;
}
public String getAttachType() {
return attachType;
}
public String getMark() {
return mark;
}
}

4
src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillDetailsVo.java
View File

@@ -28,6 +28,7 @@ package com.yxt.purchase.biz.purchasebill;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import com.yxt.purchase.biz.purchaseappendix.PurchaseAppendixUrl;
import com.yxt.purchase.biz.purchasebillamount.PurchaseBillAmountDetailsVo;
import com.yxt.purchase.biz.purchasebillamount.PurchaseBillAmountDto;
import com.yxt.purchase.biz.purchasebilldetail.PurchaseBillDetailDetailsVo;
@@ -39,6 +40,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -104,4 +106,6 @@ public class PurchaseBillDetailsVo implements Vo {
private PurchaseBillExtendDetailsVo purchaseBillExtend;
@ApiModelProperty("采购单商品明细")
private List<PurchaseBillDetailDetailsVo> purchaseBillDetailList;
@ApiModelProperty("附件")
private List<PurchaseAppendixUrl> purchaseAppendixList = new ArrayList<>();
}

4
src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillDto.java
View File

@@ -28,6 +28,7 @@ package com.yxt.purchase.biz.purchasebill;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.dto.Dto;
import com.yxt.purchase.biz.purchaseappendix.PurchaseAppendixUrl;
import com.yxt.purchase.biz.purchasebillamount.PurchaseBillAmountDto;
import com.yxt.purchase.biz.purchasebilldetail.PurchaseBillDetailDto;
import com.yxt.purchase.biz.purchasebillextend.PurchaseBillExtendDto;
@@ -36,6 +37,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -101,4 +103,6 @@ public class PurchaseBillDto implements Dto {
private PurchaseBillExtendDto purchaseBillExtend;
@ApiModelProperty("采购单商品明细")
private List<PurchaseBillDetailDto> purchaseBillDetailList;
@ApiModelProperty("附件")
private List<PurchaseAppendixUrl> purchaseAppendixList = new ArrayList<>();
}

36
src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java
View File

@@ -28,11 +28,13 @@ package com.yxt.purchase.biz.purchasebill;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.purchase.biz.purchaseappendix.*;
import com.yxt.purchase.biz.purchasebillamount.PurchaseBillAmountDetailsVo;
import com.yxt.purchase.biz.purchasebillamount.PurchaseBillAmountDto;
import com.yxt.purchase.biz.purchasebillamount.PurchaseBillAmountService;
@@ -57,7 +59,10 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
private PurchaseBillExtendService purchaseBillExtendService;
@Autowired
private PurchaseBillDetailService purchaseBillDetailService;
@Autowired
private PurchaseAppendixService purchaseAppendixService;
@Autowired
private FileUploadComponent fileUploadComponent;
public PagerVo<PurchaseBillVo> listPageVo(PagerQuery<PurchaseBillQuery> pq) {
PurchaseBillQuery query = pq.getParams();
@@ -104,6 +109,7 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
PurchaseBillAmountDto purchaseBillAmount = dto.getPurchaseBillAmount();
PurchaseBillExtendDto purchaseBillExtend = dto.getPurchaseBillExtend();
List<PurchaseBillDetailDto> purchaseBillDetailList = dto.getPurchaseBillDetailList();
List<PurchaseAppendixUrl> purchaseAppendixList = dto.getPurchaseAppendixList();
if (StringUtils.isBlank(dtoSid)) {
String sid = this.insertByDto(dto);
//保存采购单费用/预付款
@@ -117,12 +123,22 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
purchaseBillDetailDto.setBillSid(sid);
purchaseBillDetailService.insertByDto(purchaseBillDetailDto);
}
//保存附件信息
for (PurchaseAppendixUrl purchaseAppendixUrl : purchaseAppendixList) {
PurchaseAppendixDto purchaseAppendixDto = new PurchaseAppendixDto();
String filePath = purchaseAppendixUrl.getUrl().replace(fileUploadComponent.getUrlPrefix(), "");
purchaseAppendixDto.setLinkSid(sid);
purchaseAppendixDto.setAttachType(PurchaseFileEnum.PURCHASEBILL.getAttachType());
purchaseAppendixDto.setFilePath(filePath);
purchaseAppendixService.insertByDto(purchaseAppendixDto);
}
return sid;
}
this.updateByDto(dto);
purchaseBillAmountService.delByMainSid(dtoSid);
purchaseBillExtendService.delByMainSid(dtoSid);
purchaseBillDetailService.delByMainSid(dtoSid);
purchaseAppendixService.delByLinkSid(dtoSid);
//保存采购单费用/预付款
purchaseBillAmount.setBillSid(dtoSid);
purchaseBillAmountService.insertByDto(purchaseBillAmount);
@@ -134,6 +150,15 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
purchaseBillDetailDto.setBillSid(dtoSid);
purchaseBillDetailService.insertByDto(purchaseBillDetailDto);
}
//保存附件信息
for (PurchaseAppendixUrl purchaseAppendixUrl : purchaseAppendixList) {
PurchaseAppendixDto purchaseAppendixDto = new PurchaseAppendixDto();
String filePath = purchaseAppendixUrl.getUrl().replace(fileUploadComponent.getUrlPrefix(), "");
purchaseAppendixDto.setLinkSid(dtoSid);
purchaseAppendixDto.setAttachType(PurchaseFileEnum.PURCHASEBILL.getAttachType());
purchaseAppendixDto.setFilePath(filePath);
purchaseAppendixService.insertByDto(purchaseAppendixDto);
}
return dtoSid;
}
@@ -164,6 +189,15 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
vo.setPurchaseBillExtend(purchaseBillExtendDetailsVo);
List<PurchaseBillDetailDetailsVo> purchaseBillDetailDetailsVos = purchaseBillDetailService.selByMainSid(sid);
vo.setPurchaseBillDetailList(purchaseBillDetailDetailsVos);
List<PurchaseAppendixDetailsVo> purchaseAppendixDetailsVos = purchaseAppendixService.selByLinkSid(sid);
List<PurchaseAppendixUrl> purchaseAppendixUrlList = new ArrayList<>();
for (PurchaseAppendixDetailsVo purchaseAppendixDetailsVo : purchaseAppendixDetailsVos) {
PurchaseAppendixUrl purchaseAppendixUrl = new PurchaseAppendixUrl();
String url = fileUploadComponent.getUrlPrefix() + purchaseAppendixDetailsVo.getFilePath();
purchaseAppendixUrl.setUrl(url);
purchaseAppendixUrlList.add(purchaseAppendixUrl);
}
vo.setPurchaseAppendixList(purchaseAppendixUrlList);
return vo;
}