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/pojo/InsSample.java | 2 +-
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java | 3 ++-
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 7 +++++--
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
index 79e3f49..c564514 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
@@ -412,8 +412,9 @@
// 濡傛灉鏈粦瀹�
if(!existFlag){
BeanUtils.copyProperties(structureItemParameter, addStandProductList);
+ addStandProductList.setTell(structureItemParameter.getAskTell());
addStandProductList.setStructureItemParameterId(structureItemParameter.getId());
-
+ addStandProductList.setManHour(Objects.toString(structureItemParameter.getManHour(), ""));
}
addStandProductList.setId(addStandProductList.getId() != null ? addStandProductList.getId() : IdWorker.getId());
batchInsertStandardProductListArray.add(addStandProductList);
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsSample.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsSample.java
index f3657e4..810fbd5 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsSample.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsSample.java
@@ -86,7 +86,7 @@
*/
private String remark;
- private Integer standardMethodListId;
+ private String standardMethodListId;
@ApiModelProperty("鏍峰搧鍗曚綅")
private String unit;
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 5e47ddc..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
@@ -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();
}
--
Gitblit v1.9.3