From 9f1c4e5ef6f82e111400fe2f292453583aa2155e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 25 三月 2025 12:12:47 +0800
Subject: [PATCH] 报告分页查询新增委托编号和样品编号
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 5 +++--
inspect-server/src/main/java/com/yuanchu/mom/dto/ReportPageDto.java | 2 ++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/ReportPageDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/ReportPageDto.java
index def5e88..19a1082 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/dto/ReportPageDto.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/ReportPageDto.java
@@ -11,9 +11,11 @@
public class ReportPageDto extends InsReport implements Serializable {
@ApiModelProperty(value = "濮旀墭缂栧彿")
+ @ValueTableShow(value = 2,name = "濮旀墭缂栧彿")
private String entrustCode;
@ApiModelProperty(value = "鏍峰搧缂栧彿")
+ @ValueTableShow(value = 2,name = "鏍峰搧缂栧彿")
private String sampleCode;
@ValueTableShow(value = 3,name = "鎻愪氦浜�")
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index 37fe4d5..87074d2 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -1199,8 +1199,9 @@
.set(InsOrderState::getInsState, 5)
.set(InsOrderState::getVerifyTell, tell)
.set(InsOrderState::getVerifyUser, userId));
- //濡傛灉璁㈠崟绫诲瀷鏄師鐞嗘牱鏈�,鍒欒璁㈠崟鐩存帴闂幆
- List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, insSample.getInsOrderId()));
+ //缁撴潫涔嬪悗灏嗚璁㈠崟鐨勬墍鏈夋牱鍝佸叏閮ㄥ嚭搴�
+ List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery()
+ .eq(InsSample::getInsOrderId, insSample.getInsOrderId()));
for (InsSample sample : insSamples) {
try{
outInsOrderState(laboratory, sample.getSampleCode(), insOrder.getEntrustCode());
--
Gitblit v1.9.3