From c2600591e819743757f8668d0c684da1e24cb7d4 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 08 三月 2024 18:21:22 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/PdfMergeController.java | 57 +++++++++++++++++----------------------------------------
1 files changed, 17 insertions(+), 40 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/PdfMergeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/PdfMergeController.java
index 12e3c92..f180dff 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/PdfMergeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/PdfMergeController.java
@@ -1,54 +1,31 @@
package com.ruoyi.web.controller.project;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.annotation.NotRepeatCommit;
-import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.MergeFilesToPDFUtils;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.bean.DtoConversionUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.project.domain.*;
-import com.ruoyi.project.domain.vo.*;
-import com.ruoyi.project.mapper.ServiceFunddetailMapper;
-import com.ruoyi.project.service.*;
-import com.ruoyi.system.service.ISysDeptService;
-import com.ruoyi.system.service.ISysPostService;
-import freemarker.template.Configuration;
-import freemarker.template.Template;
-import freemarker.template.TemplateException;
+import com.ruoyi.project.domain.MegerIsRemove;
+import com.ruoyi.project.domain.ServiceDonateannex;
+import com.ruoyi.project.domain.ServiceDonatebaseinfo;
+import com.ruoyi.project.service.IBaseOnlyvalueService;
+import com.ruoyi.project.service.IServiceDonateannexService;
+import com.ruoyi.project.service.IServiceDonatebaseinfoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.annotations.Options;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-import org.springframework.transaction.TransactionDefinition;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
-import java.io.*;
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static com.ruoyi.web.controller.project.ServiceReimbursementController.convert;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
/**
* PDF鍚堝苟
@@ -123,7 +100,7 @@
//鑾峰彇鍚堝苟鍚嶇О
ServiceDonatebaseinfo donatebaseinfo = donatebaseinfoService.getById(serviceDonateannexes.get(0).getInfoid());
- String fileName = donatebaseinfo.getDonorno() + donatebaseinfo.getName() + ".pdf";
+ String fileName = donatebaseinfo.getIdcardno() + donatebaseinfo.getName() + ".pdf";
String[] str = list.toArray(new String[0]);
//鏂囦欢鍚堝苟
mergeFilesToPDFUtils.mergePDF(str, fileName, response);
--
Gitblit v1.9.3