diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/JointComprehensive.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/JointComprehensive.aspx.cs index 798c509..7bc7d06 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/JointComprehensive.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/JointComprehensive.aspx.cs @@ -73,9 +73,13 @@ namespace FineUIPro.Web.HJGL.WeldingReport private void BindGrid() { string strSql = @"SELECT v.*," - + @" ci.CHT_FilmDate as CHT_CheckDate," - + @" c.CHT_CheckCode CHT_CheckCode,c.CHT_CheckID" - + @" FROM V_JOINTVIEW v left join CH_CheckItem ci on ci.JOT_ID=v.JOT_ID left join CH_Check c on ci.CHT_CheckID = c.CHT_CheckID WHERE 1=1 "; + + @" checks.CHT_FilmDate as CHT_CheckDate," + + @" checks.CHT_CheckCode " + + @" FROM V_JOINTVIEW v " + + @" LEFT JOIN (SELECT DISTINCT ci.JOT_ID, ci.CHT_FilmDate ,c.CHT_CheckCode FROM CH_CheckItem AS ci + LEFT JOIN CH_Check AS c ON c.CHT_CheckID = ci.CHT_CheckID + ) AS checks ON checks.JOT_ID = v.JOT_ID" + + @" WHERE 1=1 "; List listStr = new List(); strSql += " AND v.ProjectId = @ProjectId"; listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); @@ -172,8 +176,9 @@ namespace FineUIPro.Web.HJGL.WeldingReport { percent = 0; url = ""; - string strSql = @"SELECT v.* ,ci.CHT_FilmDate - FROM V_JOINTVIEW v left join CH_CheckItem ci on ci.JOT_ID=v.JOT_ID left join CH_Check c on ci.CHT_CheckID = c.CHT_CheckID WHERE "; + string strSql = @"SELECT v.*" + + @" FROM V_JOINTVIEW v " + + @" WHERE "; List listStr = new List(); strSql += " v.ProjectId = @ProjectId"; listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); @@ -256,12 +261,12 @@ namespace FineUIPro.Web.HJGL.WeldingReport - for (int i = 1; i <= tb.Rows.Count; i++) + for (int i = 0; i < tb.Rows.Count; i++) { try { - var row = recordSheet.CreateRow(i); - row.CreateCell(0).SetCellValue("" + i); + var row = recordSheet.CreateRow(i+1); + row.CreateCell(0).SetCellValue("" + (i+1)); row.CreateCell(1).SetCellValue(tb.Rows[i]["WorkAreaCode"] != DBNull.Value ? tb.Rows[i]["WorkAreaCode"].ToString() : ""); row.CreateCell(2).SetCellValue(tb.Rows[i]["ISO_ISONO"] != DBNull.Value ? tb.Rows[i]["ISO_ISONO"].ToString() : ""); row.CreateCell(3).SetCellValue(tb.Rows[i]["JOT_BelongPipe"] != DBNull.Value ? tb.Rows[i]["JOT_BelongPipe"].ToString() : ""); @@ -293,11 +298,11 @@ namespace FineUIPro.Web.HJGL.WeldingReport row.CreateCell(19).SetCellValue(tb.Rows[i]["ProessDate"] != DBNull.Value ? ((DateTime)tb.Rows[i]["ProessDate"]).ToString("yyyy-MM-dd") : ""); } catch (Exception e) { } - try - { - row.CreateCell(20).SetCellValue(tb.Rows[i]["CHT_CHECKDATE"] != DBNull.Value ? ((DateTime)tb.Rows[i]["CHT_FilmDate"]).ToString("yyyy-MM-dd") : ""); - } - catch (Exception e) { } + //try + //{ + // row.CreateCell(20).SetCellValue(tb.Rows[i]["CHT_CHECKDATE"] != DBNull.Value ? ((DateTime)tb.Rows[i]["CHT_FilmDate"]).ToString("yyyy-MM-dd") : ""); + //} + //catch (Exception e) { } row.CreateCell(21).SetCellValue(tb.Rows[i]["JOT_Size"] != DBNull.Value ? tb.Rows[i]["JOT_Size"].ToString() : ""); row.CreateCell(22).SetCellValue(tb.Rows[i]["WMT_MatCode"] != DBNull.Value ? tb.Rows[i]["WMT_MatCode"].ToString() : ""); row.CreateCell(23).SetCellValue(tb.Rows[i]["WMT_Matname"] != DBNull.Value ? tb.Rows[i]["WMT_Matname"].ToString() : ""); @@ -320,9 +325,9 @@ namespace FineUIPro.Web.HJGL.WeldingReport row.CreateCell(32).SetCellValue(tb.Rows[i]["WeldTypeCode"] != DBNull.Value ? tb.Rows[i]["WeldTypeCode"].ToString() : ""); - if ((int)(90 * i / tb.Rows.Count) > percent) + if ((int)(90 * (i + 1) / tb.Rows.Count) > percent) { - percent = (int)(90 * i / tb.Rows.Count); + percent = (int)(90 * (i+1) / tb.Rows.Count); } }