From 0cf0ceb7efe3edaba0cbb3f90f028db0de108abf Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期三, 29 十月 2025 17:19:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2013PR2.java | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 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..1565783 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2013PR2.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2013PR2.java
@@ -251,13 +251,12 @@
//鏂囦欢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.setFileTime(new Date());
+ shareData.setFileName(fileId);
+ shareData.setFileTime(param1.getEnd());
// shareData.setReportFile(null);
}
@@ -271,7 +270,7 @@
infoData.setKqdm(apiConf.getKqdm());
infoData.setInteType(WhjlConstant.API_CATEGORY_20);
infoData.setInteId(WhjlConstant.API_CODE_2013);
- infoData.setUpdateTime(new Date());
+ infoData.setUpdateTime(param1.getEnd());
infoData.setDataId(shareData.getQlyOrgReportId());
infoData.setData(JSON.toJSONString(shareData));
infoData.setCzbz(Constant.CZBZ_U);
@@ -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