diff --git a/src/main/java/com/xujie/sys/modules/orderIssure/entity/SOIssueNotifyHeaderData.java b/src/main/java/com/xujie/sys/modules/orderIssure/entity/SOIssueNotifyHeaderData.java index 523d9f0c..7c0f307c 100644 --- a/src/main/java/com/xujie/sys/modules/orderIssure/entity/SOIssueNotifyHeaderData.java +++ b/src/main/java/com/xujie/sys/modules/orderIssure/entity/SOIssueNotifyHeaderData.java @@ -28,4 +28,8 @@ public class SOIssueNotifyHeaderData extends SOIssueNotifyHeader { private String workShopName; private String closeRemark; private String username; + + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date needDate; } diff --git a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml index 4865bb4b..053d24fd 100644 --- a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml +++ b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml @@ -170,10 +170,11 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu) a.IssueResult,a.PlanIssueDate,a.RealIssueDate,a.Status,a.HaveIssueRecordFlag,a.CalcFlag,a.NeedApproveFlag,a.ApprovedFlag, a.Approver,a.ApproveDate,a.WarehouseID,a.RecordVersion,a.OutWorkOrderFlag,a.ProjectID,a.OrderType,a.AuthRuleID,(CASE WHEN a.confirm_status IS NULL THEN '未确认' ELSE a.confirm_status END) as confirm_status ,dbo.plm_get_user_display(a.Site,a.UserName) userDisplay, a.confirm_user_id,a.confirm_username,a.confirm_user_display,a.confirm_date, - c.workShopName + c.workShopName,d.needDate from SOIssueNotifyHeader a left join sys_user b on a.UserName=b.username left join eam_WorkShop c on b.workShopId=c.workShopId + LEFT JOIN SOIssueNotifyOrderList d on a.site=d.site and a.NotifyNo=d.NotifyNo and d.ItemNo = '1'