合并最新

2022-12-20 09:32:32 +08:00
parent 844e9f1488
commit 1abdaa9476
654 changed files with 73563 additions and 9746 deletions
@@ -39,8 +39,7 @@ namespace FineUIPro.Web.HSSE.Manager
        /// </summary>
        private void BindGrid()
        {
-            string strSql = "SELECT CompletionReport.CompletionReportId,CompletionReport.ProjectId,CodeRecords.Code AS CompletionReportCode,CompletionReport.CompletionReportName,CompletionReport.FileContent,CompletionReport.CompileMan,CompletionReport.CompileDate,CompletionReport.States, "
-                        + @" (CASE WHEN CompletionReport.States = " + BLL.Const.State_0 + " OR CompletionReport.States IS NULL THEN '待['+OperateUser.UserName+']提交' WHEN CompletionReport.States =  " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.UserName+']办理' END) AS  FlowOperateName"
+            string strSql = "SELECT CompletionReport.CompletionReportId,CompletionReport.ProjectId,CodeRecords.Code AS CompletionReportCode,CompletionReport.CompletionReportName,CompletionReport.FileContent,CompletionReport.CompileMan,CompletionReport.CompileDate,CompletionReport.States,CompletionReport.Remark"
                        + @" FROM Manager_CompletionReport AS  CompletionReport "
                        + @" LEFT JOIN Sys_CodeRecords AS CodeRecords ON CompletionReport.CompletionReportId=CodeRecords.DataId "
                        + @" LEFT JOIN Sys_FlowOperate AS FlowOperate ON CompletionReport.CompletionReportId=FlowOperate.DataId AND FlowOperate.IsClosed <> 1"