From 3d3fa72ebf55f841c8ede01c59347af5e44b773b Mon Sep 17 00:00:00 2001 From: wujianwei <wjw@11.com> Date: 星期一, 18 八月 2025 09:26:59 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master --- service/src/main/java/com/ruoyi/cwgl/service/impl/DispatchOrderServiceImpl.java | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/DispatchOrderServiceImpl.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/DispatchOrderServiceImpl.java index 58e4e9a..dc5a30e 100644 --- a/service/src/main/java/com/ruoyi/cwgl/service/impl/DispatchOrderServiceImpl.java +++ b/service/src/main/java/com/ruoyi/cwgl/service/impl/DispatchOrderServiceImpl.java @@ -1,6 +1,10 @@ package com.ruoyi.cwgl.service.impl; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; import java.lang.reflect.Method; +import java.nio.file.Files; +import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; import java.math.BigDecimal; @@ -12,7 +16,13 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.PageUtil; import com.github.pagehelper.Page; +import com.itextpdf.text.Document; +import com.itextpdf.text.Font; +import com.itextpdf.text.PageSize; +import com.itextpdf.text.pdf.BaseFont; +import com.itextpdf.text.pdf.PdfWriter; import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.utils.DateUtils; import javax.annotation.Resource; @@ -23,6 +33,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.cwgl.domain.vo.DispatchOrderVo; import com.ruoyi.cwgl.enums.FeeTypeEnums; +import com.ruoyi.cwgl.utils.MultiPagePdfWithImageUtils; import org.springframework.beans.factory.annotation.Autowired; import com.ruoyi.cwgl.domain.DispatchOrderItem; @@ -476,4 +487,15 @@ public List<DispatchOrderAttachmentVo> selectDispatchOrderAttachment(String no) { return dispatchOrderMapper.selectDispatchOrderAttachment(no); } + + @DataSource(DataSourceType.CWSJ) + @Override + public String downAttachment(String no) throws Exception { + List<DispatchOrderAttachmentVo> dispatchOrderAttachmentVos = selectDispatchOrderAttachment(no); + return MultiPagePdfWithImageUtils.createPdf(dispatchOrderAttachmentVos, no); + } + + + + } -- Gitblit v1.8.0