From 0ed3d6d60ece4effae6072556165a0aad9fe8f9f Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 15 八月 2025 13:21:43 +0800
Subject: [PATCH] 如果其他检验不检也可以生成报告结束试验跳过
---
inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java | 1 +
inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml | 3 +++
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 4 ++--
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderUserMapper.java | 2 +-
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderUserMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderUserMapper.java
index 0a37613..cfca9a3 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderUserMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderUserMapper.java
@@ -29,5 +29,5 @@
IPage<InsOrderUserDto> selectInsOrderUserDto2(@Param("ids") List<Integer> ids, Page page);
//鏍规嵁璁㈠崟id鏌ヨ鍑洪渶瑕佺敓鎴愭姤鍛婄殑鎵�鏈夋牱鍝佺殑鎵�鏈夋暟鎹�
- List<InsReportDto1> selectInsReportDto1(@Param("id") Integer id);
+ List<InsReportDto1> selectInsReportDto1(@Param("id") Integer id,@Param("sampleId") Integer sampleId);
}
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 3d0c999..0a53a10 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
@@ -1239,7 +1239,7 @@
.set(InsOrderState::getVerifyTell, tell)
.set(InsOrderState::getVerifyUser, userId));
/*鐢熸垚瀵瑰簲鐨勬楠屾姤鍛�*/
- List<InsReportDto1> insReportDto1s=insOrderUserMapper.selectInsReportDto1(insOrder.getId());
+ List<InsReportDto1> insReportDto1s=insOrderUserMapper.selectInsReportDto1(insOrder.getId(),null);
createReport(insOrder.getId(),insReportDto1s);
break;
}
@@ -1339,7 +1339,7 @@
.set(InsOrderState::getVerifyUser, userId));
}
/*鐢熸垚瀵瑰簲鐨勬楠屾姤鍛�*/
- List<InsReportDto1> insReportDto1s=insOrderUserMapper.selectInsReportDto1(insOrder.getId());
+ List<InsReportDto1> insReportDto1s=insOrderUserMapper.selectInsReportDto1(insOrder.getId(),sampleId);
createReport(insOrder.getId(),insReportDto1s);
break;
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java b/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
index 65e2ac2..463e954 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
@@ -2590,6 +2590,7 @@
SampleProductDto insSample = insSampleMapper.selectSampleProductListByOrderId(insReportDto1.getSampleId());
SampleProductDto s = insSample;
List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+ .isNotNull(InsProduct::getInsResult)
.eq(InsProduct::getInsSampleId, insSample.getId())
.eq(InsProduct::getState, 1));
/*棣栭〉*/
diff --git a/inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml
index 85237a3..3a7093a 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml
@@ -66,6 +66,9 @@
left join ins_order_state ios on isa.id = ios.ins_sample_id
left join ins_order_user iou on ios.id = iou.ins_order_state_id
where isa.ins_order_id=#{id}
+ <if test="sampleId != null">
+ and isa.id=#{sampleId}
+ </if>
order by isa.id,ios.laboratory
</select>
</mapper>
--
Gitblit v1.9.3