2023-04-28 天辰质量报验移植

SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx.cs

@@ -4,8 +4,6 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
-using System.Text;
-
 namespace FineUIPro.Web.Comprehensive
 {
     public partial class SiteVisaManagement : PageBase
@@ -32,7 +30,7 @@ namespace FineUIPro.Web.Comprehensive
         /// </summary>
         public void BindGrid()
         {
-            string strSql = @"select VisaId,VisaCode, VisaReson, VisaDate, 
+            string strSql = @"select VisaId,VisaCode, VisaReson, VisaDate, Status,
                               EstimatedCost, Confirmation,  ConstructionManager, ControlManager, ProcessingState, 
                               AccountingExpenses,VisaContent, Remark, U.UnitName,CN.ProfessionalName ,SignMan,AuditMan,unitWork.UnitWorkName
                               from Comprehensive_SiteVisaManagement C 
@@ -47,6 +45,21 @@ namespace FineUIPro.Web.Comprehensive
                 strSql += " AND C.UnitId=@UnitId";
                 listStr.Add(new SqlParameter("@UnitId", sdrpUnitId.SelectedValue));
             }
+            if (this.sdrpCNProfessionalId.SelectedValue != BLL.Const._Null)
+            {
+                strSql += " AND C.CNProfessionalId=@CNProfessionalId";
+                listStr.Add(new SqlParameter("@CNProfessionalId", sdrpCNProfessionalId.SelectedValue));
+            }
+            if (!string.IsNullOrEmpty(this.txtStarTime.Text.Trim()))
+            {
+                strSql += " AND C.VisaDate >= @startDate";
+                listStr.Add(new SqlParameter("@startDate", this.txtStarTime.Text.Trim()));
+            }
+            if (!string.IsNullOrEmpty(this.txtEndTime.Text.Trim()))
+            {
+                strSql += " AND C.VisaDate <= @endDate";
+                listStr.Add(new SqlParameter("@endDate", this.txtEndTime.Text.Trim()));
+            }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             Grid1.RecordCount = tb.Rows.Count;
@@ -232,23 +245,33 @@ namespace FineUIPro.Web.Comprehensive
         }
         #endregion
 
-        #region 导出按钮
-        /// 导出按钮
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void btnOut_Click(object sender, EventArgs e)
+        public static string ConvertState(object Status)
         {
-            Response.ClearContent();
-            string filename = Funs.GetNewFileName();
-            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("现场签证管理" + filename, System.Text.Encoding.UTF8) + ".xls");
-            Response.ContentType = "application/excel";
-            Response.ContentEncoding = Encoding.UTF8;
-            this.Grid1.PageSize = Grid1.RecordCount;
-            this.BindGrid();
-            Response.Write(GetGridTableHtml2(Grid1));
-            Response.End();
+            if (Status != null)
+            {
+                if (Status.ToString().Trim() == BLL.Const.Comprehensive_ReCompile)
+                {
+                    return "重报";
+                }
+                else if (Status.ToString().Trim() == BLL.Const.Comprehensive_ReJect)
+                {
+                    return "驳回";
+                }
+                else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Compile)
+                {
+                    return "编制";
+                }
+                else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Audit)
+                {
+                    return "待审批";
+                }
+                else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Complete)
+                {
+                    return "审批完成";
+                }
+            }
+
+            return "编制";
         }
-        #endregion
     }
 }