From da54d3fe5b3bd4ae92c43ac93e9619d2e15c8a7b Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期四, 27 六月 2024 16:55:52 +0800
Subject: [PATCH] 报告序号处理
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index 3c96fb3..ac90cde 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -273,9 +273,12 @@
JSONObject jo = JSON.parseObject(JSON.toJSONString(v));
InsProduct insProduct = new InsProduct();
insProduct.setId(Integer.parseInt(k));
- InsProductResult result = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()));
- if (BeanUtil.isEmpty(result)) {
- result = new InsProductResult();
+ List<InsProductResult> results = insProductResultMapper.selectList(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()));
+ InsProductResult result;
+ if (CollectionUtils.isEmpty(results)) {
+ result = new InsProductResult();
+ } else {
+ result = results.get(0);
}
result.setInsProductId(Integer.parseInt(k));
if (jo.get("insValue") != null) {
@@ -511,8 +514,9 @@
}
templateSet.add(JSON.toJSONString(b.getTemplate()));
}
+ AtomicInteger index = new AtomicInteger();
+ Set<String> itemSet = new HashSet<>();
templateSet.forEach(tem -> {
- AtomicInteger index = new AtomicInteger();
Set<Integer> set2 = new HashSet<>();
List<RowRenderData> rows = new ArrayList<>();
List<TextRenderData> text = new ArrayList<>();
@@ -635,7 +639,9 @@
break;
}
} else if (value.equals("搴忓彿")) {
- index.getAndIncrement();
+ if(itemSet.add(p.getInspectionItem())){
+ index.getAndIncrement();
+ }
textRenderData.setText(index + "");
} else if (value.equals("璁＄畻鍊�")) {
JSONArray jsonArray = JSON.parseArray(p.getInsProductResult().getComValue());
@@ -651,10 +657,8 @@
} else if (value.equals("璇曢獙鏂规硶")) {
textRenderData.setText(p.getMethodS());
} else if (value.equals("妫�楠岄」")) {
- Console.log(p.getInspectionItem() + "\n" + p.getInspectionItemEn());
textRenderData.setText(p.getInspectionItem() + "\n" + p.getInspectionItemEn());
} else if (value.equals("妫�楠屽瓙椤�")) {
- Console.log(p.getInspectionItemSubclass() + "\n" + p.getInspectionItemSubclassEn());
if (ObjectUtils.isEmpty(p.getInspectionItemSubclassEn())) {
textRenderData.setText(p.getInspectionItemSubclass());
} else {
--
Gitblit v1.9.3