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/InsReportServiceImpl.java | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java
index 81e9fb9..3257917 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java
@@ -253,14 +253,6 @@
ProcessReport processReport = new ProcessReport();
processReport.setInsReportCode(insReport.getCode());
processReportMapper.insert(processReport);
- /*妫�楠屽崟缁撴潫*/
- List<InsReport> insReports = insReportMapper.selectList(Wrappers.<InsReport>lambdaQuery().eq(InsReport::getInsOrderId, insReport.getInsOrderId()));
- List<Integer> list = insReports.stream().map(InsReport::getIsRatify).distinct().collect(Collectors.toList());
- if (list.size() == 1 && list.contains(1)) {
- InsOrder insOrder = insOrderMapper.selectById(insReport.getInsOrderId());
- insOrder.setState(4);
- insOrderMapper.updateById(insOrder);
- }
return 0;
}
@@ -390,14 +382,16 @@
//鏌ュ嚭璇ヨ鍗曚笅姣忎釜绔欑偣涓嬬殑妫�楠屾鏁�
@Override
- public List<InsOrderStateDto> getInsOrderStateCount(Integer id, Integer sampleId) {
+ public List<InsOrderStateDto> getInsOrderStateCount(Integer id) {
List<InsOrderStateDto> insOrderStateDtos = new ArrayList<>();
- InsSample insSample = insSampleMapper.selectById(sampleId);
- InsOrderStateDto insOrderStateDto = new InsOrderStateDto();
- insOrderStateDto.setInsSample(insSample);
- List<InsOrderState> insOrderStates = insOrderStateMapper.getInsOrderStateCount(id, insSample.getId());
- insOrderStateDto.setInsOrderStates(insOrderStates);
- insOrderStateDtos.add(insOrderStateDto);
+ List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId,id));
+ for (InsSample insSample : insSamples) {
+ InsOrderStateDto insOrderStateDto = new InsOrderStateDto();
+ insOrderStateDto.setInsSample(insSample);
+ List<InsOrderState> insOrderStates = insOrderStateMapper.getInsOrderStateCount(id, insSample.getId());
+ insOrderStateDto.setInsOrderStates(insOrderStates);
+ insOrderStateDtos.add(insOrderStateDto);
+ }
return insOrderStateDtos;
}
--
Gitblit v1.9.3