From 11d87814ebdb8863b1a88b835d5a7d33e2c32928 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 13 五月 2024 14:55:55 +0800
Subject: [PATCH] 报告合并单元格报错解决； 检验单查询增加报告地址内容
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 154 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 132 insertions(+), 22 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 6d58dd7..b1d8c72 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,16 +14,19 @@
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.InformationNotificationService;
import com.yuanchu.mom.service.InsOrderPlanService;
import com.yuanchu.mom.service.InsOrderService;
import com.yuanchu.mom.service.StandardTemplateService;
@@ -33,8 +36,7 @@
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.apache.poi.xwpf.usermodel.*;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -46,10 +48,10 @@
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.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
/**
* 妫�楠屼换鍔�-涓氬姟瀹炵幇灞�
@@ -92,6 +94,9 @@
@Resource
private InsProductUserMapper insProductUserMapper;
+
+ @Resource
+ private InformationNotificationService informationNotificationService;
@Override
public Map<String, Object> selectInsOrderPlanList(Page page, InsOrderPlanDTO insOrderPlanDTO) {
@@ -187,9 +192,10 @@
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 + ""));
+ insProduct.setLastValue(o.equals("") ? null : (o.toString()));
}
- }catch (Exception e){}
+ } catch (Exception e) {
+ }
if (jo.get("equipValue") != null) {
JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("equipValue")));
List<Map<String, Object>> ev = new ArrayList<>();
@@ -243,11 +249,23 @@
});
return insContext.keySet().stream().findFirst().orElse(null);
}).thenAccept(res -> {
- if(res!=null){
+ if (res != null) {
int pId = Integer.parseInt(res.replaceAll("\\D+", ""));
- // TODO: 2024/5/4 銆愬墠缃�戦渶瑕侀�氳繃pid鑾峰彇妫�楠屽崟褰撳墠璇曢獙瀹ゆ墍鏈夐」鐩槸鍚︽湁妫�楠岀粨鏋滃悗杩涜鍒ゆ柇妫�楠屽崟鏄惁鏇存敼鎴愨�滃凡妫�鈥濈姸鎬侊紱鍓嶇疆瀹屾垚鍚庡彲鑳戒細瀵艰嚧澶嶆牳鎺ュ彛鍒ゆ柇鏄惁浜х敓鎶ュ憡鐨勯�昏緫閿欒
-// InsProduct insProduct = insProductMapper.selectById(pId);
-// insSampleMapper.selectList(Wrappers.<>)
+ 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()).eq(InsProduct::getState, 1));
+ 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();
@@ -272,13 +290,13 @@
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();
- // TODO: 2024/5/5 銆愬悗缃�戞姤鍛婃槸鍚︾敓鎴愮殑鍒ゆ柇鍙兘浼氬洜涓哄墠缃搷浣滃鑷存案杩滃垽鏂笉閫氳繃
if (count == insOrderStates.size() && num == 5) {
InsOrder insOrder = insOrderMapper.selectById(orderId);
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<>();
@@ -388,7 +406,6 @@
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);
TextRenderData textRenderData = new TextRenderData();
@@ -474,6 +491,9 @@
} 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")+""));
@@ -509,6 +529,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);
@@ -536,7 +564,10 @@
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());
@@ -554,19 +585,21 @@
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);
@@ -578,6 +611,10 @@
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 = insReport.getCode().replace("/", "") + ".docx";
@@ -587,6 +624,67 @@
// 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++) {
+ if (v.get("ec") > v.get("sc")) {
+ 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);
}
@@ -619,18 +717,30 @@
}
@Override
- public int submitPlan(Integer orderId, String laboratory) {
+ public int submitPlan(Integer orderId, String laboratory, Integer verifyUser) {
List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId).select(InsSample::getId));
List<Integer> ids = insSamples.stream().map(a -> a.getId()).collect(Collectors.toList());
List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, ids).eq(InsProduct::getSonLaboratory, laboratory).eq(InsProduct::getState, 1).isNull(InsProduct::getInsResult));
if (insProducts.size() > 0) {
String str = "";
for (InsProduct product : insProducts) {
- str += product.getInspectionItem() + product.getInspectionItemSubclass() + "锛�";
+ str += product.getInspectionItem() + " " + product.getInspectionItemSubclass() + "锛�";
}
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));
+ insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, orderId).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, LocalDateTime.now()).set(InsOrderState::getInsState, 3).set(InsOrderState::getVerifyUser, verifyUser));
+ Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
+ InformationNotification info = new InformationNotification();
+ info.setCreateUser(insProductMapper.selectUserById(userId).get("name"));
+ info.setMessageType("2");
+ info.setTheme("澶嶆牳閫氱煡");
+ info.setContent("鎮ㄦ湁涓�鏉℃楠屼换鍔″緟澶嶆牳娑堟伅");
+ info.setSenderId(userId);
+ info.setConsigneeId(verifyUser);
+ info.setViewStatus(false);
+ info.setJumpPath("b1-inspect-order-plan");
+ informationNotificationService.addInformationNotification(info);
+ upPlanUser(userId, orderId);
return 1;
}
--
Gitblit v1.9.3