From 46cbb47dcc47099b9a29e8006f14af63f678c7b0 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 24 四月 2026 11:25:44 +0800
Subject: [PATCH] 标准库：查看新增和更新人信息
---
basic-server/src/main/java/com/ruoyi/basic/dto/LaboratoryDto.java | 2 +
basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java | 2 +
basic-server/src/main/resources/mapper/StandardTreeMapper.xml | 26 ++++++++++++-
basic-server/src/main/java/com/ruoyi/basic/dto/SampleDto.java | 2 +
basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java | 3 +
basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java | 6 +++
basic-server/src/main/java/com/ruoyi/basic/vo/StandardTreeVO.java | 22 +++++++++++
basic-server/src/main/java/com/ruoyi/basic/dto/FactoryDto.java | 2 +
basic-server/src/main/java/com/ruoyi/basic/dto/SampleTypeDto.java | 2 +
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java | 28 ++++++--------
basic-server/src/main/java/com/ruoyi/basic/dto/ModelDto.java | 1
11 files changed, 78 insertions(+), 18 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
index 5a7a552..75f13d9 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
@@ -42,6 +42,12 @@
return Result.success(standardTreeService.selectStandardTreeList());
}
+ @ApiOperation(value = "鏍规嵁id鑾峰彇鏍囧噯鏍�")
+ @GetMapping("/selectStandardTreeById/{standardTreeId}")
+ public Result selectStandardTreeById(@PathVariable(value = "standardTreeId") Integer standardTreeId) {
+ return Result.success(standardTreeService.selectStandardTreeById(standardTreeId));
+ }
+
@ApiOperation(value = "鑾峰彇鏍囧噯鏍�(妫�楠屼笅鍗�)")
@GetMapping("/selectStandardTreeList2")
public Result selectStandardTreeList2() {
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/FactoryDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/FactoryDto.java
index 612bcf8..314c185 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/FactoryDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/FactoryDto.java
@@ -13,6 +13,8 @@
private String value;
+ private Integer standardTreeId;
+
private List<LaboratoryDto> children;
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/LaboratoryDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/LaboratoryDto.java
index e3f000c..83b1ea5 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/LaboratoryDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/LaboratoryDto.java
@@ -13,6 +13,8 @@
private String value;
+ private Integer standardTreeId;
+
private List<SampleTypeDto> children;
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/ModelDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/ModelDto.java
index 5f8321e..14e1bc7 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/ModelDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/ModelDto.java
@@ -11,5 +11,6 @@
private String value;
+ private Integer standardTreeId;
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/SampleDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/SampleDto.java
index 886c9f7..cdeabd3 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/SampleDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/SampleDto.java
@@ -14,6 +14,8 @@
private String value;
+ private Integer standardTreeId;
+
@ApiModelProperty("闆朵欢鍙�")
private String partNo;
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..9a227d7 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
@@ -12,6 +12,8 @@
// 妫�娴嬪璞d
private Integer sampleTypeId;
+ private Integer standardTreeId;
+
// 妫�娴嬪璞℃帓搴�
private Integer sort;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java
index 150dff8..93068d4 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java
@@ -9,6 +9,7 @@
import com.ruoyi.basic.pojo.StandardMethodList;
import com.ruoyi.basic.pojo.StandardProductList;
import com.ruoyi.basic.pojo.StandardTree;
+import com.ruoyi.basic.vo.StandardTreeVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -104,6 +105,7 @@
*/
List<IfsInventoryQuantitySupplierDto> getIfsByIds(@Param("ifsIds") List<String> ifsIds);
+ StandardTreeVO selectStandardTreeById(@Param("standardTreeId") Integer standardTreeId);
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java b/basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java
index 4083e8c..6f77b0f 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java
@@ -4,6 +4,7 @@
import com.ruoyi.basic.dto.FactoryDto;
import com.ruoyi.basic.dto.SampleTypeDto;
import com.ruoyi.basic.pojo.StandardTree;
+import com.ruoyi.basic.vo.StandardTreeVO;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -35,4 +36,6 @@
boolean updateTreeSort(List<FactoryDto> list);
int updateStandardTree(StandardTree standardTree);
+
+ StandardTreeVO selectStandardTreeById(Integer standardTreeId);
}
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 51bd971..25921b1 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
@@ -19,12 +19,14 @@
import com.ruoyi.basic.service.StandardProductListService;
import com.ruoyi.basic.service.StandardTreeService;
import com.ruoyi.basic.service.StructureTestObjectService;
+import com.ruoyi.basic.vo.StandardTreeVO;
import com.ruoyi.common.exception.base.BaseException;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.List;
import java.util.Map;
@@ -53,12 +55,9 @@
List<FactoryDto> factoryDtos = standardTreeMapper.selectStandardTreeList();
for (FactoryDto factoryDto : factoryDtos) {
for (LaboratoryDto laboratoryDto : factoryDto.getChildren()) {
- laboratoryDto.getChildren().sort((o1, o2) -> (o1.getSort() == null ? 0 : o1.getSort())
- - (o2.getSort() == null ? 0 : o2.getSort()));
+ laboratoryDto.getChildren().sort(Comparator.comparingInt(o -> (o.getSort() == null ? 0 : o.getSort())));
for (SampleTypeDto sampleTypeDto : laboratoryDto.getChildren()) {
-// if (sampleTypeDto.getChildren().size() == 0) {
sampleTypeDto.getChildren().addAll(standardTreeMapper.getStandardTree3(sampleTypeDto.getValue()));
-// }
}
}
}
@@ -184,18 +183,15 @@
}
// 淇敼鏍囧噯鏁版楠岄」鐩�
- LambdaUpdateWrapper<StandardTree> wrapper = Wrappers.<StandardTree>lambdaUpdate()
- .eq(StandardTree::getFactory, standardTree.getFactory())
- .eq(StandardTree::getLaboratory, standardTree.getLaboratory())
- .eq(StandardTree::getSampleType, standardTree.getSampleType())
- .eq(StandardTree::getModel, standardTree.getOldModel())
- .set(StandardTree::getModel, standardTree.getModel());
- if (StringUtils.isNotBlank(standardTree.getSample()) && !standardTree.getSample().equals("null")) {
- wrapper.eq(StandardTree::getSample, standardTree.getSample());
- } else {
- wrapper.isNull(StandardTree::getSample);
- }
- return standardTreeMapper.update(null, wrapper);
+ StandardTree updateEntity = new StandardTree();
+ updateEntity.setId(standardTree.getId());
+ updateEntity.setModel(standardTree.getModel());
+ return standardTreeMapper.updateById(updateEntity);
+ }
+
+ @Override
+ public StandardTreeVO selectStandardTreeById(Integer standardTreeId) {
+ return standardTreeMapper.selectStandardTreeById(standardTreeId);
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/vo/StandardTreeVO.java b/basic-server/src/main/java/com/ruoyi/basic/vo/StandardTreeVO.java
new file mode 100644
index 0000000..8812df4
--- /dev/null
+++ b/basic-server/src/main/java/com/ruoyi/basic/vo/StandardTreeVO.java
@@ -0,0 +1,22 @@
+package com.ruoyi.basic.vo;
+
+import com.ruoyi.basic.pojo.StandardTree;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class StandardTreeVO extends StandardTree {
+
+ /**
+ * 鍒涘缓浜哄悕绉�
+ */
+ @ApiModelProperty("鍒涘缓浜哄悕绉�")
+ private String createUserName;
+
+ /**
+ * 鏇存柊浜哄悕绉�
+ */
+ @ApiModelProperty("鏇存柊浜哄悕绉�")
+ private String updateUserName;
+
+}
diff --git a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
index a3a7abf..95a39f6 100644
--- a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -49,6 +49,7 @@
<resultMap id="ModelDto" type="com.ruoyi.basic.dto.ModelDto">
<result property="label" column="model"/>
<result property="value" column="model"/>
+ <result property="standardTreeId" column="standard_tree_id"/>
</resultMap>
<sql id="selectStandardTree">
@@ -99,7 +100,8 @@
sto.id sample_type_id,
sto.sort,
sto.specimen_name_en sample_type_en,
- p.name_en sample_en
+ p.name_en sample_en,
+ st.id AS standard_tree_id
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
@@ -386,7 +388,8 @@
<select id="getStandardTree3" resultType="com.ruoyi.basic.dto.SampleDto">
select model label,
- model value
+ model value,
+ id AS standard_tree_id
from standard_tree
where sample_type = #{sampleType}
and sample is null
@@ -400,4 +403,23 @@
#{id}
</foreach>
</select>
+ <select id="selectStandardTreeById" resultType="com.ruoyi.basic.vo.StandardTreeVO">
+ select
+ st.id,
+ st.factory,
+ st.laboratory,
+ st.sample_type,
+ st.sample,
+ st.model,
+ st.create_user,
+ st.create_time,
+ st.update_user,
+ st.update_time,
+ u1.name AS create_user_name,
+ u2.name AS update_user_name
+ from standard_tree st
+ left join user u1 on st.create_user = u1.id
+ left join user u2 on st.update_user = u2.id
+ where st.id = #{standardTreeId}
+ </select>
</mapper>
--
Gitblit v1.9.3