From ba5bd31ecf829d2b462bd3f62b566828b347a89a Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 08 四月 2025 13:36:18 +0800
Subject: [PATCH] Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-after into radio_frequency
---
basic-server/src/main/resources/mapper/StandardTreeMapper.xml | 13 +++++++++++--
basic-server/src/main/java/com/ruoyi/basic/dto/TestItemDto.java | 2 ++
basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml | 2 ++
basic-server/src/main/java/com/ruoyi/basic/dto/SampleTypeDto.java | 4 ++++
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java | 2 +-
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java | 4 ++++
inspect-server/src/main/java/com/ruoyi/inspect/dto/RawMaterialStandardTreeDto.java | 6 ++++++
7 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/SampleTypeDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/SampleTypeDto.java
index 0ae8087..35193a6 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/SampleTypeDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/SampleTypeDto.java
@@ -24,6 +24,10 @@
// 瀵硅薄鑻辨枃
private String sampleTypeEn;
+ private String workShopName;
+
+ private Integer workShopId;
+
private List<SampleDto> children;
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/TestItemDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/TestItemDto.java
index 4363a1a..22a588f 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/TestItemDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/TestItemDto.java
@@ -11,6 +11,8 @@
private String name;
+ private String labelName;
+
private List<ProductDto> children;
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
index ffab8ea..d8f0dea 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
@@ -296,7 +296,7 @@
// 瀵规娴嬪璞″厛鎸夌収瀹為獙瀹ゅ湪鎸夌収妫�鏌ュ璞＄被鍒垎绫�
List<BasicTreeDto> testProjectBasicTreeList = structureTestObjectList.stream().map(structureTestObject -> {
BasicTreeDto basicTreeDto = new BasicTreeDto();
- basicTreeDto.setValue(structureTestObject.getSpecimenName() + "(" + structureTestObject.getObjectType() + ")");
+ basicTreeDto.setValue(structureTestObject.getSpecimenName());
basicTreeDto.setLabel(structureTestObject.getSpecimenName() + "(" + structureTestObject.getObjectType() + ")");
basicTreeDto.setLevel(BasicTreeEnums.STRUCTURE_TEST_OBJECT_TYPE.getCode());
List<BasicTreeDto> children = new ArrayList<>();
diff --git a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
index a011e82..ee3daa5 100644
--- a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -35,6 +35,8 @@
<result property="sort" column="sort"/>
<result property="partNo" column="part_no"/>
<result property="sampleTypeEn" column="sample_type_en"/>
+ <result property="workShopName" column="workShopName"/>
+ <result property="workShopId" column="workShopId"/>
<collection property="children" resultMap="SampleDto"/>
</resultMap>
@@ -99,12 +101,15 @@
sto.id sample_type_id,
sto.sort,
sto.specimen_name_en sample_type_en,
- p.name_en sample_en
+ p.name_en sample_en,
+ ws.`name` workShopName,
+ ws.id workShopId
from laboratory l
left join structure_test_object sto on sto.laboratory_id = l.id
left join product p on p.object_id = sto.id
left join standard_tree st on st.sample_type = sto.specimen_name
and st.sample = p.name
+ LEFT JOIN work_shop ws ON ws.id = sto.work_shop_id
order by l.id, CAST(sto.code AS DECIMAL), p.id, ISNULL(st.id), st.id
</select>
@@ -249,7 +254,9 @@
l.laboratory_name laboratory,
sto.specimen_name sample_type,
p.name sample,
- st.model,
+ m.model_name model,
+ ws.`name` workShopName,
+ ws.id workShopId,
CASE
WHEN p.id = (SELECT pp.product_id
FROM product_part pp
@@ -269,6 +276,8 @@
left join product p on p.object_id = sto.id
left join standard_tree st on st.sample_type = sto.specimen_name
and st.sample = p.name
+ LEFT JOIN model m ON m.product_id = p.id
+ LEFT JOIN work_shop ws ON ws.id = sto.work_shop_id
where (p.id = (select pp.product_id
from product_part pp
where pp.part_no = #{partNo})
diff --git a/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml b/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml
index 069bacb..fda176d 100644
--- a/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml
+++ b/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml
@@ -177,6 +177,7 @@
<select id="getItemTree" resultMap="itemDto">
SELECT
sto.id AS sId,
+ sto.specimen_name AS labelName,
CONCAT(sto.specimen_name, ' (', sto.object_type, ')') AS sName,
p.id AS pId,
p.name AS pName,
@@ -191,6 +192,7 @@
<resultMap id="itemDto" type="com.ruoyi.basic.dto.TestItemDto">
<result column="sId" property="id"/>
<result column="sName" property="name"/>
+ <result column="labelName" property="labelName"/>
<collection property="children" resultMap="productDto"/>
</resultMap>
<resultMap id="productDto" type="com.ruoyi.basic.dto.ProductDto">
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/dto/RawMaterialStandardTreeDto.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/RawMaterialStandardTreeDto.java
index c1aa3b1..c67e7c2 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/dto/RawMaterialStandardTreeDto.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/RawMaterialStandardTreeDto.java
@@ -32,4 +32,10 @@
@ApiModelProperty("鍨嬪彿")
private List<ModelDto> children2;
+ @ApiModelProperty("杞﹂棿鍚嶇О")
+ private String workShopName;
+
+ @ApiModelProperty("杞﹂棿id")
+ private Integer workShopId;
+
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
index 155010a..ad73f30 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
@@ -103,6 +103,8 @@
rawMaterialStandardTreeDto.setLabel(sampleTypeDto.getLabel());
rawMaterialStandardTreeDto.setValue(sampleTypeDto.getValue());
rawMaterialStandardTreeDto.setChildren1(sampleTypeDto.getChildren());
+ rawMaterialStandardTreeDto.setWorkShopName(sampleTypeDto.getWorkShopName());
+ rawMaterialStandardTreeDto.setWorkShopId(sampleTypeDto.getWorkShopId());
} else {
for (SampleDto sampleDto : sampleTypeDto.getChildren()) {
if (sampleDto.getPartNo() != null && sampleDto.getPartNo().equals(partNo)) {
@@ -115,6 +117,8 @@
rawMaterialStandardTreeDto.setLabel(sampleDto.getLabel());
rawMaterialStandardTreeDto.setValue(sampleDto.getValue());
rawMaterialStandardTreeDto.setChildren2(sampleDto.getChildren());
+ rawMaterialStandardTreeDto.setWorkShopName(sampleTypeDto.getWorkShopName());
+ rawMaterialStandardTreeDto.setWorkShopId(sampleTypeDto.getWorkShopId());
}
}
}
--
Gitblit v1.9.3