From df3f154f020076d8b0075b92626f22e970f63702 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 25 二月 2025 16:14:51 +0800
Subject: [PATCH] 设施和环境条件代码迁移
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 41 ++++++++++++++++++-----------------------
1 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
index 1f39ef1..ca01fca 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
@@ -30,15 +30,13 @@
import com.ruoyi.basic.pojo.IfsInventoryQuantity;
import com.ruoyi.basic.pojo.StandardTemplate;
import com.ruoyi.basic.service.StandardTemplateService;
+import com.ruoyi.common.constant.DictDataConstants;
import com.ruoyi.common.constant.InsOrderTypeConstants;
import com.ruoyi.common.core.domain.entity.Custom;
import com.ruoyi.common.core.domain.entity.InformationNotification;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.entity.User;
-import com.ruoyi.common.utils.DateImageUtil;
-import com.ruoyi.common.utils.QueryWrappers;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.WxCpUtils;
+import com.ruoyi.common.utils.*;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.dto.*;
import com.ruoyi.inspect.mapper.*;
@@ -634,10 +632,7 @@
}
String thing = null;
if (product.getTemplateId() != null && set.add(product.getTemplateId())) {
- long begin = System.currentTimeMillis();
thing = standardTemplateService.getStandTempThingById(product.getTemplateId());
- long end = System.currentTimeMillis();
- System.out.println("=========鏃堕棿====" + (end - begin));
}
if (StrUtil.isNotEmpty(thing)) {
JSONObject sheet = JSON.parseObject(JSON.toJSONString(JSON.parseArray(JSON.toJSONString(JSON.parseObject(thing).get("data"))).get(0)));
@@ -648,10 +643,7 @@
style.put("columnlen", config.get("columnlen"));
product.setTemplate(cellData);
product.setStyle(style);
- long begin = System.currentTimeMillis();
product.setTemplateName(standardTemplateService.getStandTempNameById(product.getTemplateId()));
- long end = System.currentTimeMillis();
- System.out.println("=========鏃堕棿22222====" + (end - begin));
}
}
}
@@ -752,9 +744,6 @@
}
return null;
});
- // todo: 鍒犻櫎鏁伴噰閲囬泦娆℃暟
-// String key = "frequency" + ":" + entrustCode + ":*";
-// RedisUtil.delsLike(key);
// 鎻愪氦鐢熸垚鎶ュ憡
this.generateReport(orderId);
@@ -798,8 +787,7 @@
}
}
-
- // todo: 鎴愬搧鎶芥牱娣诲姞鍚堟牸鐘舵��
+ // 鎴愬搧鎶芥牱娣诲姞鍚堟牸鐘舵��
// 鍒ゆ柇鏄惁鏈夋娊鏍蜂俊鎭�
if (order.getQuarterItemId() != null) {
// 鍒ゆ柇鏄惁鏈変笉鍚堟牸
@@ -1527,9 +1515,9 @@
standardMethod2.append("銆�").append(s);
}
standardMethod2.replace(0, 1, "");
- // todo: 妫�娴嬬被鍨�
-// List<SysDictData> sysDictData = iSysDictTypeService.selectDictDataByName("");
- String orderType = null;
+
+ // 鏍峰搧绫诲瀷
+ String orderType = iSysDictTypeService.selectLabelByDict(DictDataConstants.CHECK_TYPE, insOrder.getOrderType());
List<RowRenderData> rows = new ArrayList<>();
List<TextRenderData> text = new ArrayList<>();
@@ -2288,17 +2276,23 @@
String modelStr = CollUtil.join(models, "\n");
String finalModelStr = modelStr;
- // todo: 鏌ヨ瀛楀吀
+ // 妫�娴嬬被鍨�
String orderType = null;
- String formType = null;
+ orderType = iSysDictTypeService.selectLabelByDict(DictDataConstants.CHECK_TYPE, insOrder.getOrderType());
+ // 鍒ゆ柇绗竴涓瓧鍏告槸鍚︿负绌�
+ if (StringUtils.isBlank(orderType)) {
+ orderType = iSysDictTypeService.selectLabelByDict(DictDataConstants.CHECK_TYPE1, insOrder.getOrderType());
+ }
+
+ // 鏉ユ牱鏂瑰紡
+ String formType = iSysDictTypeService.selectLabelByDict(DictDataConstants.FORM_TYPE, insOrder.getFormType());
// 鏍峰搧鐘舵��
- String sampleStatus = null;
+ String sampleStatus = iSysDictTypeService.selectLabelByDict(DictDataConstants.SAMPLE_STATUS_LIST, insOrder.getSampleStatus());;
ConfigureBuilder builder = Configure.builder();
builder.useSpringEL(true);
List<Map<String, String>> finalDeviceList = deviceList;
- Integer userId = insSampleUserMapper.selectOne(Wrappers.<InsSampleUser>lambdaQuery().eq(InsSampleUser::getInsSampleId, orderId).last("limit 1")).getUserId();
Custom custom = customMapper.selectById(insOrder.getCompanyId());
// 鏌ヨ鍒ゆ柇鏄惁鏈変笉鍒ゅ畾椤圭洰,鍜屽叏閮芥槸鍒ゅ畾椤�
@@ -2391,6 +2385,7 @@
String finalResultCh = resultCh;
String finalResultEn = resultEn;
+ String finalOrderType = orderType;
InputStream inputStream = this.getClass().getResourceAsStream("/static/report-template.docx");
XWPFTemplate template = XWPFTemplate.compile(inputStream, builder.build()).render(
new HashMap<String, Object>() {{
@@ -2415,7 +2410,7 @@
put("images", images);
put("examineUrl", null);
put("ratifyUrl", null);
- put("orderType", orderType);
+ put("orderType", finalOrderType);
put("getTime", finalSendTime.format(DateTimeFormatter.ofPattern("yyyy骞碝M鏈坉d鏃�")));
put("getTimeEn", monthNames[finalSendTime.getMonthValue() - 1] + " " + finalSendTime.format(DateTimeFormatter.ofPattern("dd, yyyy")));
put("seal1", null);
--
Gitblit v1.9.3