修改补卡功能

shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs

@@ -161,7 +161,7 @@ WHERE
             return null;
         }
 
-        public bool InsertAttendanceRecord(string userID, string userName, string sex,string post, string deviceCode)
+        public bool InsertAttendanceRecord(string userID, string userName, string sex,string post, string deviceCode,string data)
         {
             string attendanceTime = LoginUser.Start_Time + "-" + LoginUser.End_Time;
             string sql = $@" INSERT INTO [dbo].[mes_attendance_records] 
@@ -171,7 +171,7 @@ WHERE
 		VALUES 
 		('{Common.GetUUID()}', '{userID}', '{userName}', '正常', '{sex}', 18, 
 		null, GetDate(), '{deviceCode}', null, null, '{attendanceTime}', 
-		CONVERT(VARCHAR(10), GetDate() , 120), 0, GetDate(),'{post}');";
+		'{data}', 0, GetDate(),'{post}');";
             int ret = Utils.netClientDBHelper.executeUpdate(sql);
             return ret > 0 ? true : false;
         }
@@ -224,7 +224,7 @@ FROM
     mes_attendance_records
 WHERE
     start_addr = '{v}'
-    AND create_time BETWEEN '{data} 00:00:00' AND '{data} 23:59:59'
+    AND attendance_date ='{data}'
 ORDER BY
     create_time DESC;
 ";
@@ -823,7 +823,7 @@ where line_code = '{deviceCode}' and CONVERT(VARCHAR(10), Create_time , 120) = C
 
         public List<sys_user> GetOnWorkUserList(string deviceCode,string shereDate)
         {
-            string sql = $"\r\n  SELECT \r\n        user_id as user_name,\r\n        user_name as nick_name,\r\n        sex,\r\n        age,\r\n\t\t\t\tpost, \r\n        create_time FROM mes_attendance_records WHERE start_addr = '{deviceCode}' \r\n      AND create_time BETWEEN '{shereDate} 00:00:00' AND '{shereDate} 23:59:59' ORDER BY create_time DESC;";
+            string sql = $"\r\n  SELECT \r\n        user_id as user_name,\r\n        user_name as nick_name,\r\n        sex,\r\n        age,\r\n\t\t\t\tpost, \r\n        create_time FROM mes_attendance_records WHERE start_addr = '{deviceCode}' \r\n      AND attendance_date = '{shereDate}' ORDER BY create_time DESC;";
            // string sql = $"WITH RankedRecords AS (\r\n    SELECT \r\n        user_id as user_name,\r\n        user_name as nick_name,\r\n        sex,\r\n post,\r\n        age,\r\n        create_time,\r\n        ROW_NUMBER() OVER (PARTITION BY user_name ORDER BY create_time DESC) as rn\r\n    FROM [dbo].[mes_attendance_records]\r\n    WHERE start_addr = '{deviceCode}' \r\n      AND create_time BETWEEN '{shereDate} 00:00:00' AND '{shereDate} 23:59:59'\r\n)\r\nSELECT \r\n    user_name,\r\n    nick_name,\r\n post,    sex,\r\n    age,\r\n    create_time\r\nFROM RankedRecords\r\nWHERE rn = 1\r\nORDER BY create_time DESC;";
             DataTable dt = Utils.netClientDBHelper.getDataSet(sql).Tables[0];