20230921新增安全巡检新增分部分项选择、质量巡检新增分部分项选择

2023-09-21 17:34:59 +08:00
parent 017edfa146
commit 9fb8e5e030
35 changed files with 1076 additions and 466 deletions
@@ -51,12 +51,9 @@ namespace FineUIPro.Web.CQMS.Check
                Funs.FineUIPleaseSelect(this.dpHandelStatus);
                btnNew.OnClientClick = Window1.GetShowReference("ChecklistEdit.aspx") + "return false;";
                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-
                // 绑定表格
                BindGrid();

-
-
            }


@@ -99,7 +96,8 @@ namespace FineUIPro.Web.CQMS.Check
        }
        protected DataTable ChecklistData()
        {
-            string strSql = @"SELECT chec.CheckControlCode,chec.CheckSite,chec.ProjectId,chec.unitId,cNProfessional.ProfessionalName,"
+            string strSql = @"SELECT chec.CheckControlCode,(case when chec.WorkPackageName is null then chec.CheckSite else chec.WorkPackageName end)  as CheckSite
+                            ,chec.ProjectId,chec.unitId,cNProfessional.ProfessionalName,"
                          + @" QualityQuestionType.QualityQuestionType as QuestionType,"
                          + @" chec.checkman,chec.CheckDate,chec.DocCode,chec.submitman,chec.state,chec.CNProfessionalCode,"
                          + @" unit.UnitName,unitWork.UnitWorkName+(case unitWork.ProjectType when '1' then '(建筑)' else '(安装)' end) as UnitWorkName,u.PersonName "