diff --git a/SGGL/FineUIPro.Web/Door/InOutRecord.aspx.cs b/SGGL/FineUIPro.Web/Door/InOutRecord.aspx.cs index 7c1e7432..d4443c78 100644 --- a/SGGL/FineUIPro.Web/Door/InOutRecord.aspx.cs +++ b/SGGL/FineUIPro.Web/Door/InOutRecord.aspx.cs @@ -56,7 +56,7 @@ namespace FineUIPro.Web.Door private void GetPersonStatistic() { string strSql = @"WITH CTE AS ( - SELECT ROW_NUMBER() OVER (PARTITION BY Record.IDCardNo, WorkIn1,OffDuty1,WorkIn2,OffDuty2,WorkIn3,OffDuty3 ORDER BY (SELECT NULL)) as rn + SELECT ROW_NUMBER() OVER (PARTITION BY Record.IDCardNo,RecordDate ORDER BY OffDuty3 desc,WorkIn3,OffDuty2 desc,WorkIn2,OffDuty1 desc,WorkIn1) as rn ,NewID,Record.ProjectId,InstallationName,P.UnitId,U.UnitName,P.PersonName,RecordDate,Record.EmployName ,IDCardNo,P.Nation,B.dictName AS NationName ,PostName,WorkIn1,OffDuty1,WorkIn2,OffDuty2,WorkIn3,OffDuty3,ManHours ,T.TeamGroupId,T.TeamGroupName,P.WorkPostId,W.WorkPostName, ManOverHours