五环

2025-05-16 17:54:16 +08:00
parent 1d2aee2c7c
commit 1773ec1dde
24 changed files with 1025 additions and 475 deletions
@@ -73,7 +73,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit
                          + @" LEFT JOIN QualityAudit_SafePersonQuality AS PersonQuality ON Person.PersonId = PersonQuality.PersonId "
                          + @" LEFT JOIN Base_WorkPost AS WorkPost ON WorkPost.WorkPostId = Person.WorkPostId "
                          + @" LEFT JOIN Sys_User AS Users ON PersonQuality.CompileMan = Users.UserId "
-                          + @" WHERE WorkPost.IsHsse =1";
+                          + @" WHERE WorkPost.IsHsse =1 ";
            List<SqlParameter> listStr = new List<SqlParameter>();
            strSql += " AND Person.ProjectId = @ProjectId";
            listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
@@ -102,11 +102,11 @@ namespace FineUIPro.Web.HSSE.QualityAudit
            {
                if (this.rblIsPost.SelectedValue == "1")
                {
-                    strSql += " AND Person.OutTime is null ";
+                    strSql += " AND Person.IsUsed ='1' AND (Person.OutTime is null OR Person.OutTime > getdate()) ";
                }
                else if (this.rblIsPost.SelectedValue == "0")
                {
-                    strSql += " AND Person.OutTime is not null ";
+                    strSql += " AND Person.OutTime is not null AND Person.OutTime < getdate() ";
                }
            }
            SqlParameter[] parameter = listStr.ToArray();