From 30661bae073365f9170df0e1eb019ea0359a11bc Mon Sep 17 00:00:00 2001 From: 10191 <506754232@qq.com> Date: Fri, 17 Oct 2025 10:24:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=84=8A=E5=B7=A5=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HJGL_DS/BLL/API/APIWeldServices.cs | 5 +++-- HJGL_DS/Model/APIItem/WelderItem.cs | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/HJGL_DS/BLL/API/APIWeldServices.cs b/HJGL_DS/BLL/API/APIWeldServices.cs index c5cbb9b..e0439df 100644 --- a/HJGL_DS/BLL/API/APIWeldServices.cs +++ b/HJGL_DS/BLL/API/APIWeldServices.cs @@ -417,10 +417,10 @@ namespace BLL.API { dateTime = DateTime.Parse(date); } - var q = from pw in db.Project_Welder + var q = (from pw in db.Project_Welder join w in db.HJGL_BS_Welder on pw.WED_ID equals w.WED_ID where w.PhotoUrl !=null && pw.ExchangeTime > dateTime - select w; + select w).Distinct(); List res = new List(); foreach (var p in q) @@ -465,6 +465,7 @@ namespace BLL.API item.AttachUrl = p.AttachUrl; item.PhotoUrl = p.PhotoUrl; item.IsFaceTrain = p.IsFaceTrain; + item.ExchangeTime = DateTime.Now; res.Add(item); } respone.data = res; diff --git a/HJGL_DS/Model/APIItem/WelderItem.cs b/HJGL_DS/Model/APIItem/WelderItem.cs index 8c4017d..335d92a 100644 --- a/HJGL_DS/Model/APIItem/WelderItem.cs +++ b/HJGL_DS/Model/APIItem/WelderItem.cs @@ -244,7 +244,7 @@ namespace Model.APIItem public DateTime? LimitDate { get; set; } - + public DateTime? ExchangeTime { get; set; } public string IdentityCard { get; set; } @@ -254,5 +254,6 @@ namespace Model.APIItem public bool? IsFaceTrain { get; set; } - } + + } }