diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user index 63ca13cc..9e91deff 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/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs index c441a280..c6ac17f1 100644 --- a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs @@ -144,20 +144,20 @@ namespace FineUIPro.Web.PZHGL.GJSX Model.GJSX gjsx = BLL.GJSXService.GetGJSXById(ID); - List listStr = new List(); - string projectId = this.CurrUser.LoginProjectId; - if (gjsx != null) - { - projectId = gjsx.ProjectId; - } - listStr.Add(new SqlParameter("@ProjectId", projectId)); - string sql = "and GJSXID='" + ID + "'"; - listStr.Add(new SqlParameter("@sql_where", sql)); - SqlParameter[] parameter = listStr.ToArray(); - DataTable tb = SQLHelper.GetDataTableRunProc("Sp_GJSX_getlist", parameter); + //List listStr = new List(); + //string projectId = this.CurrUser.LoginProjectId; + //if (gjsx != null) + //{ + // projectId = gjsx.ProjectId; + //} + //listStr.Add(new SqlParameter("@ProjectId", projectId)); + //string sql = "and GJSXID='" + ID + "'"; + //listStr.Add(new SqlParameter("@sql_where", sql)); + //SqlParameter[] parameter = listStr.ToArray(); + //DataTable tb = SQLHelper.GetDataTableRunProc("Sp_GJSX_getlist", parameter); - if (tb != null && tb.Rows.Count > 0) - { + //if (tb != null && tb.Rows.Count > 0) + //{ txtGJSXID.Text = gjsx.GJSXID; DropUnitId.SelectedValue = gjsx.UnitId; if (!string.IsNullOrEmpty(gjsx.CNProfessional_ID)) @@ -181,13 +181,24 @@ namespace FineUIPro.Web.PZHGL.GJSX DropUser_ReceiveID.SelectedValueArray = list_User_ReceiveID.ToArray(); } // Date_CloseDate.Text = tb.Rows[0]["CloseDate"].ToString(); - txtDetail.Text = tb.Rows[0]["detail"].ToString(); - txtUserID.Text = tb.Rows[0]["username"].ToString().Trim(); - Date_CreateDate.Text = tb.Rows[0]["createDate"].ToString(); - Date_CompleteDate.Text = tb.Rows[0]["CompleteDate"].ToString(); + //txtDetail.Text = tb.Rows[0]["detail"].ToString(); + //txtUserID.Text = tb.Rows[0]["username"].ToString().Trim(); + //Date_CreateDate.Text = tb.Rows[0]["createDate"].ToString(); + //Date_CompleteDate.Text = tb.Rows[0]["CompleteDate"].ToString(); + + txtDetail.Text = gjsx.Detail; + txtUserID.Text = BLL.UserService.GetUserNameByUserId(gjsx.UserID); + if (gjsx.CreateDate != null) + { + Date_CreateDate.Text = string.Format("{0:yyyy-MM-dd}",gjsx.CreateDate); + } + if (gjsx.CompleteDate != null) + { + Date_CompleteDate.Text = string.Format("{0:yyyy-MM-dd}", gjsx.CompleteDate); + } rblState.SelectedValue = gjsx.State.ToString().Trim(); - } + //} if (this.CurrUser.UserId == BLL.Const.sysglyId || this.CurrUser.UserId == BLL.Const.SystemManager)//如果当前登录人是管理员 diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index aae34665..56282e91 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -77,7 +77,7 @@ - + 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