From cfbb549f0e21b8729046070c702be9fdd432b3e0 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期二, 22 四月 2025 21:57:43 +0800
Subject: [PATCH] 样品处理导出调整
---
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessTotaldealServiceImpl.java | 32 +++++---------------------------
1 files changed, 5 insertions(+), 27 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessTotaldealServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessTotaldealServiceImpl.java
index 02126e0..7e7bad5 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessTotaldealServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessTotaldealServiceImpl.java
@@ -16,6 +16,7 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.inspect.util.UserUtils;
import com.ruoyi.process.mapper.InspectionOrderMapper;
import com.ruoyi.process.mapper.ProcessDealMapper;
import com.ruoyi.process.mapper.ProcessSampleMapper;
@@ -186,41 +187,18 @@
public void exportProcessTotaldeal(Integer id, HttpServletResponse response) {
List<ProcessDeal> sampleDealDtos = processDealMapper.selectDeal(id);
ProcessTotaldeal processTotaldeal = processTotaldealMapper.selectById(id);
- String submitUserUrl="1";
- String examineUserUrl="1";
- String ratifyUserUrl="1";
- //鑾峰彇鎻愪氦浜虹鍚�
- if (ObjectUtils.isNotNull(processTotaldeal.getSubmitUser())) {
- User user1 = userMapper.selectById(processTotaldeal.getSubmitUser());
- if (ObjectUtils.isEmpty(user1.getSignatureUrl())) throw new ErrorException("鏈壘鍒版彁浜や汉鐨勭數瀛愮鍚�,璇蜂笂浼犺嚜宸辩殑鐢靛瓙绛惧悕!");
- submitUserUrl = user1.getSignatureUrl();
- }
- //鑾峰彇瀹℃牳浜虹鍚�
- if (ObjectUtils.isNotNull(processTotaldeal.getExamineUser())) {
- User user2 = userMapper.selectById(processTotaldeal.getExamineUser());
- if (ObjectUtils.isEmpty(user2.getSignatureUrl())) throw new ErrorException("鏈壘鍒板鏍镐汉鐨勭數瀛愮鍚�,璇蜂笂浼犺嚜宸辩殑鐢靛瓙绛惧悕!");
- examineUserUrl = user2.getSignatureUrl();
- }
- //鑾峰彇鎵瑰噯浜虹鍚�
- if (ObjectUtils.isNotNull(processTotaldeal.getRatifyUser())) {
- User user3 = userMapper.selectById(processTotaldeal.getRatifyUser());
- if (ObjectUtils.isEmpty(user3.getSignatureUrl())) throw new ErrorException("鏈壘鍒版壒鍑嗕汉鐨勭數瀛愮鍚�,璇蜂笂浼犺嚜宸辩殑鐢靛瓙绛惧悕!");
- ratifyUserUrl = user3.getSignatureUrl();
- }
+
// 鑾峰彇璺緞
InputStream inputStream = this.getClass().getResourceAsStream("/static/sample-deal.docx");
Configure configure = Configure.builder()
.bind("sampleList", new HackLoopTableRenderPolicy())
.build();
- FilePictureRenderData finalSubmitUserUrl = submitUserUrl!="1" ? new FilePictureRenderData(100, 50, imgUrl + "/" + submitUserUrl) : null;
- FilePictureRenderData finalExamineUserUrl = examineUserUrl!="1" ? new FilePictureRenderData(100, 50, imgUrl + "/" + examineUserUrl) : null;
- FilePictureRenderData finalRatifyUserUrl = ratifyUserUrl!="1" ? new FilePictureRenderData(100, 50, imgUrl + "/" + ratifyUserUrl) : null;
XWPFTemplate template = XWPFTemplate.compile(inputStream, configure).render(
new HashMap<String, Object>() {{
put("sampleList", sampleDealDtos);
- put("examineUrl", finalExamineUserUrl);//瀹℃牳浜�
- put("ratifyUrl", finalRatifyUserUrl);//鎵瑰噯浜�
- put("writeUrl",finalSubmitUserUrl);//鎻愪氦浜�
+ put("writeUrl",UserUtils.getFinalUserSignatureUrl(processTotaldeal.getSubmitUser()));//鎻愪氦浜�
+ put("examineUrl", UserUtils.getFinalUserSignatureUrl(processTotaldeal.getExamineUser()));//瀹℃牳浜�
+ put("ratifyUrl", UserUtils.getFinalUserSignatureUrl(processTotaldeal.getRatifyUser()));//鎵瑰噯浜�
}});
try {
response.setContentType("application/msword");
--
Gitblit v1.9.3