From 72252c8305e6f64345e58e31b927f4110dc5ba4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com> Date: Tue, 21 Oct 2025 09:30:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=BE=E7=A4=BA=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xujie/sys/modules/pms/data/EamWorkOrderInData.java | 9 +++++++++ src/main/resources/mapper/pms/EamMapper.xml | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderInData.java b/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderInData.java index 2dab7ac1..539ad691 100644 --- a/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderInData.java +++ b/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderInData.java @@ -36,6 +36,9 @@ public class EamWorkOrderInData extends EamWorkOrderData{ private String difficultyRemark; private String planPeriod; private String planCycle; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date taskStartDate; // 审核员名称 private String checkerName; private String codeDesc; @@ -112,7 +115,13 @@ public class EamWorkOrderInData extends EamWorkOrderData{ private String reportSparPartFlag; // 是否有备件图片 + public Date getTaskStartDate() { + return taskStartDate; + } + public void setTaskStartDate(Date taskStartDate) { + this.taskStartDate = taskStartDate; + } private List informationList; public String getPlanPeriod() { return planPeriod; diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml index 776d3806..8a388e5e 100644 --- a/src/main/resources/mapper/pms/EamMapper.xml +++ b/src/main/resources/mapper/pms/EamMapper.xml @@ -768,7 +768,8 @@ a.check_type, a.is_return, ewo.plan_period, - ewo.plan_cycle + ewo.plan_cycle, + ewo.task_start_date FROM eam_workOrder a left join eam_object as eo on eo.site = a.site and eo.ObjectID = a.ObjectID and eo.bu_no = a.bu_no left join sys_department as sd ON eo.site = sd.site and eo.dept_id = sd.department_id and eo.bu_no = sd.bu_no