From 7e51076a4cccc27df31bcdd98ca14c2f9d4928e9 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 09 五月 2024 07:27:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 300 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 249 insertions(+), 51 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 a8ba372..e2b7560 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
@@ -14,15 +14,18 @@
import com.deepoove.poi.config.Configure;
import com.deepoove.poi.config.ConfigureBuilder;
import com.deepoove.poi.data.*;
+import com.deepoove.poi.data.style.BorderStyle;
import com.deepoove.poi.data.style.Style;
import com.deepoove.poi.data.style.TableStyle;
+import com.deepoove.poi.util.TableTools;
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.exception.ErrorException;
import com.yuanchu.mom.mapper.*;
import com.yuanchu.mom.pojo.*;
-import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.service.InsOrderPlanService;
import com.yuanchu.mom.service.InsOrderService;
import com.yuanchu.mom.service.StandardTemplateService;
@@ -31,26 +34,23 @@
import com.yuanchu.mom.utils.MatrixToImageWriter;
import com.yuanchu.mom.utils.QueryWrappers;
import com.yuanchu.mom.vo.InsOrderPlanVO;
-import org.apache.poi.xwpf.usermodel.TableRowAlign;
-import org.apache.poi.xwpf.usermodel.XWPFTable;
+import org.apache.commons.io.IOUtils;
+import org.apache.poi.xwpf.usermodel.*;
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;
import java.time.format.DateTimeFormatter;
import java.util.*;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Collectors;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Stream;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
/**
* 妫�楠屼换鍔�-涓氬姟瀹炵幇灞�
@@ -125,11 +125,10 @@
insOrder.setId(id);
InsOrder order = insOrderMapper.selectById(id);
if (BeanUtil.isEmpty(order.getInsTime())) {
- insOrder.setInsState(1);
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,9 +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.equals("") ? null : (o.toString()));
+ }
+ } catch (Exception e) {
}
if (jo.get("equipValue") != null) {
JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("equipValue")));
@@ -200,6 +202,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 +243,28 @@
}
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()));
+ 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 +284,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) {
@@ -259,29 +293,37 @@
Map<String, String> user = insProductMapper.selectUserById(insOrder.getUserId());
List<SampleProductDto> samples = insSampleMapper.selectSampleProductListByOrderId(orderId);
InsReport insReport = new InsReport();
- insReport.setCode(giveCode.giveCode("JCZX/TX-", "ins_report", "-", "yyMMdd"));
+// insReport.setCode(giveCode.giveCode("JCZX/TX-", "ins_report", "-", "yyMMdd"));
+ insReport.setCode(insOrder.getEntrustCode());
insReport.setInsOrderId(orderId);
Set<Integer> set = new HashSet<>();
Map<Integer, String> map2 = new HashMap<>();
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 +331,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 +400,12 @@
delRSet.add(jo1.get("r") + "");
}
}
+ } else {
+ if ("鍙傛暟".equals(v.get("v"))) delSet.add(jo1.get("c") + "");
}
}
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 +414,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 +455,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") + "");
}
@@ -397,10 +489,17 @@
} else {
textRenderData.setText(v.get("v") == null ? "" : v.get("v") + "");
}
+ if (jo1.get("mc") != null) {
+ textRenderData.setText(textRenderData.getText() + "鈭�" + jo1.get("mc"));
+ }
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) {
@@ -428,6 +527,14 @@
// tableStyle.setColWidths(ArrayUtils.toPrimitive(colLen.toArray(new Integer[0])));
tableStyle.setAlign(TableRowAlign.CENTER);
tableStyle.setWidth(XWPFTable.DEFAULT_PERCENTAGE_WIDTH);
+ BorderStyle borderStyle = new BorderStyle();
+ borderStyle.setColor("000000");
+ borderStyle.setType(XWPFTable.XWPFBorderType.THICK);
+ borderStyle.setSize(14);
+ tableStyle.setLeftBorder(borderStyle);
+ tableStyle.setTopBorder(borderStyle);
+ tableStyle.setRightBorder(borderStyle);
+ tableStyle.setBottomBorder(borderStyle);
tableRenderData.setTableStyle(tableStyle);
Map<String, Object> table = new HashMap<>();
table.put("table", tableRenderData);
@@ -437,9 +544,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) {
@@ -449,12 +562,15 @@
tables.forEach(table -> {
table.put("tableSize", tables.size() + 1);
});
- List<Map<String, String>> deviceList = insOrderMapper.selectDeviceList(deviceSet);
+ List<Map<String, String>> deviceList = null;
+ if(deviceSet.size()!=0){
+ deviceList = insOrderMapper.selectDeviceList(deviceSet);
+ }
Map<String, String> codeStr = new HashMap<>();
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,28 +578,109 @@
} catch (Exception e) {
throw new RuntimeException(e);
}
+ String modelStr = "";
+ for (String model : models) {
+ modelStr += "," + model;
+ }
+ String finalModelStr = modelStr;
+ String sampleEn = insSampleMapper.getSampleEn(insOrder.getSample());
+ String orderType = insOrderMapper.getEnumLabelByValue(insOrder.getOrderType());
ConfigureBuilder builder = Configure.builder();
builder.useSpringEL(true);
+ List<Map<String, String>> finalDeviceList = deviceList;
XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).render(
new HashMap<String, Object>() {{
put("order", insOrder);
put("report", insReport);
put("user", user);
-// put("samples", samples);
- put("sampleSize", samples.size() + samples.get(0).getUnit());
+ put("sampleSize", samples.size());
put("tables", tables);
put("tableSize", tables.size() + 1);
- put("standardMethod", standardMethod2);
- put("deviceList", deviceList);
+ put("standardMethod", (standardMethod2.toString().equals("null") ? "" : standardMethod2));
+ put("deviceList", finalDeviceList);
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);
+ put("sampleEn", sampleEn);
+ put("orderType", orderType);
+ put("getTime", insOrder.getExamineTime().format(DateTimeFormatter.ofPattern("yyyy骞碝M鏈坉d鏃�")));
+ put("getTimeEn", monthNames[insOrder.getExamineTime().getMonthValue() - 1] + " " + insOrder.getExamineTime().getDayOfMonth() + ", " + insOrder.getExamineTime().getYear());
}});
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);
+ }
+ String path = wordUrl + "/" + insReport.getCode().replace("/", "") + ".docx";
+ try {
+ FileInputStream stream = new FileInputStream(path);
+ XWPFDocument document = new XWPFDocument(stream);
+ List<XWPFTable> xwpfTables = document.getTables();
+ for (int i = 1; i < xwpfTables.size() - (deviceList==null?1:2); i++) {
+ Set<String> set1 = new HashSet<>();
+ Map<String, Map<String, Integer>> maps = new HashMap<>();
+ for (int j = 0; j < xwpfTables.get(i).getRows().size(); j++) {
+ for (int k = 0; k < xwpfTables.get(i).getRows().get(j).getTableCells().size(); k++) {
+ if (xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getText().indexOf("鈭�") > -1) {
+ String[] split = xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getText().split("鈭�");
+ if (set1.add(split[1])) {
+ Map<String, Integer> map = new HashMap<>();
+ map.put("sr", j);
+ map.put("sc", k);
+ map.put("er", j + 0);
+ map.put("ec", k + 0);
+ maps.put(split[1], map);
+ } else {
+ Map<String, Integer> map1 = maps.get(split[1]);
+ if (j == map1.get("sr")) {
+ map1.put("ec", map1.get("ec") + 1);
+ } else if (k == map1.get("sc")) {
+ map1.put("er", map1.get("er") + 1);
+ }
+ }
+ String str = xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getText().split("鈭�")[0];
+ xwpfTables.get(i).getRows().get(j).getTableCells().get(k).removeParagraph(0);
+ xwpfTables.get(i).getRows().get(j).getTableCells().get(k).setText(str);
+ xwpfTables.get(i).getRows().get(j).getTableCells().get(k).setVerticalAlignment(XWPFTableCell.XWPFVertAlign.CENTER);
+ xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getParagraphArray(0).setAlignment(ParagraphAlignment.CENTER);
+ }
+ }
+ }
+ maps.forEach((k,v)->{
+ });
+ List<String> list = new ArrayList<>();
+ for (String s : maps.keySet()) {
+ list.add(s);
+ }
+ for (int a = list.size() - 1; a >= 0; a--) {
+ Map<String, Integer> v = maps.get(list.get(a));
+ for (int j = 0; j < v.get("er") - v.get("sr") + 1; j++) {
+ TableTools.mergeCellsHorizonal(xwpfTables.get(i), v.get("sr") + j, v.get("sc"), v.get("ec"));
+ }
+ if(v.get("er")>v.get("sr")){
+ TableTools.mergeCellsVertically(xwpfTables.get(i), v.get("sc"), v.get("sr"), v.get("er"));
+ }
+ }
+ }
+ FileOutputStream fileOutputStream = new FileOutputStream(path);
+ document.write(fileOutputStream);
+ fileOutputStream.close();
+ } catch (FileNotFoundException e) {
+ throw new RuntimeException(e);
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -497,7 +694,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 +707,7 @@
style.put("columnlen", config.get("columnlen"));
product.setTemplate(cellData);
product.setStyle(style);
+ product.setTemplateName(standardTemplateService.getStandTempNameById(product.getTemplateId()));
}
}
}
@@ -522,9 +720,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