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/MAQNEW/condition/ResponseFidelityDiagnosis_V2.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ots/project/tool/report/MAQNEW/condition/ResponseFidelityDiagnosis_V2.java b/src/main/java/com/ots/project/tool/report/MAQNEW/condition/ResponseFidelityDiagnosis_V2.java
index aa7a4ce..7f6f337 100644
--- a/src/main/java/com/ots/project/tool/report/MAQNEW/condition/ResponseFidelityDiagnosis_V2.java
+++ b/src/main/java/com/ots/project/tool/report/MAQNEW/condition/ResponseFidelityDiagnosis_V2.java
@@ -23,6 +23,7 @@
map.put(name + IMAGE_PREFIX + "3", Objects.isNull(P_INCON25) ? "0" : String.valueOf(P_INCON25));
return map;
}
+ @Override
public TLibraryCode calculate(Map<String, String> map, LangTypeEnum langType) {
try {
String p_sde_t1 = map.get("P_SDE_T1");
@@ -31,15 +32,15 @@
String p_sde23 = map.get("P_SDE23");
String p_im24 = map.get("P_IM24");
String p_incon25 = map.get("P_INCON25");
+ P_SDE23 = Double.valueOf(p_sde23);
+ P_IM24 = Double.valueOf(p_im24);
+ P_INCON25 = Double.valueOf(p_incon25);
if (checkParamsIsNull(p_sde_t1, p_im_t1, p_incon_t1, p_sde23, p_im24, p_incon25)) {
return null;
}
Double P_SDE_T1 = Double.valueOf(p_sde_t1);
Double P_IM_T1 = Double.valueOf(p_im_t1);
Double P_INCON_T1 = Double.valueOf(p_incon_t1);
- P_SDE23 = Double.valueOf(p_sde23);
- P_IM24 = Double.valueOf(p_im24);
- P_INCON25 = Double.valueOf(p_incon25);
boolean LIBMAQV28801_3 = (P_SDE_T1 >= 95 || P_IM_T1 >= 95 || P_INCON_T1 >= 95) && (P_SDE23 >= 95 || P_IM24 >= 95 || P_INCON25 >= 95);
boolean LIBMAQV28802_3 = (P_SDE_T1 >= 95 || P_IM_T1 >= 95 || P_INCON_T1 >= 95) && ((5 < P_SDE23 && P_SDE23 < 95) && (5 < P_IM24 && P_IM24 < 95) && P_INCON25 < 95);
boolean LIBMAQV28803_3 = (P_SDE_T1 >= 95 || P_IM_T1 >= 95 || P_INCON_T1 >= 95) && (P_SDE23 <= 5 || P_IM24 <= 5) && (P_INCON25 < 95);
@@ -62,6 +63,8 @@
return null;
}
}
+
+ @Override
public List<TLibraryCode> calculateList(Map<String, String> map, LangTypeEnum langType) {
try {
String p_sde_t1 = map.get("P_SDE_T1");
@@ -70,15 +73,15 @@
String p_sde23 = map.get("P_SDE23");
String p_im24 = map.get("P_IM24");
String p_incon25 = map.get("P_INCON25");
+ P_SDE23 = Double.valueOf(p_sde23);
+ P_IM24 = Double.valueOf(p_im24);
+ P_INCON25 = Double.valueOf(p_incon25);
if (checkParamsIsNull(p_sde_t1, p_im_t1, p_incon_t1, p_sde23, p_im24, p_incon25)) {
return null;
}
Double P_SDE_T1 = Double.valueOf(p_sde_t1);
Double P_IM_T1 = Double.valueOf(p_im_t1);
Double P_INCON_T1 = Double.valueOf(p_incon_t1);
- P_SDE23 = Double.valueOf(p_sde23);
- P_IM24 = Double.valueOf(p_im24);
- P_INCON25 = Double.valueOf(p_incon25);
boolean LIBMAQV28801_3 = (P_SDE_T1 >= 95 || P_IM_T1 >= 95 || P_INCON_T1 >= 95) && (P_SDE23 >= 95 || P_IM24 >= 95 || P_INCON25 >= 95);
boolean LIBMAQV28802_3 = (P_SDE_T1 >= 95 || P_IM_T1 >= 95 || P_INCON_T1 >= 95) && ((5 < P_SDE23 && P_SDE23 < 95) && (5 < P_IM24 && P_IM24 < 95) && P_INCON25 < 95);
boolean LIBMAQV28803_3 = (P_SDE_T1 >= 95 || P_IM_T1 >= 95 || P_INCON_T1 >= 95) && (P_SDE23 <= 5 || P_IM24 <= 5) && (P_INCON25 < 95);
--
Gitblit v1.9.1