diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 1721e33..0a79d2b 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("23.05.31.0830")] -[assembly: AssemblyFileVersion("23.05.31.0830")] +[assembly: AssemblyVersion("23.06.08.1140")] +[assembly: AssemblyFileVersion("23.06.08.1140")] diff --git a/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs b/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs index 02d96a5..b396b9a 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs @@ -755,7 +755,14 @@ namespace FPJ0000.JobReport_ var oldtext = this.richTextBoxEx1.Text; this.richTextBoxEx1.Rtf = dr.body; if (String.IsNullOrEmpty(this.richTextBoxEx1.Text) == false) - this.richTextBoxEx1.Text += "\r\n\r\n" + oldtext; + { + this.richTextBoxEx1.rtb.AppendText("\n\n"); + this.richTextBoxEx1.rtb.SelectionLength = 1; + this.richTextBoxEx1.rtb.SelectionStart = this.richTextBoxEx1.rtb.TextLength; + this.richTextBoxEx1.rtb.ForeColor = Color.Black; + this.richTextBoxEx1.rtb.AppendText(oldtext); + } + //this.richTextBoxEx1.Text += oldtext; //this.richTextBoxEx1.Text += oldtext; diff --git a/SubProject/FPJ0000/Project/DSProjectSummary.Designer.cs b/SubProject/FPJ0000/Project/DSProjectSummary.Designer.cs index ea7557c..c7a3e11 100644 --- a/SubProject/FPJ0000/Project/DSProjectSummary.Designer.cs +++ b/SubProject/FPJ0000/Project/DSProjectSummary.Designer.cs @@ -3468,14 +3468,11 @@ ORDER BY prj"; this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = @"SELECT dbo.getUserName(championid) as username,championid -FROM Projects -WHERE gcode= @gcode -and championid is not null -and isnull(div,'') <> 'EB' -AND [status] in ('검토','보류','진행','완료') -group by championid,dbo.getUserName(championid) -order by username"; + this._commandCollection[0].CommandText = @"SELECT dbo.getUserName(championid) AS username, championid +FROM Projects +WHERE (gcode = @gcode) AND (ISNULL(div, '') <> 'EB') AND (status IN ('검토', '보류', '진행', '완료')) AND (ISNULL(championid, '') <> '') +GROUP BY championid, dbo.getUserName(championid) +ORDER BY username"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } diff --git a/SubProject/FPJ0000/Project/DSProjectSummary.xsd b/SubProject/FPJ0000/Project/DSProjectSummary.xsd index d7ffc14..9229209 100644 --- a/SubProject/FPJ0000/Project/DSProjectSummary.xsd +++ b/SubProject/FPJ0000/Project/DSProjectSummary.xsd @@ -45,15 +45,12 @@ ORDER BY prj - - SELECT dbo.getUserName(championid) as username,championid -FROM Projects -WHERE gcode= @gcode -and championid is not null -and isnull(div,'') <> 'EB' -AND [status] in ('검토','보류','진행','완료') -group by championid,dbo.getUserName(championid) -order by username + + SELECT dbo.getUserName(championid) AS username, championid +FROM Projects +WHERE (gcode = @gcode) AND (ISNULL(div, '') <> 'EB') AND (status IN ('검토', '보류', '진행', '완료')) AND (ISNULL(championid, '') <> '') +GROUP BY championid, dbo.getUserName(championid) +ORDER BY username @@ -139,10 +136,10 @@ ORDER BY (CASE WHEN ([status] = '진행') THEN '0' WHEN ([status] = '검토') TH - + - + @@ -155,7 +152,7 @@ ORDER BY (CASE WHEN ([status] = '진행') THEN '0' WHEN ([status] = '검토') TH - + @@ -165,7 +162,7 @@ ORDER BY (CASE WHEN ([status] = '진행') THEN '0' WHEN ([status] = '검토') TH - + @@ -175,7 +172,7 @@ ORDER BY (CASE WHEN ([status] = '진행') THEN '0' WHEN ([status] = '검토') TH - +