合并最新

SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs

@@ -23,6 +23,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                 GetButtonPower();
                 BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessional, true);//专业
                 UnitWorkService.InitUnitWorkDownList(drpUnitWork, this.CurrUser.LoginProjectId, true);
+                Funs.FineUIPleaseSelect(this.drpState);
                 BindGrid();
             }
         }
@@ -46,6 +47,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                                     BP.Class,
                                     P.AcceptanceSite,
                                     P.AcceptanceCheckMan,
+                                    us.UserName,
                                   case when   P.IsOnceQualified = 1 then '是' else  '否' end as IsOnceQualified,
                                     P.Status"
                             + @" FROM ProcessControl_InspectionManagementDetail AS D"
@@ -55,6 +57,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                             + @" LEFT JOIN WBS_UnitWork AS UnitWork ON UnitWork.UnitWorkId = P.UnitWorkId"
                             + @" LEFT JOIN WBS_DivisionProject AS DP ON DP.DivisionProjectId = P.Branch"
                             + @" LEFT JOIN WBS_BreakdownProject AS BP ON BP.BreakdownProjectId = P.ControlPointType"
+                            + @" LEFT JOIN Sys_User AS us ON us.UserId = P.AuditMan"
                             + @" WHERE P.ProjectId=@ProjectId ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
@@ -72,6 +75,11 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                 strSql += " AND P.CNProfessionalId=@CNProfessionalId";
                 listStr.Add(new SqlParameter("@CNProfessionalId", drpCNProfessional.SelectedValue));
             }
+            if (drpState.SelectedValue != BLL.Const._Null)
+            {
+                strSql += " AND P.Status=@Status";
+                listStr.Add(new SqlParameter("@Status", drpState.SelectedValue));
+            }
             if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
             {
                 strSql += " AND P.InspectionDate >= @InspectionDate";