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

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

@@ -4,7 +4,6 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
-using System.Text;
 
 namespace FineUIPro.Web.Comprehensive
 {
@@ -22,7 +21,7 @@ namespace FineUIPro.Web.Comprehensive
             if (!IsPostBack)
             {
                 GetButtonPower();
-                BLL.DesignProfessionalService.InitDesignProfessionalDownList(this.sdrpCNProfessionalId, true);
+                BLL.CNProfessionalService.InitCNProfessionalDownList(this.sdrpCNProfessionalId, true);
                 BindGrid();
             }
         }
@@ -46,10 +45,11 @@ namespace FineUIPro.Web.Comprehensive
                                      C.Remark, 
                                      C.RemarkCode, 
                                      C.UnitWorkId,
+                                     C.Status,
                                      CN.ProfessionalName"
                             + @" FROM Comprehensive_DesignDrawings C "
-                            + @" LEFT JOIN Base_DesignProfessional CN ON C.CNProfessionalId=CN.DesignProfessionalId"
-                            + @" WHERE C.ProjectId = @ProjectId";
+                            +@" LEFT JOIN Base_CNProfessional CN ON C.CNProfessionalId=CN.CNProfessionalId"
+                            +@" WHERE C.ProjectId = @ProjectId";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
             if (sdrpCNProfessionalId.SelectedValue != BLL.Const._Null)
@@ -59,13 +59,13 @@ namespace FineUIPro.Web.Comprehensive
             }
             if (!string.IsNullOrEmpty(this.stxtReceiveDate.Text.Trim()))
             {
-                strSql += " AND C.ReceiveDate=@ReceiveDate";
-                listStr.Add(new SqlParameter("@ReceiveDate", stxtReceiveDate.Text.Trim()));
+                strSql += " AND C.ReceiveDate='"+ stxtReceiveDate.Text.Trim()+"'";
+                
             }
             if (!string.IsNullOrEmpty(this.stxtSendDate.Text.Trim()))
             {
-                strSql += " AND C.SendDate=@SendDate";
-                listStr.Add(new SqlParameter("@SendDate", stxtSendDate.Text.Trim()));
+                strSql += " AND C.SendDate='"+stxtSendDate.Text.Trim()+"'";
+                
             }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
@@ -314,23 +314,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
     }
 }