From 0800df1e422c8f7e5fee825410bfed8344ee3629 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 11 三月 2025 09:40:17 +0800
Subject: [PATCH] 检验下单：数据查看
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java | 17 ++++-------------
1 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
index 272479d..efc2876 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
@@ -33,6 +33,7 @@
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.exception.ErrorException;
+import com.ruoyi.inspect.comparater.CustomComparator;
import com.ruoyi.inspect.dto.*;
import com.ruoyi.inspect.excel.FiberRibboGeometricalParameterExcelData;
import com.ruoyi.inspect.mapper.*;
@@ -933,20 +934,16 @@
}
@Override
- public Map<String, Object> selectSampleAndProductByOrderId(SampleProductDto2 sampleProductDto) {
- Map<String, Object> map = new HashMap<>();
- List<Map<String, Object>> headList = new ArrayList<>();
+ public List<SampleProductDto2> selectSampleAndProductByOrderId(SampleProductDto2 sampleProductDto) {
List<SampleProductDto2> SampleProductDto2S = null;
if (!Objects.isNull(sampleProductDto.getId())) {
String laboratory = insOrderMapper.selectById(sampleProductDto.getId()).getLaboratory();
if (laboratory.equals("鐢靛姏浜у搧瀹為獙瀹�")) {
//鐢靛姏璇曢獙瀹ょ殑鏁版嵁鏌ョ湅锛屽垹闄ゅ厜绾ら厤缃浉鍏冲瓧娈�
-// headList = PrintChina.printChina(SampleProductDTODL.class);
SampleProductDto2S = insOrderMapper.selectSampleAndProductByOrderId(
QueryWrappers.queryWrappers(sampleProductDto).orderByAsc("ins_product_id"),
sampleProductDto.getId());
} else {
-// headList = PrintChina.printChina(SampleProductDto2.class);
SampleProductDto2S = insOrderMapper.selectSampleAndProductByOrderId(
QueryWrappers.queryWrappers(sampleProductDto)
.orderByAsc("son_laboratory"),
@@ -1020,7 +1017,7 @@
}
collect2.addAll(list);
SampleProductDto2S = collect2;
-// SampleProductDto2S.sort(new CustomComparator(enumService));
+ SampleProductDto2S.sort(new CustomComparator(dictTypeService));
}
}
for (SampleProductDto2 record : SampleProductDto2S) {
@@ -1037,9 +1034,7 @@
record.setLastValue(String.join(",", values));
}
}
- map.put("head", headList);
- map.put("body", SampleProductDto2S);
- return map;
+ return SampleProductDto2S;
}
@Override
@@ -1942,10 +1937,6 @@
LocalDate today = LocalDate.parse(split[1]);
LocalTime end = LocalTime.of(23, 59, 59);
List<CostStatisticsDto> costStatisticsDtos = insOrderMapper.selectCostStatistics2(QueryWrappers.queryWrappers(costStatisticsDto), split[0], today.atTime(end).toString(), laboratory);
-// double totalPrice = costStatisticsDtos.stream()
-// .filter(dto -> dto.getPrice() != null) // 杩囨护鎺変环鏍间负 null 鐨勫璞�
-// .mapToDouble(value -> value.getPrice().doubleValue() * value.getNum())
-// .sum();
BigDecimal total = BigDecimal.ZERO;
for (CostStatisticsDto dto : costStatisticsDtos) {
if (Objects.isNull(dto.getPrice()) || dto.getPrice().compareTo(BigDecimal.ZERO) == 0) {
--
Gitblit v1.9.3