From 6620dc7b245127616cb580700eb026da03e96de5 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期一, 30 十二月 2024 17:06:48 +0800
Subject: [PATCH] fix:PAQ报告增加当前年度时间
---
src/main/java/com/ots/project/tool/report/PAQ/PAQReport.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ots/project/tool/report/PAQ/PAQReport.java b/src/main/java/com/ots/project/tool/report/PAQ/PAQReport.java
index 40b7df9..04af653 100644
--- a/src/main/java/com/ots/project/tool/report/PAQ/PAQReport.java
+++ b/src/main/java/com/ots/project/tool/report/PAQ/PAQReport.java
@@ -1,5 +1,6 @@
package com.ots.project.tool.report.PAQ;
+import com.alibaba.druid.sql.visitor.functions.Locate;
import com.ots.common.enums.LangTypeEnum;
import com.ots.common.enums.ReportTypeEnum;
import com.ots.common.utils.StringUtils;
@@ -8,12 +9,15 @@
import com.ots.project.tool.report.MAQNEW.base.MAQConditionVO_V2;
import com.ots.project.tool.report.MAQNEW.base.MAQSummaryCondition_V2;
import com.ots.project.tool.report.MAQNEW.condition.*;
+import com.ots.project.tool.report.PAQ.condition.Diagnosis;
+import com.ots.project.tool.report.PAQ.condition.DiagnosisTitle;
import com.ots.project.tool.report.ReportResultData;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
+import java.time.LocalDate;
import java.util.*;
import java.util.stream.Collectors;
@@ -63,6 +67,10 @@
ScoreCharacteristics_V2 scoreCharacteristics = new ScoreCharacteristics_V2(p);
return scoreCharacteristics;
}).collect(Collectors.toList()));
+
+ //鏈夋晥鎬х粨鏋滆瘖鏂�
+ paramList.add(new DiagnosisTitle());
+ paramList.add(new Diagnosis());
return paramList;
}
@@ -117,6 +125,12 @@
textMap.put("questionnaireEmail", getQuestionnaireEmail());
textMap.put("questionnaireStartTime", getQuestionnaireStartTime());
textMap.put("questionnaireEndTime", getQuestionnaireEndTime());
+
+
+ //鏇挎崲褰撳墠骞翠唤
+ LocalDate currentDate = LocalDate.now();
+ textMap.put("year",currentDate.getYear());
+
//鏍规嵁鎶ュ憡绫诲瀷鑾峰彇鎶ュ憡瀛楀吀
getParamList(type).stream().forEach(p -> {
//鑾峰彇瀵瑰簲璇█鎶ュ憡瀛楀吀
--
Gitblit v1.9.1