From 5a697e6fafbe3855336ca5fd7e1785de12840d16 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期六, 15 三月 2025 10:49:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
inspect-server/src/main/java/com/ruoyi/inspect/handler/ThermalCycleReportHandler.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/cnas-require/src/main/java/com/ruoyi/require/handler/ThermalCycleReportHandler.java b/inspect-server/src/main/java/com/ruoyi/inspect/handler/ThermalCycleReportHandler.java
similarity index 98%
rename from cnas-require/src/main/java/com/ruoyi/require/handler/ThermalCycleReportHandler.java
rename to inspect-server/src/main/java/com/ruoyi/inspect/handler/ThermalCycleReportHandler.java
index 05a560b..6e86e31 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/handler/ThermalCycleReportHandler.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/handler/ThermalCycleReportHandler.java
@@ -1,4 +1,4 @@
-package com.ruoyi.require.handler;
+package com.ruoyi.inspect.handler;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -35,7 +35,7 @@
private final InsProductResultMapper insProductResultMapper;
- public ThermalCycleReportHandler(InsProductMapper insProductMapper, InsProductResultMapper insProductResultMapper){
+ public ThermalCycleReportHandler(InsProductMapper insProductMapper,InsProductResultMapper insProductResultMapper){
this.insProductMapper = insProductMapper;
this.insProductResultMapper = insProductResultMapper;
}
@@ -66,7 +66,8 @@
.eq(InsProduct::getInspectionItemClass, "鐩存祦鐢甸樆")
.isNull(InsProduct::getInsFiberId) //鐢ㄥ厜绾ゅ尯鍒俯鍗囪瘯楠屽拰娓╁害寰幆
.eq(InsProduct::getInspectionItem, i + ""));
- InsProductResult insProductResult = insProductResultMapper.selectList(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insPros.get(0).getId())).get(0);
+ InsProductResult insProductResult = insProductResultMapper.selectList(Wrappers.<InsProductResult>lambdaQuery()
+ .eq(InsProductResult::getInsProductId, insPros.get(0).getId())).get(0);
vCount += StringUtils.countMatches(insProductResult.getInsValue(), "\"v\":\"");
list.add(StringUtils.countMatches(insProductResult.getInsValue(), "\"v\":\""));
}
@@ -556,7 +557,7 @@
}
}
rowRenderData.setCells(cells);
- if (rowRenderData.getCells().size() != 0) {
+ if (!rowRenderData.getCells().isEmpty()) {
rows.add(rowRenderData);
}
}
@@ -564,10 +565,6 @@
tableRenderData.setRows(rows);
int countSize = tableRenderData.getRows().get(0).getCells().size();
for (RowRenderData row : tableRenderData.getRows()) {
- /*for (CellRenderData cell : row.getCells()) {
- System.out.print(cell.getParagraphs().get(0).getContents());
- }
- System.out.println("");*/
if (row.getCells().size() != countSize) {
throw new ErrorException("姣忚鍗曞厓鏍间笉鐩哥瓑5");
}
--
Gitblit v1.9.3