From d5118e985c33969e39085390e01ab534ad7f7301 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 24 三月 2025 15:05:38 +0800
Subject: [PATCH] 修改数据查看
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java | 4 ++--
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java | 16 +++++++++-------
inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java | 2 +-
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java
index 05b3d3e..17be7bb 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java
@@ -153,8 +153,8 @@
@ValueAuth
@ApiOperation(value = "鏌ュ嚭璇ヨ鍗曚笅姣忎釜鏍峰搧涓嬫瘡涓珯鐐圭殑妫�楠屾鏁�")
@GetMapping("/getInsOrderStateCount")
- public Result getInsOrderStateCount(Integer id,Integer sampleId){
- return Result.success(insReportService.getInsOrderStateCount(id,sampleId));
+ public Result getInsOrderStateCount(Integer id){
+ return Result.success(insReportService.getInsOrderStateCount(id));
}
//鍙栨秷2.26
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java
index d03c0b4..a26f141 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java
@@ -47,5 +47,5 @@
int isReport(InsReportDto insReportDto);
//鏌ュ嚭璇ヨ鍗曚笅姣忎釜鏍峰搧涓嬫瘡涓珯鐐逛笅鐨勬楠屾鏁�
- List<InsOrderStateDto> getInsOrderStateCount(Integer id,Integer sampleId);
+ List<InsOrderStateDto> getInsOrderStateCount(Integer id);
}
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 a3f54d6..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
@@ -382,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