From fe6abde400c8f68c4af1807cc307c4c5cbd8547c Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期三, 26 六月 2024 11:28:36 +0800
Subject: [PATCH] 域名更换、下单找项目sql语句=变like
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 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 af1539d..3c96fb3 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
@@ -3,6 +3,7 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Console;
import cn.hutool.core.lang.UUID;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -616,7 +617,7 @@
if (p != null && v.get("ps") != null) {
String value = JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "";
if (value.equals("瑕佹眰鍊�")) {
- textRenderData.setText(p.getAsk());
+ textRenderData.setText(ObjectUtils.isNotEmpty(p.getTell()) ? p.getTell() : "");
} else if (value.equals("鍗曚綅")) {
textRenderData.setText(p.getUnit());
} else if (value.equals("缁撹")) {
@@ -649,6 +650,16 @@
textRenderData.setText(a.getSample());
} 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 {
+ textRenderData.setText(p.getInspectionItemSubclass() + "\n" + p.getInspectionItemSubclassEn());
+ }
} else {
textRenderData.setText(v.get("v") == null ? "" : v.get("v") + "");
}
@@ -885,7 +896,7 @@
cells.add(cellRenderData);
} else if (j == 1) {
//绗簩鍒�
- textRenderData.setText("鍏夌氦鑹叉爣\tScanning Number鈭�101");
+ textRenderData.setText("鍏夌氦鑹叉爣\nScanning Number鈭�101");
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
@@ -897,7 +908,7 @@
if (insProducts1.get((int) (j - 2)).getInspectionItemSubclass().equals("") || insProducts1.get((int) (j - 2)).getInspectionItemSubclass() == null) {
textRenderData.setText(insProducts1.get((int) (j - 2)).getInspectionItem() + "\n" + insProducts1.get((int) (j - 2)).getInspectionItemEn() + "鈭�" + (j + 101));
} else {
- textRenderData.setText(insProducts1.get((int) (j - 2)).getInspectionItemSubclass() + "\n" + insProducts1.get((int) (j - 2)).getInspectionItemSubclassEn());
+ textRenderData.setText(insProducts1.get((int) (j - 2)).getInspectionItemSubclass() + "\n\n" + insProducts1.get((int) (j - 2)).getInspectionItemSubclassEn());
}
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
@@ -983,18 +994,25 @@
if (CollectionUtils.isNotEmpty(insOrderFiles)) {
insOrderFiles.forEach(insOrderFile -> {
Map<String, Object> image = new HashMap<>();
- PictureRenderData pictureRenderData = Pictures.ofLocal(imgUrl + "/" + insOrderFile.getFileUrl()).sizeInCm(17,20).create();
+ PictureRenderData pictureRenderData = Pictures.ofLocal(imgUrl + "/" + insOrderFile.getFileUrl()).sizeInCm(17, 20).create();
image.put("url", pictureRenderData);
image.put("report", insReport);
images.add(image);
});
+ }
+ //濮旀墭浜哄拰鐢佃瘽瀛楁鍒ゆ柇
+ if (ObjectUtils.isEmpty(insOrder.getPrepareUser())) {
+ insOrder.setPrepareUser("/");
+ }
+ if (ObjectUtils.isEmpty(insOrder.getPhone())) {
+ insOrder.setPhone("/");
}
XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).render(
new HashMap<String, Object>() {{
put("order", insOrder);
put("report", insReport);
- put("user", user);
+ //put("user", user);
put("custom", custom);
put("sampleSize", samples.size());
put("tables", tables);
--
Gitblit v1.9.3