From 174bc744cf0eca652c475edff3519eb9650f7553 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 28 二月 2025 15:25:46 +0800
Subject: [PATCH] 调整环境报告
---
inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java b/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
index af28ef7..ab1d037 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
@@ -2622,18 +2622,20 @@
while (matcher.find()) {
vValues.add(Long.parseLong(matcher.group(1)));
}
- //涓嶅悎鏍�
- if (vValues.get(1)!=0){
- productCount2 = productCount2 - 1 + vValues.get(1);
+ if (vValues.size() > 0) {
+ //涓嶅悎鏍�
+ if (vValues.get(1) != 0) {
+ productCount2 = productCount2 - 1 + vValues.get(1);
+ }
+ //鍚堟牸
+ if (vValues.get(0) != 0) {
+ if (fusheProduct.getInsResult() == 1) {
+ productCount3 = productCount3 - 1 + vValues.get(0);
+ } else productCount3 = productCount3 + vValues.get(0);
+ }
+ //鎬绘暟=椤圭洰鎬绘暟-杈愬皠椤圭洰鏁伴噺+杈愬皠鍏蜂綋鐨�(鍚堟牸+涓嶅悎鏍�)鏁伴噺
+ productCount = productCount - 1 + vValues.stream().mapToLong(Long::longValue).sum();
}
- //鍚堟牸
- if (vValues.get(0)!=0) {
- if (fusheProduct.getInsResult()==1){
- productCount3 = productCount3 - 1 + vValues.get(0);
- }else productCount3 = productCount3 + vValues.get(0);
- }
- //鎬绘暟=椤圭洰鎬绘暟-杈愬皠椤圭洰鏁伴噺+杈愬皠鍏蜂綋鐨�(鍚堟牸+涓嶅悎鏍�)鏁伴噺
- productCount = productCount - 1 + vValues.stream().mapToLong(Long::longValue).sum();
}
}
productSize.set(productSize.get() + Integer.parseInt(productCount + ""));
@@ -2945,7 +2947,11 @@
//绗笁鍒�
//鑾峰彇妫�楠岄」鐩拰缁撹
InsProduct insProduct = products.get(i - 1);
- textRenderData.setText("缁忚繃" + insProduct.getInspectionItemSubclass() + "涔嬪悗锛屾牱鍝�" + (insProduct.getInsResult() == 0 ? "涓嶅悎鏍�" : "鏃犲紓甯�") + "銆�");
+ String shiyanjieguo = "鏃犲紓甯�";
+ if (ObjectUtils.isNotNull(insProduct.getInsResult())) {
+ shiyanjieguo = insProduct.getInsResult() == 0 ? "涓嶅悎鏍�" : "鏃犲紓甯�";
+ }
+ textRenderData.setText("缁忚繃" + insProduct.getInspectionItemSubclass() + "涔嬪悗锛屾牱鍝�" +shiyanjieguo + "銆�");
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
--
Gitblit v1.9.3