From 7a988c17fe25f18815889ff5221a5ebcf01fabdc Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 13 十月 2025 18:15:59 +0800
Subject: [PATCH] 武汉黄陂军粮-质检报告共享接口同步及推送3

---
 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2013PR2.java |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2013PR2.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2013PR2.java
index b1da9f3..e9a6fde 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2013PR2.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2013PR2.java
@@ -251,12 +251,11 @@
                         //鏂囦欢id
 
                         if (StringUtils.isNotEmpty(shareData.getReportFile())) {
-                            String fileId = ContextUtil.getTimeId(1000);
-                            String fileName = "闄勪欢" + ".pdf";
-                            Base64Util.base64StringToPDF(shareData.getReportFile(), basePath, fileId + ".pdf");
+                            String fileId = shareData.getDeletctionNumber() + ".pdf";
+                            Base64Util.base64StringToPDF(shareData.getReportFile(), basePath, fileId);
 
                             shareData.setFileId(fileId);
-                            shareData.setFileName(fileName);
+                            shareData.setFileName(fileId);
                             shareData.setFileTime(new Date());
 
 //                            shareData.setReportFile(null);
@@ -305,20 +304,21 @@
                 fz40WhjlMQuality.setId(whjlShareApi2013.getQlyOrgReportId());
                 String basePath = configData.getImgPath() + "COMMON/" + DateFormatUtils.format(new Date(), "yyyyMM") + "/";
 
-                if (StringUtils.isNotEmpty(whjlShareApi2013.getReportFile())) {
-
-                    String fileId = ContextUtil.getTimeId(1000) + ".pdf";
-                    String fileName = "闄勪欢" + ".pdf";
-                    Base64Util.base64StringToPDF(whjlShareApi2013.getReportFile(), basePath, fileId);
-
-
-                    whjlShareApi2013.setFileId(fileId);
-                    whjlShareApi2013.setFileName(fileName);
-                    whjlShareApi2013.setFileTime(new Date());
-                    whjlShareApi2013.setReportFile(null);
-                    log.info("瀛樺叆闄勪欢淇℃伅={}", fileName);
-                }
+//                if (StringUtils.isNotEmpty(whjlShareApi2013.getReportFile())) {
+//
+//                    String fileId = ContextUtil.getTimeId(1000) + ".pdf";
+//                    String fileName = "闄勪欢" + ".pdf";
+//                    Base64Util.base64StringToPDF(whjlShareApi2013.getReportFile(), basePath, fileId);
+//
+//
+//                    whjlShareApi2013.setFileId(fileId);
+//                    whjlShareApi2013.setFileName(fileName);
+//                    whjlShareApi2013.setFileTime(new Date());
+//                    whjlShareApi2013.setReportFile(null);
+//                    log.info("瀛樺叆闄勪欢淇℃伅={}", fileName);
+//                }
                 BeanUtils.copyProperties(whjlShareApi2013, fz40WhjlMQuality);
+                fz40WhjlMQuality.setReportFile(null);
                 fz40WhjlMQuality.setCompanyId(configData.getCompanyId());
                 fz40WhjlMQuality.setDeptId(DEPT_ID);
                 fz40ToWhjlSync2013Rep.save(fz40WhjlMQuality);

--
Gitblit v1.9.3