From 376902462b473ff0365cbf49488c113cbf432743 Mon Sep 17 00:00:00 2001 From: wxr Date: Mon, 17 Nov 2025 20:12:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E5=8C=96bu?= =?UTF-8?q?g=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/SampleAnalysisAuditServiceImpl.java | 16 ++++++++++------ .../controller/vo/ConfigXRFLineCustomRespVO.java | 3 ++- .../controller/vo/XRFDeviceSampleReqVO.java | 3 ++- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java index 48d12d5..47c4099 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java @@ -402,12 +402,16 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic datas.add(map); } - resultJsonObject.put("all", datas); - Map>> map = datas.stream().collect(Collectors.groupingBy(g -> (String) g.get("analysisType"))); - for (Map.Entry>> entry : map.entrySet()) { - resultJsonObject.put(entry.getKey(), entry.getValue()); - } - +// resultJsonObject.put("all", datas); +// Map>> map = datas.stream().collect(Collectors.groupingBy(g -> (String) g.get("analysisType"))); +// for (Map.Entry>> entry : map.entrySet()) { +// resultJsonObject.put(entry.getKey(), entry.getValue()); +// } + + List> fxList = datas.stream().filter(f -> "analysis".equals(f.get("analysisType")) || "zky".equals(f.get("analysisType")) || "kby".equals(f.get("analysisType")) ).collect(Collectors.toList()); + resultJsonObject.put("fx", fxList); + List> byList = datas.stream().filter(f -> "by".equals(f.get("analysisType"))).collect(Collectors.toList()); + resultJsonObject.put("by", byList); return resultJsonObject; } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/thirdpartyapi/controller/vo/ConfigXRFLineCustomRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/thirdpartyapi/controller/vo/ConfigXRFLineCustomRespVO.java index 1cf6241..6502ebb 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/thirdpartyapi/controller/vo/ConfigXRFLineCustomRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/thirdpartyapi/controller/vo/ConfigXRFLineCustomRespVO.java @@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer; +import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import io.swagger.v3.oas.annotations.media.Schema; @@ -46,7 +47,7 @@ public class ConfigXRFLineCustomRespVO implements Serializable { @Schema(description = "末次检查数据时间") @JsonSerialize(using = LocalDateTimeSerializer.class) // 序列化（响应） - @JsonDeserialize(using = LocalDateDeserializer.class) // 反序列化（请求） + @JsonDeserialize(using = LocalDateTimeDeserializer.class) // 反序列化（请求） @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime lastCheckDataTime; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/thirdpartyapi/controller/vo/XRFDeviceSampleReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/thirdpartyapi/controller/vo/XRFDeviceSampleReqVO.java index b83ccbc..2bafdc5 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/thirdpartyapi/controller/vo/XRFDeviceSampleReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/thirdpartyapi/controller/vo/XRFDeviceSampleReqVO.java @@ -10,6 +10,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer; +import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import io.swagger.v3.oas.annotations.media.Schema; @@ -48,7 +49,7 @@ public class XRFDeviceSampleReqVO implements Serializable { * 样品时间 */ @JsonSerialize(using = LocalDateTimeSerializer.class) // 序列化（响应） - @JsonDeserialize(using = LocalDateDeserializer.class) // 反序列化（请求） + @JsonDeserialize(using = LocalDateTimeDeserializer.class) // 反序列化（请求） @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Schema(description = "样品时间")