1

2025-10-20 14:29:19 +08:00
parent 4d82c3f049 2c7c66d939
commit 94d38dc1a8
18 changed files with 1130 additions and 217 deletions
@@ -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<WelderItem> res = new List<WelderItem>();
                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.ToString("yyyy-MM-dd hh:mm:ss");
                    res.Add(item); 
                } 
                respone.data = res; 
@@ -102,7 +102,7 @@ namespace BLL
                         select x;
                foreach(var w in pw)
                {
-                    w.ExchangeTime = null;
+                    w.ExchangeTime = DateTime.Now;
                }
                db.SubmitChanges();