diff --git a/DataBase/版本日志/SGGLDB_WH_V2024-08-19-bwj.sql b/DataBase/版本日志/SGGLDB_WH_V2024-08-19-bwj.sql new file mode 100644 index 00000000..ba882d5f --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_V2024-08-19-bwj.sql @@ -0,0 +1,62 @@ + + +ALTER VIEW [dbo].[View_Check_JointCheckDetail] +AS + +SELECT d.JointCheckDetailId,d.JointCheckId, d.UnitWorkId, d.CNProfessionalCode, d.QuestionDef, d.QuestionType,d.CheckSite, + d.Standard,d.RectifyOpinion,d.LimitDate,d.AttachUrl,d.HandleWay,d.RectifyDate,d.ReAttachUrl,d.Feedback,d.IsOK, + c.ProjectId,c.CheckType,c.UnitId,u.UnitName,c.CheckDate,d.State,d.CreateDate,d.HandleMan,SaveHandleMan, + case d.State when '6' then 1 + else 0 end as OK, + case c.CheckType when '1' then 'Öܼì²é' + when '2' then 'Ô¼ì²é' + when '3' then '²»¶¨ÆÚ¼ì²é' + when '4' then 'רҵ¼ì²é' + else '' end as CheckTypeStr, + --case d.QuestionType when '1' then 'ÖÊÁ¿²»ºÏ¸ñ' + -- when '2' then 'ÖÊÁ¿È±ÏÝ' + -- else '' end as QuestionTypeStr, + qqt.QualityQuestionType as QuestionTypeStr, + pu.UnitName as ProposeUnitName, + ppu.UnitType as ProposeUnitType, + (select top 1 ApproveDate from dbo.Check_JointCheckApprove jca where jca.JointCheckDetailId=d.JointCheckDetailId + order by ApproveDate desc) as OKDate, + uw.UnitWorkName,cn.ProfessionalName +FROM dbo.Check_JointCheckDetail AS d + LEFT JOIN dbo.Check_JointCheck AS c ON c.JointCheckId = d.JointCheckId + LEFT JOIN dbo.Base_Unit AS u ON u.UnitId = c.UnitId + LEFT JOIN dbo.WBS_UnitWork as uw on uw.UnitWorkId=d.UnitWorkId + LEFT JOIN dbo.Base_CNProfessional as cn on cn.CNProfessionalId=d.CNProfessionalCode + LEFT JOIN dbo.Base_Unit AS pu ON pu.UnitId = c.ProposeUnitId + LEFT JOIN dbo.Project_ProjectUnit AS ppu ON ppu.UnitId = c.ProposeUnitId and ppu.ProjectId=c.ProjectId + LEFT JOIN dbo.Base_QualityQuestionType AS qqt ON qqt.QualityQuestionTypeId = d.QuestionType +union +(SELECT d.CheckControlCode,'', d.UnitWorkId, d.CNProfessionalCode, d.QuestionDef, d.QuestionType,d.CheckSite, + '',d.RectifyOpinion,d.LimitDate,d.AttachUrl,d.HandleWay,d.RectifyDate,d.ReAttachUrl,null,null, + d.ProjectId,'5',d.UnitId,u.UnitName,d.CheckDate,d.State,d.CheckDate,'','', + case d.State when '7' then 1 + else 0 end as OK, + 'ÖÊÁ¿Ñ²¼ì' as CheckTypeStr, + --case d.QuestionType when '1' then 'ÖÊÁ¿²»ºÏ¸ñ' + -- when '2' then 'ÖÊÁ¿È±ÏÝ' + -- else '' end as QuestionTypeStr, + qqt.QualityQuestionType as QuestionTypeStr, + pu.UnitName as ProposeUnitName, + ppu.UnitType as ProposeUnitType, + (select top 1 ApproveDate from dbo.Check_CheckControlApprove cca where cca.CheckControlCode=d.CheckControlCode + order by ApproveDate desc) as OKDate, + uw.UnitWorkName,cn.ProfessionalName +FROM dbo.Check_CheckControl AS d + LEFT JOIN dbo.Base_Unit AS u ON u.UnitId = d.UnitId + LEFT JOIN dbo.WBS_UnitWork as uw on uw.UnitWorkId=d.UnitWorkId + LEFT JOIN dbo.Base_CNProfessional as cn on cn.CNProfessionalId=d.CNProfessionalCode + LEFT JOIN dbo.Base_Unit AS pu ON pu.UnitId = d.ProposeUnitId + LEFT JOIN dbo.Project_ProjectUnit AS ppu ON ppu.UnitId = d.ProposeUnitId and ppu.ProjectId=d.ProjectId + LEFT JOIN dbo.Base_QualityQuestionType AS qqt ON qqt.QualityQuestionTypeId = d.QuestionType +) + + + +GO + + diff --git a/SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs index f2584260..af03a574 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs @@ -109,7 +109,7 @@ namespace FineUIPro.Web.CQMS.Check string strSql = @"SELECT chec.CheckControlCode,chec.CheckSite,chec.ProjectId,chec.unitId,cNProfessional.ProfessionalName," + @" QualityQuestionType.QualityQuestionType as QuestionType,chec.LimitDate," + @" 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.userName " + + @" unit.UnitName,unitWork.UnitWorkName,u.userName " + @" FROM Check_CheckControl chec" + @" left join Base_Unit unit on unit.unitId=chec.unitId" + @" left join Base_CNProfessional cNProfessional on cNProfessional.CNProfessionalId=chec.CNProfessionalCode" diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user index cb873201..63722353 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true false diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index bd497c6b..5fe155da 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true