From 9f6292334cf2634772b8ef147255f8d207fde15f Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期三, 02 四月 2025 14:30:30 +0800
Subject: [PATCH] 标准库功能修改备份开发
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 37 ++++++++++++++++++-------------------
1 files changed, 18 insertions(+), 19 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 cab07f0..5e47ddc 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
@@ -99,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
@@ -229,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;
@@ -781,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);
}
}
--
Gitblit v1.9.3