From 6a884e4a4037a2d0aefc023500a33411dd2c2d80 Mon Sep 17 00:00:00 2001
From: liangkun <liangkun7173@hotmail.com>
Date: Wed, 9 Aug 2023 16:39:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=A1=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Modules/AttendanceApi.cs                      | 15 +++++++++++++++
 .../ADR_Record/ADR_RecordService.cs               |  7 ++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/AttendanceApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/AttendanceApi.cs
index 4ec01c1bc..bd9bedd25 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/AttendanceApi.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/AttendanceApi.cs	
@@ -27,10 +27,25 @@ namespace Learun.Application.WebApi.Modules
             Get["IsAttendanceStudent"] = IsAttendanceStudent;
             //学生打卡
             Post["/clockinStudent"] = ClockInStudent;
+            //打卡记录
+            Get["/GetTeacherRecord"] = GetTeacherRecord;
         }
         private ADR_RestrictionIBLL adr_RestrictionBLL = new ADR_RestrictionBLL();
         private ADR_RecordIBLL adr_RecordBLL = new ADR_RecordBLL();
 
+
+        public Response GetTeacherRecord(dynamic _)
+        {
+            ReqPageParam parameter = this.GetReqData<ReqPageParam>();
+            var res=adr_RecordBLL.GetList(parameter.queryJson);
+            var jsondata =
+                new
+                {
+                    data = res
+                };
+            return Success(jsondata);
+        }
+
         /// <summary>
         /// 判断当前时间是否可以打卡
         /// </summary>
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordService.cs
index f6e11e8ac..cb0050f63 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordService.cs	
@@ -122,7 +122,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                                        t.ADYear,
                                        t.ADMonth,
                                        t.ADDay,
-                                       t.ADPhoto
+                                       t.ADPhoto,t.AISOut
                              ");
                 strSql.Append($"  FROM ADR_Record t left JOIN {baseDataName}.dbo.LR_Base_User emp ON t.UserNo=emp.F_Account ");
                 strSql.Append($"  left join {baseDataName}.dbo.LR_Base_Department d ON t.UserNo=emp.F_DepartmentId ");
@@ -142,6 +142,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("UserName", "%" + queryParam["UserName"].ToString() + "%", DbType.String);
                     strSql.Append(" AND emp.F_RealName Like @UserName ");
                 }
+                if (!queryParam["UserNo"].IsEmpty())
+                {
+                    dp.Add("UserNo", "" + queryParam["UserNo"].ToString() + "", DbType.String);
+                    strSql.Append(" AND t.UserNo = @UserNo ");
+                }
                 if (!queryParam["Department"].IsEmpty())
                 {
                     dp.Add("Department", queryParam["Department"].ToString(), DbType.String);