From b2e4ff967a45951e154a55d0eafc428d68442517 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 19 十二月 2024 09:56:52 +0800
Subject: [PATCH] 查询站点的检验时长2.0
---
inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml | 6 +++++-
inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java | 7 ++-----
inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java | 8 +++++---
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderUserMapper.java | 2 +-
4 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java
index 3d0b04c..df5c991 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java
@@ -9,10 +9,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
@RestController
@AllArgsConstructor
@@ -70,7 +67,7 @@
@ValueClassify("缁熻鍥捐〃")
@ApiOperation(value = "鏌ヨ绔欑偣鐨勬楠屾椂闀�")
- @GetMapping("/timeByStation")
+ @PostMapping("/timeByStation")
public Result timeByStation(String startTime, String endTime, Page page,String sonLaboratory){
return Result.success(reportService.timeByStation(startTime,endTime,page,sonLaboratory));
}
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 7f99803..69e16fe 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
@@ -25,5 +25,5 @@
IPage<InsOrderUserDto> selectInsOrderUserDto(@Param("start") LocalDateTime start, @Param("end") LocalDateTime end, @Param("sonLaboratory") String sonLaboratory, Page page);
- IPage<InsOrderUserDto> selectInsOrderUserDto2(@Param("id") Integer id, Page page);
+ IPage<InsOrderUserDto> selectInsOrderUserDto2(@Param("ids") List<Integer> ids, Page page);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java
index f061cc7..00943f6 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java
@@ -432,9 +432,11 @@
}else {
List<InsOrderState> insOrderStates = insOrderStateMapper.selectList(Wrappers.<InsOrderState>lambdaQuery()
.between(InsOrderState::getCreateTime, start, end));
- for (InsOrderState insOrderState : insOrderStates) {
- IPage<InsOrderUserDto> insOrderUserDtoIPage = insOrderUserMapper.selectInsOrderUserDto2(insOrderState.getId(), page);
- map.put(insOrderState.getLaboratory(), insOrderUserDtoIPage);
+ Map<String, List<InsOrderState>> listMap = insOrderStates.stream().collect(Collectors.groupingBy(InsOrderState::getLaboratory));
+ for (Map.Entry<String, List<InsOrderState>> entry : listMap.entrySet()) {
+ List<Integer> ids = entry.getValue().stream().map(InsOrderState::getId).collect(Collectors.toList());
+ IPage<InsOrderUserDto> insOrderUserDtoIPage = insOrderUserMapper.selectInsOrderUserDto2(ids, new Page(1,9));
+ map.put(entry.getKey(), insOrderUserDtoIPage);
}
}
return map;
diff --git a/inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml
index 697c500..18ccab2 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml
@@ -40,6 +40,10 @@
from ins_order_user iou
left join ins_order_state ios on iou.ins_order_state_id = ios.id
left join ins_sample isa on ios.ins_sample_id = isa.id
- where ios.id= #{id}
+ where 1=1
+ and ios.id in
+ <foreach collection="ids" open="(" close=")" item="id" separator=",">
+ #{id}
+ </foreach>
</select>
</mapper>
--
Gitblit v1.9.3