From adf6725a26de8ede904d6fdfc887611fc0f6fea6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?= Date: Thu, 23 Apr 2026 09:44:03 +0800 Subject: [PATCH] bug --- .../modules/Api/entity/HeiHuApiMesLogShopOrderEntity.java | 7 ++++++- src/main/resources/mapper/api/HeiHuApiMesLogMapper.xml | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/xujie/sys/modules/Api/entity/HeiHuApiMesLogShopOrderEntity.java b/src/main/java/com/xujie/sys/modules/Api/entity/HeiHuApiMesLogShopOrderEntity.java index c424d76..fc97db6 100644 --- a/src/main/java/com/xujie/sys/modules/Api/entity/HeiHuApiMesLogShopOrderEntity.java +++ b/src/main/java/com/xujie/sys/modules/Api/entity/HeiHuApiMesLogShopOrderEntity.java @@ -24,8 +24,13 @@ public class HeiHuApiMesLogShopOrderEntity implements Serializable { private Double lotSize; private String cDepartment; private String cTaskNo; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private String cPackageType; - + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private String planStartDate; + private String needDate; @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date enterDate; diff --git a/src/main/resources/mapper/api/HeiHuApiMesLogMapper.xml b/src/main/resources/mapper/api/HeiHuApiMesLogMapper.xml index c5c92ae..a0c0a97 100644 --- a/src/main/resources/mapper/api/HeiHuApiMesLogMapper.xml +++ b/src/main/resources/mapper/api/HeiHuApiMesLogMapper.xml @@ -18,7 +18,9 @@ [c_TaskNo] AS cTaskNo, [c_PackageType] AS cPackageType, EnterDate AS enterDate, - EnterBy AS enterBy + EnterBy AS enterBy, + PlanStartDate, + NeedDate FROM MES_LOG_ShopOrder WHERE Site = #{site} AND id >= #{sinceId}