From 5e0e61bd8cea8ab9ed410190dc8a368266e696f4 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 26 十月 2026 16:48:42 +0800
Subject: [PATCH] fix(order): 1.修正检验订单进度统计逻辑及导出字段 2.下单时间改成送样时间
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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 2820bd8..39843a4 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
@@ -846,6 +846,7 @@
snapshot.setTemplateId(template.getId());
snapshot.setName(template.getName());
snapshot.setNumber(template.getNumber());
+ snapshot.setStandardRequirement(template.getStandardRequirement());
snapshot.setRemark(template.getRemark());
snapshot.setThing(template.getThing());
snapshot.setSort(selection.getSort());
@@ -1091,6 +1092,7 @@
.select(InsOrderStandardTemplate::getTemplateId,
InsOrderStandardTemplate::getTemperature,
InsOrderStandardTemplate::getDetectionTime,
+ InsOrderStandardTemplate::getDetectionEndTime,
InsOrderStandardTemplate::getDetectionPlace,
InsOrderStandardTemplate::getInsResult)
.orderByAsc(InsOrderStandardTemplate::getSort,
@@ -1100,6 +1102,8 @@
condition.setTemplateId(snapshot.getTemplateId());
condition.setTemperature(snapshot.getTemperature());
condition.setDetectionTime(snapshot.getDetectionTime());
+ condition.setDetectionEndTime(snapshot.getDetectionEndTime() == null
+ ? snapshot.getDetectionTime() : snapshot.getDetectionEndTime());
condition.setDetectionPlace(snapshot.getDetectionPlace());
condition.setInsResult(snapshot.getInsResult());
condition.setDeviceIds(templateDeviceIds.getOrDefault(
@@ -1799,7 +1803,7 @@
List<String> unqualifiedList = insProductMapper.selectUnqualifiedList(orderDto.getId());
orderDto.setUnqualifiedItem(CollUtil.join(unqualifiedList, ","));
}
- orderDto.setCreateTimeString(orderDto.getCreateTime() == null ? "" : orderDto.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ orderDto.setSampleDateString(orderDto.getSampleDate() == null ? "" : orderDto.getSampleDate().toString());
}
--
Gitblit v1.9.3