From 645b3d4571fec2619233c2ffc90a0eeef3e7e706 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 5 Jul 2024 14:25:44 +0800 Subject: [PATCH] =?UTF-8?q?oms=E9=87=87=E8=B4=AD=E5=8D=95=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=BF=AE=E6=94=B9=E3=80=81=E5=9B=9E=E6=98=BE=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E3=80=81=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E5=AE=8C=E6=88=90=20=E9=99=84=E4=BB=B6=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=9B=9E=E6=98=BE=E5=88=A0=E9=99=A4=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiadmin/PurchaseAppendixRest.java | 40 +++++++++++ .../purchaseappendix/PurchaseAppendix.java | 66 ++++++++++++++++++ .../PurchaseAppendixDetailsVo.java | 67 +++++++++++++++++++ .../purchaseappendix/PurchaseAppendixDto.java | 67 +++++++++++++++++++ .../PurchaseAppendixMapper.java | 43 ++++++++++++ .../PurchaseAppendixMapper.xml | 6 ++ .../PurchaseAppendixService.java | 51 ++++++++++++++ .../purchaseappendix/PurchaseAppendixUrl.java | 53 +++++++++++++++ .../purchaseappendix/PurchaseFileEnum.java | 38 +++++++++++ .../purchasebill/PurchaseBillDetailsVo.java | 4 ++ .../biz/purchasebill/PurchaseBillDto.java | 4 ++ .../biz/purchasebill/PurchaseBillService.java | 36 +++++++++- 12 files changed, 474 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/yxt/purchase/apiadmin/PurchaseAppendixRest.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseAppendix.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseAppendixDetailsVo.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseAppendixDto.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseAppendixMapper.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseAppendixMapper.xml create mode 100644 src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseAppendixService.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseAppendixUrl.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseFileEnum.java diff --git a/src/main/java/com/yxt/purchase/apiadmin/PurchaseAppendixRest.java b/src/main/java/com/yxt/purchase/apiadmin/PurchaseAppendixRest.java new file mode 100644 index 0000000..0809fb6 --- /dev/null +++ b/src/main/java/com/yxt/purchase/apiadmin/PurchaseAppendixRest.java @@ -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; +} diff --git a/src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseAppendix.java b/src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseAppendix.java new file mode 100644 index 0000000..b07d5ce --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseAppendix.java @@ -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(采购)
+ * File: PurchaseAppendix.java
+ * Class: com.yxt.purchase.api.purchaseappendix.PurchaseAppendix
+ * Description: 附件表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-03 14:44:55
+ * + * @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; // 文件的路径 + +} diff --git a/src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseAppendixDetailsVo.java b/src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseAppendixDetailsVo.java new file mode 100644 index 0000000..4dd941b --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseAppendixDetailsVo.java @@ -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(采购)
+ * File: PurchaseAppendixVo.java
+ * Class: com.yxt.purchase.api.purchaseappendix.PurchaseAppendixVo
+ * Description: 附件表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-03 14:44:55
+ * + * @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; // 文件的路径 + +} \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseAppendixDto.java b/src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseAppendixDto.java new file mode 100644 index 0000000..61dad70 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseAppendixDto.java @@ -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(采购)
+ * File: PurchaseAppendixDto.java
+ * Class: com.yxt.purchase.api.purchaseappendix.PurchaseAppendixDto
+ * Description: 附件表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-03 14:44:55
+ * + * @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; // 文件的路径 + +} \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseAppendixMapper.java b/src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseAppendixMapper.java new file mode 100644 index 0000000..9520462 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseAppendixMapper.java @@ -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 { + + @Delete("delete from purchase_appendix where linkSid = #{dtoSid}") + void delByLinkSid(String dtoSid); + + @Select("select * from purchase_appendix where linkSid = #{dtoSid}") + List selByLinkSid(String sid); +} \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseAppendixMapper.xml b/src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseAppendixMapper.xml new file mode 100644 index 0000000..543730f --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseAppendixMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseAppendixService.java b/src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseAppendixService.java new file mode 100644 index 0000000..f32497c --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseAppendixService.java @@ -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 { + + 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 selByLinkSid(String sid) { + return baseMapper.selByLinkSid(sid); + } +} \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseAppendixUrl.java b/src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseAppendixUrl.java new file mode 100644 index 0000000..6ce6e1c --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseAppendixUrl.java @@ -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(采购)
+ * File: PurchaseAppendixDto.java
+ * Class: com.yxt.purchase.api.purchaseappendix.PurchaseAppendixDto
+ * Description: 附件表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-03 14:44:55
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "附件表 数据传输对象", description = "附件表 数据传输对象") +public class PurchaseAppendixUrl implements Dto { + + @ApiModelProperty("附件路径") + private String url; +} \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseFileEnum.java b/src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseFileEnum.java new file mode 100644 index 0000000..e03b031 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchaseappendix/PurchaseFileEnum.java @@ -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; + } + + +} diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillDetailsVo.java b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillDetailsVo.java index 6478c44..148d27c 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillDetailsVo.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillDetailsVo.java @@ -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 purchaseBillDetailList; + @ApiModelProperty("附件") + private List purchaseAppendixList = new ArrayList<>(); } \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillDto.java b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillDto.java index 39bbcb9..c9e0188 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillDto.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillDto.java @@ -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 purchaseBillDetailList; + @ApiModelProperty("附件") + private List purchaseAppendixList = new ArrayList<>(); } \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java index b80d67c..2c7e918 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java @@ -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 listPageVo(PagerQuery pq) { PurchaseBillQuery query = pq.getParams(); @@ -104,6 +109,7 @@ public class PurchaseBillService extends MybatisBaseService purchaseBillDetailList = dto.getPurchaseBillDetailList(); + List purchaseAppendixList = dto.getPurchaseAppendixList(); if (StringUtils.isBlank(dtoSid)) { String sid = this.insertByDto(dto); //保存采购单费用/预付款 @@ -117,12 +123,22 @@ public class PurchaseBillService extends MybatisBaseService purchaseBillDetailDetailsVos = purchaseBillDetailService.selByMainSid(sid); vo.setPurchaseBillDetailList(purchaseBillDetailDetailsVos); + List purchaseAppendixDetailsVos = purchaseAppendixService.selByLinkSid(sid); + List 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; }