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 +++++---------------------------
cnas-process/src/main/java/com/ruoyi/process/service/impl/InspectionOrderServiceImpl.java | 2 +-
ruoyi-admin/src/main/resources/application-ztzb.yml | 3 +++
cnas-process/src/main/resources/static/sample-deal.docx | 0
4 files changed, 9 insertions(+), 28 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/InspectionOrderServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/InspectionOrderServiceImpl.java
index dc0003e..ae6b0b4 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/InspectionOrderServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/InspectionOrderServiceImpl.java
@@ -174,7 +174,7 @@
processSample.setSampleName(insSample.getSample());//鏍峰搧鍚嶇О
processSample.setNum(1);//鏍峰搧鏁伴噺=1
processSample.setSampleSupplier(inspectionOrder.getCommissionUnit());//鏉ユ牱鍗曚綅
- LocalDate plusMonths = inspectionOrder.getSampleData().plusMonths(1);
+ LocalDate plusMonths = inspectionOrder.getSampleData() == null ? null : inspectionOrder.getSampleData().plusMonths(1);
processSample.setLeaveDate(plusMonths);//鐣欐牱鏃ユ湡=鏀舵牱鏃ユ湡寰�鍚庡欢涓�涓湀
processSample.setSampleState(inspectionOrder.getSampleStatus());//鏍峰搧鐘舵��
processSample.setDealTime(plusMonths);//閫�鏍锋棩鏈�=鐣欐牱鏃ユ湡
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");
diff --git a/cnas-process/src/main/resources/static/sample-deal.docx b/cnas-process/src/main/resources/static/sample-deal.docx
index 79cf25b..9401b21 100644
--- a/cnas-process/src/main/resources/static/sample-deal.docx
+++ b/cnas-process/src/main/resources/static/sample-deal.docx
Binary files differ
diff --git a/ruoyi-admin/src/main/resources/application-ztzb.yml b/ruoyi-admin/src/main/resources/application-ztzb.yml
index ffa6d56..3942383 100644
--- a/ruoyi-admin/src/main/resources/application-ztzb.yml
+++ b/ruoyi-admin/src/main/resources/application-ztzb.yml
@@ -11,6 +11,9 @@
url: jdbc:mysql://127.0.0.1:3306/center-lims?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: zttZTT123!
+# 鍙鐢ㄦ埛鏉冮檺
+# username: readonly
+# password: zttZTT123@@
# 浠庡簱鏁版嵁婧�
slave:
--
Gitblit v1.9.3