From f15bdb0b902e3ea45fef229a8620fc6406abd617 Mon Sep 17 00:00:00 2001
From: zhijie <1003392067@qq.com>
Date: 星期三, 02 六月 2021 23:55:45 +0800
Subject: [PATCH] SAQ支持邮箱,支持简易版
---
src/main/java/com/ots/project/tool/report/SAQ/SAQReport.java | 8 +++++++-
src/main/java/com/ots/common/utils/poi/WordUtil.java | 6 ++++--
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ots/common/utils/poi/WordUtil.java b/src/main/java/com/ots/common/utils/poi/WordUtil.java
index 3da7e4a..ff01e4b 100644
--- a/src/main/java/com/ots/common/utils/poi/WordUtil.java
+++ b/src/main/java/com/ots/common/utils/poi/WordUtil.java
@@ -842,9 +842,11 @@
changeText(document, textMap);
//鏇存敼鏂囨湰妗�
- if (Objects.equals(reportType, ReportTypeEnum.MAQV2.getCode()) || Objects.equals(reportType, ReportTypeEnum.JAQ.getCode()) ) {
+/* if (Objects.equals(reportType, ReportTypeEnum.MAQV2.getCode()) || Objects.equals(reportType, ReportTypeEnum.JAQ.getCode()) ) {
changeTextBox(document, textMap);
- }
+ }*/
+
+ changeTextBox(document, textMap);
//CAQ鏇存敼鏂囨湰妗嗭紝wzp娴嬭瘯.2021.4.27
/* if (Objects.equals(reportType, ReportTypeEnum.CAQ.getCode())) {
diff --git a/src/main/java/com/ots/project/tool/report/SAQ/SAQReport.java b/src/main/java/com/ots/project/tool/report/SAQ/SAQReport.java
index 630adaa..6e09da8 100644
--- a/src/main/java/com/ots/project/tool/report/SAQ/SAQReport.java
+++ b/src/main/java/com/ots/project/tool/report/SAQ/SAQReport.java
@@ -41,6 +41,8 @@
private String reportGenerationDate;
private String userName;
private ReportTypeEnum reportTypeEnum;
+ //閭
+ private String questionnaireEmail;
private Map otherParams;
@@ -115,7 +117,10 @@
return paramList;
}
private List<String> getSimpleMessageCoreIds() {
- return Arrays.asList("LIBSAQ0001", "LIBSAQ0003", "LIBSAQ0005", "LIBSAQ0007", "LIBSAQ0009", "LIBSAQ00011",
+ //鏀寔SAQ GS绠�鏄撶増
+ return Arrays.asList("LIBSAQGS0001","LIBSAQGS0002","LIBSAQGS0005","LIBSAQGS0008","LIBSAQGS0009",
+ "LIBSAQGS0011","LIBSAQGS0017","LIBSAQGS0015","LIBSAQGS8800",
+ "LIBSAQ0001", "LIBSAQ0003", "LIBSAQ0005", "LIBSAQ0007", "LIBSAQ0009", "LIBSAQ00011",
"LIBSAQ0015", "LIBSAQ0017", "LIBSAQ0162", "LIBSAQ0164", "LIBSAQ0020", "LIBSAQ0022",
"LIBSAQ0024", "LIBSAQ0026", "LIBSAQ0030", "LIBSAQ0035", "LIBSAQ0040", "LIBSAQ0041",
"LIBSAQ0042", "LIBSAQ0043", "LIBSAQ0050", "LIBSAQ0051", "LIBSAQ0052", "LIBSAQ0053",
@@ -186,6 +191,7 @@
textMap.put("questionnaireID", getQuestionnaireID());
textMap.put("reportGenerationDate", getReportGenerationDate());
textMap.put("userName", getUserName());
+ textMap.put("questionnaireEmail", getQuestionnaireEmail());
getParamList(type).stream().forEach(p -> {
TLibraryCode calculate = p.calculate(thaiCalculationMap, langType);
--
Gitblit v1.9.1