zgty/zt-qms
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

时间格式化bug修复

Browse Source
This commit is contained in:
王兴荣
2025-11-17 20:12:15 +08:00
parent c80aeece47
commit 376902462b
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java
View File

@@ -402,12 +402,16 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
datas.add(map); datas.add(map);
} }
resultJsonObject.put("all", datas); // resultJsonObject.put("all", datas);
Map<String, List<Map<String, Object>>> map = datas.stream().collect(Collectors.groupingBy(g -> (String) g.get("analysisType"))); // Map<String, List<Map<String, Object>>> map = datas.stream().collect(Collectors.groupingBy(g -> (String) g.get("analysisType")));
for (Map.Entry<String, List<Map<String, Object>>> entry : map.entrySet()) { // for (Map.Entry<String, List<Map<String, Object>>> entry : map.entrySet()) {
resultJsonObject.put(entry.getKey(), entry.getValue()); // resultJsonObject.put(entry.getKey(), entry.getValue());
} // }
List<Map<String, Object>> 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<Map<String, Object>> byList = datas.stream().filter(f -> "by".equals(f.get("analysisType"))).collect(Collectors.toList());
resultJsonObject.put("by", byList);
return resultJsonObject; return resultJsonObject;
} }

3
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/thirdpartyapi/controller/vo/ConfigXRFLineCustomRespVO.java
View File

@@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer; 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 com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
@@ -46,7 +47,7 @@ public class ConfigXRFLineCustomRespVO implements Serializable {
@Schema(description = "末次检查数据时间") @Schema(description = "末次检查数据时间")
@JsonSerialize(using = LocalDateTimeSerializer.class) // 序列化（响应） @JsonSerialize(using = LocalDateTimeSerializer.class) // 序列化（响应）
@JsonDeserialize(using = LocalDateDeserializer.class) // 反序列化（请求） @JsonDeserialize(using = LocalDateTimeDeserializer.class) // 反序列化（请求）
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime lastCheckDataTime; private LocalDateTime lastCheckDataTime;

3
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/thirdpartyapi/controller/vo/XRFDeviceSampleReqVO.java
View File

@@ -10,6 +10,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer; 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 com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
@@ -48,7 +49,7 @@ public class XRFDeviceSampleReqVO implements Serializable {
* 样品时间 * 样品时间
*/ */
@JsonSerialize(using = LocalDateTimeSerializer.class) // 序列化（响应） @JsonSerialize(using = LocalDateTimeSerializer.class) // 序列化（响应）
@JsonDeserialize(using = LocalDateDeserializer.class) // 反序列化（请求） @JsonDeserialize(using = LocalDateTimeDeserializer.class) // 反序列化（请求）
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "样品时间") @Schema(description = "样品时间")