From 58c18ed858c0c3eaaa95b6abceceb1f1ad320fcd Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 04 六月 2024 21:21:44 +0800
Subject: [PATCH] 部分功能小调整
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 44 +++++++++++++++++++++++++++++++++-----------
1 files changed, 33 insertions(+), 11 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 fe95792..7e312bd 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
@@ -160,16 +160,37 @@
insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, id).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, LocalDateTime.now()).set(InsOrderState::getInsState, 1));
}
Map<String, Object> map = insOrderService.getInsOrderAndSample(id, laboratory);
- Set<Integer> set = new HashSet<>();
- Map<Integer, String> map2 = new HashMap<>();
List<SampleProductDto> list = JSON.parseArray(JSON.toJSONString(map.get("sampleProduct")), SampleProductDto.class);
for (SampleProductDto samples : list) {
+// Set<Integer> set = new HashSet<>();
+// Map<Integer, String> map2 = new HashMap<>();
if (BeanUtil.isEmpty(samples.getInsProduct())) continue;
samples.setBushing(insBushingService.selectBushingBySampleId(samples.getId()));
- getTemplateThing(set, map2, samples);
+// getTemplateThing(set, map2, samples.getInsProduct());
}
map.put("sampleProduct", list);
return map;
+ }
+
+ @Override
+ public List<InsProduct> getInsProduct(Integer id, Integer type, String laboratory) {
+ List<InsProduct> insProducts = new ArrayList<>();
+ switch (type){
+ case 0:
+ insProducts = insSampleMapper.getInsProduct1(id, laboratory);
+ break;
+ case 1:
+ insProducts = insSampleMapper.getInsProduct2(id);
+ break;
+ case 2:
+ insProducts = insSampleMapper.getInsProduct3(id);
+ break;
+ }
+ Set<Integer> set = new HashSet<>();
+ Map<Integer, String> map2 = new HashMap<>();
+ if (BeanUtil.isEmpty(insProducts)) return null;
+ getTemplateThing(set, map2, insProducts);
+ return insProducts;
}
@Override
@@ -361,7 +382,7 @@
}
InsOrder insOrder = insOrderMapper.selectById(orderId);
Map<String, String> user = insProductMapper.selectUserById(insOrder.getUserId());
- List<SampleProductDto> samples = insSampleMapper.selectSampleProductListByOrderId2(orderId);
+ List<SampleProductDto> samples = insSampleMapper.selectSampleProductListByOrderId(orderId);
InsReport insReport = new InsReport();
insReport.setCode(insOrder.getEntrustCode());
insReport.setInsOrderId(orderId);
@@ -381,7 +402,7 @@
models.add(a.getModel());
standardMethod.add(baseMapper.getStandardMethodCode(a.getStandardMethodListId()));
Set<String> templateSet = new HashSet<>();
- getTemplateThing(set, map2, a);
+ getTemplateThing(set, map2, a.getInsProduct());
for (InsProduct b : a.getInsProduct()) {
if (b.getInsProductResult() != null) {
List<JSONObject> jsonObjects = JSON.parseArray(b.getInsProductResult().getEquipValue(), JSONObject.class);
@@ -399,8 +420,8 @@
}
templateSet.add(JSON.toJSONString(b.getTemplate()));
}
- AtomicInteger index = new AtomicInteger();
templateSet.forEach(tem -> {
+ AtomicInteger index = new AtomicInteger();
Set<Integer> set2 = new HashSet<>();
List<RowRenderData> rows = new ArrayList<>();
List<TextRenderData> text = new ArrayList<>();
@@ -436,6 +457,8 @@
List<JSONObject> temp = JSON.parseArray(JSON.toJSONString(excelDtos), JSONObject.class);
Map<String, InsProduct> pMap = new HashMap<>();
Set<String> delRSet = new HashSet<>();
+ delRSet.add("0");
+ delRSet.add("1");
for (JSONObject jo1 : temp) {
JSONObject v = JSON.parseObject(JSON.toJSONString(jo1.get("v")));
if (Integer.parseInt(jo1.get("c") + "") > 9) {
@@ -575,7 +598,8 @@
textRenderData.setText(textRenderData.getText() + "鈭�" + jo1.get("mc"));
}
Style style = new Style();
- style.setFontFamily(v.get("ff") == null ? "寰蒋闆呴粦" : v.get("ff") + "");
+// style.setFontFamily(v.get("ff") == null ? "瀹嬩綋" : v.get("ff") + "");
+ style.setFontFamily("瀹嬩綋");
if (!((v.get("fc") + "").indexOf("rgb") > -1)) {
style.setColor(v.get("fc") == null ? "000000" : (v.get("fc") + "").replace("#", ""));
} else {
@@ -760,8 +784,6 @@
}
}
}
- maps.forEach((k, v) -> {
- });
List<String> list = new ArrayList<>();
for (String s : maps.keySet()) {
list.add(s);
@@ -790,8 +812,8 @@
return 1;
}
- private void getTemplateThing(Set<Integer> set, Map<Integer, String> map2, SampleProductDto a) {
- for (InsProduct product : a.getInsProduct()) {
+ private void getTemplateThing(Set<Integer> set, Map<Integer, String> map2, List<InsProduct> insProducts) {
+ for (InsProduct product : insProducts) {
if (product.getTemplateId() == null) {
product.setTemplate(new ArrayList<>());
continue;
--
Gitblit v1.9.3