From de0494d7a6f99f50fa33b9487dd2ffefca82e8b6 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 08 四月 2025 17:44:47 +0800
Subject: [PATCH] 标准库功能修改
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 53 ++++++++++++++++++++++++++++-------------------------
1 files changed, 28 insertions(+), 25 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 69d71dc..39879ab 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,6 +30,7 @@
import com.ruoyi.basic.service.StandardTemplateService;
import com.ruoyi.common.constant.DictDataConstants;
import com.ruoyi.common.constant.InsOrderTypeConstants;
+import com.ruoyi.common.constant.MenuJumpPathConstants;
import com.ruoyi.common.core.domain.entity.Custom;
import com.ruoyi.common.core.domain.entity.InformationNotification;
import com.ruoyi.common.core.domain.entity.User;
@@ -55,6 +56,7 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.xwpf.usermodel.*;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.ClassPathResource;
import org.springframework.mock.web.MockMultipartFile;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Service;
@@ -97,14 +99,9 @@
private InsOrderStateMapper insOrderStateMapper;
@Resource
private InsProductMapper insProductMapper;
- @Resource
- private ShiftTimeMapper shiftTimeMapper;
- @Resource
- private PerformanceShiftMapper performanceShiftMapper;
+
@Value("${wordUrl}")
private String wordUrl;
- @Value("${twoCode}")
- private String twoCode;
@Resource
private InsReportMapper insReportMapper;
@Resource
@@ -141,8 +138,7 @@
private InsOrderFactoryVerifyMapper insOrderFactoryVerifyMapper;
@Resource
private InsOrderFactoryVerifyItemService insOrderFactoryVerifyItemService;
- @Value("${file.licenseUrl}")
- private String licenseUrl;
+
@Resource
private SpotCheckQuarterItemMapper spotCheckQuarterItemMapper;
@Resource
@@ -228,17 +224,19 @@
// 鏌ヨ鍘傚瀵嗗害
String supplierDensity = "";
- SampleProductDto sampleProductDto = list.get(0);
+ if (CollectionUtils.isNotEmpty(list)) {
+ SampleProductDto sampleProductDto = list.get(0);
- // 鍒ゆ柇鏈夋病鏈夌粦瀹氬瀷鍙�
- String modelValue = insSampleMapper.selectSupplierDensityModel(sampleProductDto.getSample(),
- order.getProduction(),
- sampleProductDto.getModel());
- if (StringUtils.isNotBlank(modelValue)) {
- supplierDensity = modelValue;
- } else {
- supplierDensity = insSampleMapper.selectSupplierDensity(sampleProductDto.getSample(),
- order.getProduction());
+ // 鍒ゆ柇鏈夋病鏈夌粦瀹氬瀷鍙�
+ String modelValue = insSampleMapper.selectSupplierDensityModel(sampleProductDto.getSample(),
+ order.getProduction(),
+ sampleProductDto.getModel());
+ if (StringUtils.isNotBlank(modelValue)) {
+ supplierDensity = modelValue;
+ } else {
+ supplierDensity = insSampleMapper.selectSupplierDensity(sampleProductDto.getSample(),
+ order.getProduction());
+ }
}
map.put("supplierDensity", supplierDensity);
return map;
@@ -780,11 +778,13 @@
int count = 0;
for (InsProduct product : insProducts) {
count++;
- str += "<br/>" + count + "锛�" + product.getInspectionItem() + " " + product.getInspectionItemSubclass() + "<br/>";
-
+ str += (count != 0 ? "\n" : "") + count + "锛�" +
+ product.getInspectionItemClass() + " " +
+ product.getInspectionItem() + " " +
+ product.getInspectionItemSubclass();
}
if (ObjectUtils.isNotEmpty(str)) {
- throw new ErrorException("<strong>瀛樺湪寰呮楠岀殑椤圭洰锛�</strong><br/>" + str);
+ throw new ErrorException("瀛樺湪寰呮楠岀殑椤圭洰锛�" + str);
}
}
@@ -810,7 +810,7 @@
info.setSenderId(userId);
info.setConsigneeId(verifyUser);
info.setViewStatus(false);
- info.setJumpPath("b1-inspect-orderPlan-review");
+ info.setJumpPath(MenuJumpPathConstants.INSPECTION_REVIEW);
informationNotificationService.addInformationNotification(info);
// 6.澶嶆牳浜�--鏂板妫�楠屽崟鐩稿叧璐熻矗浜�
@@ -1541,7 +1541,8 @@
// 妫�娴嬩緷鎹�
Set<String> standardMethod = new HashSet<>();
StringBuilder standardMethod2 = new StringBuilder();
- standardMethod.add(baseMapper.getStandardMethodCode(insSample.getStandardMethodListId()));
+ // TODO 妫�楠岀殑瀵硅薄鐨勬楠屾爣鍑嗙敱涓�涓涓� 鏁版嵁绫诲瀷鐢眎nt鍙樺瓧绗︿覆 闇�瑕侀噸鍐欏啓杩欏潡閫昏緫
+// standardMethod.add(baseMapper.getStandardMethodCode(insSample.getStandardMethodListId()));
for (String s : standardMethod) {
standardMethod2.append("銆�").append(s);
}
@@ -2085,7 +2086,9 @@
samples.forEach(a -> {
Map<Integer, String> map2 = new HashMap<>();
models.add(a.getModel());
- String standardMethodCode = baseMapper.getStandardMethodCode(a.getStandardMethodListId());
+ // TODO 妫�楠岀殑瀵硅薄鐨勬楠屾爣鍑嗙敱涓�涓涓� 鏁版嵁绫诲瀷鐢眎nt鍙樺瓧绗︿覆 闇�瑕侀噸鍐欏啓杩欏潡閫昏緫
+// String standardMethodCode = baseMapper.getStandardMethodCode(a.getStandardMethodListId());
+ String standardMethodCode = "";
if (StrUtil.isNotBlank(a.getSpecialStandardMethod())) {
standardMethodCode = standardMethodCode + "+" + a.getSpecialStandardMethod();
}
@@ -4227,7 +4230,7 @@
FileOutputStream os = null;
try {
//鍑瘉 涓嶇劧鍒囨崲鍚庢湁姘村嵃
- InputStream is = Files.newInputStream(new File(licenseUrl).toPath());
+ InputStream is = new ClassPathResource("/lib/license.xml").getInputStream();
License license = new License();
license.setLicense(is);
if (!license.getIsLicensed()) {
--
Gitblit v1.9.3