From 7841e82797b8553b62004be38801091273a2d952 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期三, 09 四月 2025 17:46:23 +0800
Subject: [PATCH] 成品检验查询功能开发
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 5 ++++-
inspect-server/src/main/java/com/ruoyi/inspect/dto/InsOrderPlanQueryDto.java | 5 +++++
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 2 ++
3 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsOrderPlanQueryDto.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsOrderPlanQueryDto.java
index df5168a..4248837 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsOrderPlanQueryDto.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsOrderPlanQueryDto.java
@@ -23,4 +23,9 @@
* 鏄惁涓哄彧鏌ョ湅鑷繁
*/
private Boolean viewMySelfFlag;
+
+ /**
+ * 鏄惁澶嶆牳
+ */
+ private Integer isCheck;
}
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 28effb2..c4a5521 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
@@ -164,6 +164,8 @@
insOrderPlanQueryDto.setViewMySelfFlag(true);
insOrderPlanDTO.setUserId(null);
}
+ insOrderPlanQueryDto.setIsCheck(insOrderPlanDTO.getIsCheck());
+ insOrderPlanDTO.setIsCheck(null);
insOrderPlanQueryDto.setUserId(SecurityUtils.getUserId().intValue());
IPage<InsOrderPlanVO> insOrderPage = insSampleMapper.findInsSampleAndOrder(page,
QueryWrappers.queryWrappers(insOrderPlanDTO),insOrderPlanQueryDto);
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index a918f7b..3f05f0f 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -78,6 +78,7 @@
<result property="radius" column="radius"/>
<result property="cableTag" column="cable_tag"/>
<result property="structureItemParameterId" column="structure_item_parameter_id"/>
+ <result property="checkUserId" column="check_user_id"/>
<collection property="insProductResult" resultMap="insProductResult"/>
</resultMap>
@@ -159,7 +160,8 @@
ip.dic,
ip.sort,
ip.cable_tag,
- ip.structure_item_parameter_id
+ ip.structure_item_parameter_id,
+ ip.check_user_id
</sql>
@@ -515,6 +517,7 @@
select <include refid="getInsProducSql"/>
from ins_product ip
left join ins_product_result ipr on ip.id = ipr.ins_product_id
+ left join user ur ON ip.check_user_id = ur.id
where ins_sample_id = #{id}
and state = 1
and ip.son_laboratory = #{laboratory}
--
Gitblit v1.9.3