From edd98c54519f1f36fb561bdc1cb7aa33c6d68530 Mon Sep 17 00:00:00 2001
From: 朱佳吉 <1527963051@qq.com>
Date: 星期二, 07 五月 2024 17:35:17 +0800
Subject: [PATCH] 通过pid获取检验单当前试验室所有项目是否有检验结果后进行判断检验单是否更改成"已检"状态
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 204 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 163 insertions(+), 41 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 2990f06..b4b7cfd 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
@@ -6,6 +6,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -18,6 +19,7 @@
import com.deepoove.poi.data.style.TableStyle;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
+import com.yuanchu.mom.dto.ExcelDto;
import com.yuanchu.mom.dto.InsOrderPlanDTO;
import com.yuanchu.mom.dto.SampleProductDto;
import com.yuanchu.mom.mapper.*;
@@ -31,16 +33,15 @@
import com.yuanchu.mom.utils.MatrixToImageWriter;
import com.yuanchu.mom.utils.QueryWrappers;
import com.yuanchu.mom.vo.InsOrderPlanVO;
+import org.apache.commons.io.IOUtils;
import org.apache.poi.xwpf.usermodel.TableRowAlign;
import org.apache.poi.xwpf.usermodel.XWPFTable;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ResourceUtils;
import javax.annotation.Resource;
-import java.io.FileNotFoundException;
-import java.io.IOException;
+import java.io.*;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.time.LocalDateTime;
@@ -50,7 +51,6 @@
import java.util.stream.Collectors;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Stream;
/**
* 妫�楠屼换鍔�-涓氬姟瀹炵幇灞�
@@ -123,13 +123,12 @@
public Map<String, Object> doInsOrder(Integer id, String laboratory) {
InsOrder insOrder = new InsOrder();
insOrder.setId(id);
- insOrder.setInsState(1);
InsOrder order = insOrderMapper.selectById(id);
if (BeanUtil.isEmpty(order.getInsTime())) {
insOrder.setInsTime(LocalDateTime.now());
insOrderMapper.updateById(insOrder);
+ insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, id).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, LocalDateTime.now()).set(InsOrderState::getInsState, 1));
}
- 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<>();
@@ -143,7 +142,6 @@
}
@Override
- @Transactional(rollbackFor = Exception.class)
public void saveInsContext(Map<String, Object> insContext) {
Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
CompletableFuture.supplyAsync(() -> {
@@ -175,7 +173,7 @@
}
result.setInsValue(JSON.toJSONString(iv));
}
- if (jo.get("comValue") != null) {
+ if (jo.get("comValue") != null && !Objects.equals(jo.get("comValue"), "")) {
JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("comValue")));
List<Map<String, Object>> cv = new ArrayList<>();
for (Object o : jsonArray2) {
@@ -186,10 +184,13 @@
}
result.setComValue(JSON.toJSONString(cv));
}
- JSONObject resValue = JSON.parseObject(JSON.toJSONString(jo.get("resValue")));
- if (resValue.get("v") != null) {
- insProduct.setLastValue(JSON.parseObject(JSON.toJSONString(resValue.get("v"))).get("v") + "");
- }
+ try {
+ JSONObject resValue = JSON.parseObject(JSON.toJSONString(jo.get("resValue")));
+ if (resValue.get("v") != null) {
+ Object o = JSON.parseObject(JSON.toJSONString(resValue.get("v"))).get("v");
+ insProduct.setLastValue(o==null?null:(o + ""));
+ }
+ }catch (Exception e){}
if (jo.get("equipValue") != null) {
JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("equipValue")));
List<Map<String, Object>> ev = new ArrayList<>();
@@ -200,6 +201,17 @@
ev.add(map);
}
result.setEquipValue(JSON.toJSONString(ev));
+ }
+ if (jo.get("equipName") != null) {
+ JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("equipName")));
+ List<Map<String, Object>> ev = new ArrayList<>();
+ for (Object o : jsonArray2) {
+ JSONObject equipValue = JSON.parseObject(JSON.toJSONString(o));
+ Map<String, Object> map = new HashMap<>();
+ map.put("v", JSON.parseObject(JSON.toJSONString(equipValue.get("v"))).get("v"));
+ ev.add(map);
+ }
+ result.setEquipName(JSON.toJSONString(ev));
}
try {
JSONObject insResult = JSON.parseObject(JSON.toJSONString(jo.get("insResult")));
@@ -230,8 +242,32 @@
}
insSampleMapper.updateById(insSample);
});
- return null;
+ return insContext.keySet().stream().findFirst().orElse(null);
}).thenAccept(res -> {
+ if(res!=null){
+ int pId = Integer.parseInt(res.replaceAll("\\D+", ""));
+ InsProduct insProduct = insProductMapper.selectById(pId);
+ // 閫氳繃pId 鑾峰彇褰撳墠鏍锋湰id
+ int sampleId = insProductMapper.selectById(pId).getInsSampleId();
+ // 閫氳繃鏍锋湰id鑾峰彇璁㈠崟id
+ int orderId = insSampleMapper.selectById(sampleId).getInsOrderId();
+ // 閫氳繃璁㈠崟id鏌ユ壘鎵�鏈夋牱鏈琲d
+ List<Integer> sampleIds = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId)).stream().map(InsSample::getId).collect(Collectors.toList());
+ // 閫氳繃妫�鏌ユ瘡涓�涓牱鏈琲d鏌ュ埌灞炰簬妫�楠岄」缁撹 is null鐨勬暟閲�
+ Long count = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, sampleIds).isNull(InsProduct::getInsResult).eq(InsProduct::getSonLaboratory, insProduct.getSonLaboratory()));
+ // is null鐨勬暟閲忎负0鏄皢璁㈠崟鐘舵�佽〃鐨勭姸鎬佹敼涓哄凡妫�楠�
+ List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, sampleIds).isNull(InsProduct::getInsResult).eq(InsProduct::getSonLaboratory, insProduct.getSonLaboratory()));
+ insProducts.forEach(insProduct1 -> {
+ System.out.println(insProduct1.getInsResult());
+ System.out.println(insProduct1.getId());
+ });
+ if (count == 0) {
+ insOrderStateMapper.update(new InsOrderState(), Wrappers.<InsOrderState>lambdaUpdate()
+ .eq(InsOrderState::getInsOrderId, orderId)
+ .eq(InsOrderState::getLaboratory, insProduct.getSonLaboratory())
+ .set(InsOrderState::getInsState, 2));
+ }
+ }
}).exceptionally(e -> {
e.printStackTrace();
return null;
@@ -251,7 +287,8 @@
@Transactional(rollbackFor = Exception.class)
public int verifyPlan(Integer orderId, String laboratory, Integer type, String tell) {
Integer num = (type == 1 ? 5 : 4);
- insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, orderId).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, LocalDateTime.now()).set(InsOrderState::getInsState, num).set(InsOrderState::getVerifyTell, tell).set(InsOrderState::getVerifyUser, getLook.selectPowerByMethodAndUserId(null).get("userId")));
+ LocalDateTime now = LocalDateTime.now();
+ insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, orderId).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, now).set(InsOrderState::getInsState, num).set(InsOrderState::getVerifyTell, tell).set(InsOrderState::getVerifyUser, getLook.selectPowerByMethodAndUserId(null).get("userId")));
List<InsOrderState> insOrderStates = insOrderStateMapper.selectList(Wrappers.<InsOrderState>lambdaQuery().eq(InsOrderState::getInsOrderId, orderId));
long count = insOrderStates.stream().filter(a -> a.getInsState() == 5).count();
if (count == insOrderStates.size() && num == 5) {
@@ -266,22 +303,29 @@
List<Map<String, Object>> tables = new ArrayList<>();
Set<String> standardMethod = new HashSet<>();
Set<String> deviceSet = new HashSet<>();
+ Set<String> models = new HashSet<>();
+ AtomicReference<Integer> productSize = new AtomicReference<>(0);
+ String[] monthNames = {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"};
samples.forEach(a -> {
+ models.add(a.getModel());
Set<String> templateSet = new HashSet<>();
getTemplateThing(set, map2, a);
- a.getInsProduct().forEach(b -> {
- String[] split = b.getMethod().replaceAll("]", "").replaceAll("\\[", "").replaceAll("\"", "").split(",");
- standardMethod.addAll(Arrays.asList(split));
+ for (InsProduct b : a.getInsProduct()) {
+ standardMethod.add(b.getMethodS());
+ productSize.set(productSize.get() + 1);
if (b.getInsProductResult() != null) {
- if (b.getInsProductResult().getEquipValue() != null && !Objects.equals(b.getInsProductResult().getEquipValue(), "")) {
- deviceSet.add(b.getInsProductResult().getEquipValue());
+ List<JSONObject> jsonObjects = JSON.parseArray(b.getInsProductResult().getEquipValue(), JSONObject.class);
+ for (JSONObject jsonObject : jsonObjects) {
+ if (!"".equals(jsonObject.get("v") + "")) {
+ deviceSet.add(jsonObject.get("v") + "");
+ }
}
}
if (b.getTemplate().size() == 0) {
- return;
+ continue;
}
templateSet.add(JSON.toJSONString(b.getTemplate()));
- });
+ }
AtomicInteger index = new AtomicInteger();
templateSet.forEach(tem -> {
Set<Integer> set2 = new HashSet<>();
@@ -289,20 +333,66 @@
List<TextRenderData> text = new ArrayList<>();
RowRenderData rowRenderData;
Set<String> delSet = new HashSet<>();
- List<JSONObject> temp = JSON.parseArray(tem, JSONObject.class);
+ List<ExcelDto> excelDtos = JSON.parseArray(tem, ExcelDto.class);
+ List<ExcelDto> mcList = new ArrayList<>();
+ excelDtos.forEach(b -> {
+ if (b.getV().getMc() != null && b.getV().getMc().getCs() != null && b.getV().getMc().getRs() != null) {
+ mcList.add(b);
+ }
+ });
+ int count5 = 0;
+ for (ExcelDto b : mcList) {
+ for (ExcelDto excelDto : excelDtos) {
+ for (int i = 0; i < b.getV().getMc().getCs(); i++) {
+ for (int i2 = 0; i2 < b.getV().getMc().getRs(); i2++) {
+ if (excelDto.getC() == b.getC() + i && excelDto.getR() == b.getR() + i2) {
+ ExcelDto bb = JSON.parseObject(JSON.toJSONString(b), ExcelDto.class);
+ excelDto.getV().setV(bb.getV().getV());
+ excelDto.getV().setPs(bb.getV().getPs());
+ excelDto.getV().setFc(bb.getV().getFc());
+ excelDto.getV().setFs(bb.getV().getFs());
+ excelDto.getV().setHt(bb.getV().getHt());
+ excelDto.setMc(count5);
+ break;
+ }
+ }
+ }
+ }
+ count5++;
+ }
+ List<JSONObject> temp = JSON.parseArray(JSON.toJSONString(excelDtos), JSONObject.class);
Map<String, InsProduct> pMap = new HashMap<>();
Set<String> delRSet = new HashSet<>();
for (JSONObject jo1 : temp) {
JSONObject v = JSON.parseObject(JSON.toJSONString(jo1.get("v")));
if (v.get("ps") != null) {
- if ("妫�楠屽��".equals(JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "") || "璁惧".equals(JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "")) {
+ int count3 = 0;
+ String str = "";
+ if ("妫�楠屽��".equals(JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "") || "璁惧鍚嶇О".equals(JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "") || "璁惧缂栫爜".equals(JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "")) {
delSet.add(jo1.get("c") + "");
+ continue;
}
- if ("妫�楠屽瓙椤�".equals(JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "")) {
+ for (JSONObject jo2 : temp) {
+ JSONObject v2 = JSON.parseObject(JSON.toJSONString(jo2.get("v")));
+ if (jo1.get("r").equals(jo2.get("r"))) {
+ if (v2.get("ps") != null && JSON.parseObject(JSON.toJSONString(v2.get("ps"))).get("value").equals("妫�楠岄」")) {
+ if (count3 == 0) {
+ str += v2.get("v");
+ count3 += 1;
+ }
+ } else if (v2.get("ps") != null && JSON.parseObject(JSON.toJSONString(v2.get("ps"))).get("value").equals("妫�楠屽瓙椤�")) {
+ if (count3 == 1) {
+ str += v2.get("v");
+ count3 += 1;
+ }
+ }
+ }
+ }
+ if (!str.equals("")) {
int count2 = 0;
- for (InsProduct p : a.getInsProduct()) {
- if (v.get("v").equals(p.getInspectionItemSubclass())) {
- pMap.put(jo1.get("r") + "", p);
+ for (InsProduct product : a.getInsProduct()) {
+ if ((product.getInspectionItem() + product.getInspectionItemSubclass()).equals(str)) {
+ pMap.put(jo1.get("r") + "", product);
break;
} else {
count2++;
@@ -312,16 +402,13 @@
delRSet.add(jo1.get("r") + "");
}
}
+ } else {
+ if ("鍙傛暟".equals(v.get("v"))) delSet.add(jo1.get("c") + "");
}
}
+ // TODO: 2024/5/5 涓嬪垪寰幆缂哄皯word鍚堝苟鍗曞厓鏍肩殑鎿嶄綔
for (int i = 0; i < temp.size(); i++) {
JSONObject jo1 = temp.get(i);
- if (delRSet.stream().anyMatch(e -> e.equals(jo1.get("r") + ""))) {
- continue;
- }
- if (delSet.stream().anyMatch(e -> e.equals(jo1.get("c") + ""))) {
- continue;
- }
TextRenderData textRenderData = new TextRenderData();
if (set2.add(Integer.parseInt(jo1.get("r") + ""))) {
if (text.size() > 0) {
@@ -330,6 +417,12 @@
rows.add(rowRenderData);
text = new ArrayList<>();
}
+ }
+ if (delRSet.stream().anyMatch(e -> e.equals(jo1.get("r") + ""))) {
+ continue;
+ }
+ if (delSet.stream().anyMatch(e -> e.equals(jo1.get("c") + ""))) {
+ continue;
}
JSONObject v = JSON.parseObject(JSON.toJSONString(jo1.get("v")));
InsProduct p = pMap.get(jo1.get("r") + "");
@@ -365,6 +458,8 @@
textRenderData.setText(a.getModel());
} else if (value.equals("鏍峰搧鍚嶇О")) {
textRenderData.setText(a.getSample());
+ } else if (value.equals("璇曢獙鏂规硶")) {
+ textRenderData.setText(p.getMethodS());
} else {
textRenderData.setText(v.get("v") == null ? "" : v.get("v") + "");
}
@@ -400,7 +495,11 @@
Style style = new Style();
style.setFontFamily(v.get("ff") == null ? "寰蒋闆呴粦" : v.get("ff") + "");
// style.setFontSize(v.get("fs")==null?14:Integer.parseInt(v.get("fs")+""));
- style.setColor(v.get("fc") == null ? "000000" : (v.get("fc") + "").replace("#", ""));
+ if (!((v.get("fc") + "").indexOf("rgb") > -1)) {
+ style.setColor(v.get("fc") == null ? "000000" : (v.get("fc") + "").replace("#", ""));
+ } else {
+ style.setColor("000000");
+ }
textRenderData.setStyle(style);
text.add(textRenderData);
if (i == temp.size() - 1) {
@@ -437,9 +536,15 @@
});
String url;
try {
- url = ResourceUtils.getURL("classpath:static/report-template.docx").getPath();
+ InputStream inputStream = this.getClass().getResourceAsStream("/static/report-template.docx");
+ File file = File.createTempFile("temp", ".tmp");
+ OutputStream outputStream = new FileOutputStream(file);
+ IOUtils.copy(inputStream, outputStream);
+ url = file.getAbsolutePath();
} catch (FileNotFoundException e) {
throw new ErrorException("鎵句笉鍒版ā鏉挎枃浠�");
+ } catch (IOException e) {
+ throw new RuntimeException(e);
}
StringBuilder standardMethod2 = new StringBuilder();
for (String s : standardMethod) {
@@ -454,7 +559,7 @@
codeStr.put("鎶ュ憡缂栧彿", insReport.getCode());
codeStr.put("鏍峰搧鍚嶇О", insOrder.getSample());
codeStr.put("瑙勬牸鍨嬪彿", samples.get(0).getModel());
- codeStr.put("鍙戞斁鏃ユ湡", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+ codeStr.put("鍙戞斁鏃ユ湡", now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
String codePath;
try {
codePath = new MatrixToImageWriter().code(JackSonUtil.marshal(codeStr).replaceAll("\\{", "")
@@ -462,6 +567,11 @@
} catch (Exception e) {
throw new RuntimeException(e);
}
+ String modelStr = "";
+ for (String model : models) {
+ modelStr += "," + model;
+ }
+ String finalModelStr = modelStr;
ConfigureBuilder builder = Configure.builder();
builder.useSpringEL(true);
XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).render(
@@ -476,13 +586,24 @@
put("standardMethod", standardMethod2);
put("deviceList", deviceList);
put("twoCode", Pictures.ofLocal(codePath).create());
+ put("models", finalModelStr.replace(",", ""));
+ put("productSize", productSize);
+ put("createTime", now.format(DateTimeFormatter.ofPattern("yyyy骞碝M鏈坉d鏃�")));
+ put("createTimeEn", monthNames[now.getMonthValue() - 1] + " " + now.getDayOfMonth() + ", " + now.getYear());
+ put("insTime", insOrder.getInsTime().format(DateTimeFormatter.ofPattern("yyyy骞碝M鏈坉d鏃�")));
+ put("insTimeEn", monthNames[insOrder.getInsTime().getMonthValue() - 1] + " " + now.getDayOfMonth() + ", " + now.getYear());
+ put("writeUrl", null);
+ put("insUrl", null);
+ put("examineUrl", null);
+ put("ratifyUrl", null);
}});
try {
- String name = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yy_MM_dd&HH_mm_ss")) + ".docx";
+ String name = insReport.getCode().replace("/", "") + ".docx";
template.writeAndClose(Files.newOutputStream(Paths.get(wordUrl + "/" + name)));
insReport.setUrl("/word/" + name);
insReportMapper.insert(insReport);
- insOrder.setState(4);
+// insOrder.setState(4);
+ insOrder.setInsState(5);
insOrderMapper.updateById(insOrder);
} catch (IOException e) {
throw new RuntimeException(e);
@@ -497,7 +618,7 @@
product.setTemplate(new ArrayList<>());
continue;
}
- if (set.add(product.getTemplateId())) {
+ if (product.getTemplateId() != null && set.add(product.getTemplateId())) {
map2.put(product.getTemplateId(), standardTemplateService.getStandTempThingById(product.getTemplateId()) + "");
}
String thing = map2.get(product.getTemplateId());
@@ -510,6 +631,7 @@
style.put("columnlen", config.get("columnlen"));
product.setTemplate(cellData);
product.setStyle(style);
+ product.setTemplateName(standardTemplateService.getStandTempNameById(product.getTemplateId()));
}
}
}
@@ -522,9 +644,9 @@
if (insProducts.size() > 0) {
String str = "";
for (InsProduct product : insProducts) {
- str += product.getInspectionItem()+product.getInspectionItemSubclass()+"锛�";
+ str += product.getInspectionItem() + product.getInspectionItemSubclass() + "锛�";
}
- throw new ErrorException("浠ヤ笅鏄湭妫�楠岀殑椤圭洰锛�"+str);
+ throw new ErrorException("浠ヤ笅鏄湭妫�楠岀殑椤圭洰锛�" + str);
}
insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, orderId).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, LocalDateTime.now()).set(InsOrderState::getInsState, 3));
return 1;
--
Gitblit v1.9.3