From eb1a57285bb3468a4efe051781b8cc7a13ec23c6 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 14 五月 2024 14:15:06 +0800
Subject: [PATCH] 部分调整
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 9 +++------
1 files changed, 3 insertions(+), 6 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 84b4fc7..cb1ce57 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
@@ -30,7 +30,6 @@
import com.yuanchu.mom.service.InsOrderPlanService;
import com.yuanchu.mom.service.InsOrderService;
import com.yuanchu.mom.service.StandardTemplateService;
-import com.yuanchu.mom.utils.GiveCode;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.utils.MatrixToImageWriter;
import com.yuanchu.mom.utils.QueryWrappers;
@@ -57,7 +56,6 @@
* 妫�楠屼换鍔�-涓氬姟瀹炵幇灞�
*/
@Service
-//@AllArgsConstructor
public class InsOrderPlanServiceImpl extends ServiceImpl<InsOrderMapper, InsOrder> implements InsOrderPlanService {
@Resource
@@ -82,9 +80,6 @@
@Value("${twoCode}")
private String twoCode;
-
- @Resource
- private GiveCode giveCode;
@Resource
private InsReportMapper insReportMapper;
@@ -526,7 +521,6 @@
}
TableRenderData tableRenderData = new TableRenderData();
tableRenderData.setRows(rows);
- System.out.println(rows.size());
TableStyle tableStyle = new TableStyle();
tableStyle.setColWidths(new int[]{650,1600,2000,750,2800,1100,1100});
tableStyle.setWidth("10000");
@@ -589,6 +583,7 @@
String finalModelStr = modelStr;
String sampleEn = insSampleMapper.getSampleEn(insOrder.getSample());
String orderType = insOrderMapper.getEnumLabelByValue(insOrder.getOrderType());
+ String formType = insOrderMapper.getEnumLabelByValue(insOrder.getFormType());
ConfigureBuilder builder = Configure.builder();
builder.useSpringEL(true);
List<Map<String, String>> finalDeviceList = deviceList;
@@ -626,6 +621,8 @@
put("getTimeEn", monthNames[insOrder.getExamineTime().getMonthValue() - 1] + " " + insOrder.getExamineTime().getDayOfMonth() + ", " + insOrder.getExamineTime().getYear());
put("seal1", null);
put("seal2", null);
+ put("formTypeCh", formType);
+ put("formTypeEn", insOrder.getFormType());
}});
try {
String name = insReport.getCode().replace("/", "") + ".docx";
--
Gitblit v1.9.3