From 82b3d600fb7d08fd00986e0021436f9b5cc64f63 Mon Sep 17 00:00:00 2001
From: chi <chikyun.kim@amkor.co.kr>
Date: Mon, 26 Jun 2023 14:42:39 +0900
Subject: [PATCH] ..

---
 .gitignore                                    |  1 +
 Project/Properties/AssemblyInfo.cs            |  4 +-
 .../FBS0000/Holiday/rHolidaySummary.rdlc      | 47 ++++++++++---------
 SubProject/FBS0000/dsReport.Designer.cs       |  6 +--
 SubProject/FBS0000/dsReport.xsd               |  6 +--
 5 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6eef48d..008edfa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ obj
 *.suo
 /.vs/EETGW/v15/Server/sqlite3
 /packages
+/.vs/EETGW
diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs
index 385f98f..e8c6da7 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.06.22.2300")]
-[assembly: AssemblyFileVersion("23.06.22.2300")]
+[assembly: AssemblyVersion("23.06.26.1430")]
+[assembly: AssemblyFileVersion("23.06.26.1430")]
diff --git a/SubProject/FBS0000/Holiday/rHolidaySummary.rdlc b/SubProject/FBS0000/Holiday/rHolidaySummary.rdlc
index 3e35ccc..fdfaa99 100644
--- a/SubProject/FBS0000/Holiday/rHolidaySummary.rdlc
+++ b/SubProject/FBS0000/Holiday/rHolidaySummary.rdlc
@@ -374,7 +374,7 @@
                         <Paragraph>
                           <TextRuns>
                             <TextRun>
-                              <Value>=iif(Fields!cate.Value = "대체", sum(Fields!DrTime.Value) , sum(Fields!DrDay.Value) )</Value>
+                              <Value>= iif(Fields!cate.Value = "외출", nothing,  iif(Fields!cate.Value = "대체", sum(Fields!DrTime.Value) , sum(Fields!DrDay.Value) ))</Value>
                               <Style>
                                 <FontFamily>맑은 고딕</FontFamily>
                                 <FontSize>9pt</FontSize>
@@ -490,7 +490,7 @@
                         <Paragraph>
                           <TextRuns>
                             <TextRun>
-                              <Value>=iif(Fields!cate.Value = "대체", sum(Fields!DrTime.Value) , sum(Fields!DrDay.Value) ) - iif(Fields!cate.Value = "대체", sum(Fields!CrTime.Value) , sum(Fields!CrDay.Value) )</Value>
+                              <Value>= iif(Fields!cate.Value = "외출", nothing, iif(Fields!cate.Value = "대체", sum(Fields!DrTime.Value) , sum(Fields!DrDay.Value) ) - iif(Fields!cate.Value = "대체", sum(Fields!CrTime.Value) , sum(Fields!CrDay.Value) ))</Value>
                               <Style>
                                 <FontFamily>맑은 고딕</FontFamily>
                                 <FontSize>9pt</FontSize>
@@ -548,9 +548,9 @@
                         <Paragraph>
                           <TextRuns>
                             <TextRun>
-                              <Value>=iif(Fields!cate.Value = "대체",  
+                              <Value>= iif(Fields!cate.Value = "외출", nothing, iif(Fields!cate.Value = "대체",  
 iif(sum(Fields!DrTime.Value) &gt;0, Math.Round( (sum(fields!CrTime.Value) / sum(Fields!DrTime.Value))*100,1) ,0) ,
-iif(sum(Fields!DrDay.Value) &gt;0, Math.Round( (sum(fields!CrDay.Value) / sum(Fields!DrDay.Value))*100,1),0))</Value>
+iif(sum(Fields!DrDay.Value) &gt;0, Math.Round( (sum(fields!CrDay.Value) / sum(Fields!DrDay.Value))*100,1),0)))</Value>
                               <Style>
                                 <FontFamily>맑은 고딕</FontFamily>
                                 <FontSize>9pt</FontSize>
@@ -666,7 +666,7 @@ iif(sum(Fields!DrDay.Value) &gt;0, Math.Round( (sum(fields!CrDay.Value) / sum(Fi
                         <Paragraph>
                           <TextRuns>
                             <TextRun>
-                              <Value>=Sum(Fields!CrDay.Value)</Value>
+                              <Value>=Sum( iif(Fields!cate.Value = "외출", 0 , Fields!CrDay.Value))</Value>
                               <Style>
                                 <FontFamily>맑은 고딕</FontFamily>
                                 <FontSize>9pt</FontSize>
@@ -724,7 +724,7 @@ iif(sum(Fields!DrDay.Value) &gt;0, Math.Round( (sum(fields!CrDay.Value) / sum(Fi
                         <Paragraph>
                           <TextRuns>
                             <TextRun>
-                              <Value>=Sum(Fields!DrDay.Value)-Sum(Fields!CrDay.Value)</Value>
+                              <Value>=Sum(iif(Fields!cate.Value = "외출", 0 ,Fields!DrDay.Value))-Sum(iif(Fields!cate.Value = "외출", 0 ,Fields!CrDay.Value))</Value>
                               <Style>
                                 <FontFamily>맑은 고딕</FontFamily>
                                 <FontSize>9pt</FontSize>
@@ -782,7 +782,7 @@ iif(sum(Fields!DrDay.Value) &gt;0, Math.Round( (sum(fields!CrDay.Value) / sum(Fi
                         <Paragraph>
                           <TextRuns>
                             <TextRun>
-                              <Value>=iif(sum(fields!DrDay.Value)&gt; 0, (sum(fields!CrDay.Value)/sum(fields!DrDay.Value))*100,0)</Value>
+                              <Value>=iif(sum(fields!DrDay.Value)&gt; 0, (sum(iif(Fields!cate.Value = "외출", 0 ,fields!CrDay.Value))/sum(fields!DrDay.Value))*100,0)</Value>
                               <Style>
                                 <FontFamily>맑은 고딕</FontFamily>
                                 <FontSize>9pt</FontSize>
@@ -845,7 +845,7 @@ iif(sum(Fields!DrDay.Value) &gt;0, Math.Round( (sum(fields!CrDay.Value) / sum(Fi
                         <Paragraph>
                           <TextRuns>
                             <TextRun>
-                              <Value>=iif(Fields!cate.Value = "대체", sum(Fields!DrTime.Value) ,sum(Fields!DrDay.Value) )</Value>
+                              <Value>= iif(Fields!cate.Value = "외출", nothing, iif(Fields!cate.Value = "대체", sum(Fields!DrTime.Value) ,sum(Fields!DrDay.Value) ))</Value>
                               <Style>
                                 <FontFamily>맑은 고딕</FontFamily>
                                 <FontSize>9pt</FontSize>
@@ -961,7 +961,7 @@ iif(sum(Fields!DrDay.Value) &gt;0, Math.Round( (sum(fields!CrDay.Value) / sum(Fi
                         <Paragraph>
                           <TextRuns>
                             <TextRun>
-                              <Value>=iif(Fields!cate.Value = "대체", sum(Fields!DrTime.Value) , sum(Fields!DrDay.Value) ) - iif(Fields!cate.Value = "대체", sum(Fields!CrTime.Value) , sum(Fields!CrDay.Value) )</Value>
+                              <Value>= iif(Fields!cate.Value = "외출", nothing, iif(Fields!cate.Value = "대체", sum(Fields!DrTime.Value) , sum(Fields!DrDay.Value) ) - iif(Fields!cate.Value = "대체", sum(Fields!CrTime.Value) , sum(Fields!CrDay.Value) ))</Value>
                               <Style>
                                 <FontFamily>맑은 고딕</FontFamily>
                                 <FontSize>9pt</FontSize>
@@ -1019,9 +1019,9 @@ iif(sum(Fields!DrDay.Value) &gt;0, Math.Round( (sum(fields!CrDay.Value) / sum(Fi
                         <Paragraph>
                           <TextRuns>
                             <TextRun>
-                              <Value>=iif(Fields!cate.Value = "대체",  
+                              <Value>= iif(Fields!cate.Value = "외출", nothing, iif(Fields!cate.Value = "대체",  
 iif(sum(Fields!DrTime.Value) &gt;0, Math.Round( (sum(fields!CrTime.Value) / sum(Fields!DrTime.Value))*100,1) ,0) ,
-iif(sum(Fields!DrDay.Value) &gt;0, Math.Round( (sum(fields!CrDay.Value) / sum(Fields!DrDay.Value))*100,1),0))</Value>
+iif(sum(Fields!DrDay.Value) &gt;0, Math.Round( (sum(fields!CrDay.Value) / sum(Fields!DrDay.Value))*100,1),0)))</Value>
                               <Style>
                                 <FontFamily>맑은 고딕</FontFamily>
                                 <FontSize>9pt</FontSize>
@@ -1137,7 +1137,7 @@ iif(sum(Fields!DrDay.Value) &gt;0, Math.Round( (sum(fields!CrDay.Value) / sum(Fi
                         <Paragraph>
                           <TextRuns>
                             <TextRun>
-                              <Value>=Sum(Fields!CrDay.Value)</Value>
+                              <Value>=Sum(iif(Fields!cate.Value = "외출", 0 ,Fields!CrDay.Value))</Value>
                               <Style>
                                 <FontFamily>맑은 고딕</FontFamily>
                                 <FontSize>9pt</FontSize>
@@ -1195,7 +1195,7 @@ iif(sum(Fields!DrDay.Value) &gt;0, Math.Round( (sum(fields!CrDay.Value) / sum(Fi
                         <Paragraph>
                           <TextRuns>
                             <TextRun>
-                              <Value>=Sum(Fields!DrDay.Value)-Sum(Fields!CrDay.Value)</Value>
+                              <Value>=Sum(iif(Fields!cate.Value = "외출", 0 ,Fields!DrDay.Value))-Sum(iif(Fields!cate.Value = "외출", 0 ,Fields!CrDay.Value))</Value>
                               <Style>
                                 <FontFamily>맑은 고딕</FontFamily>
                                 <FontSize>9pt</FontSize>
@@ -1253,7 +1253,7 @@ iif(sum(Fields!DrDay.Value) &gt;0, Math.Round( (sum(fields!CrDay.Value) / sum(Fi
                         <Paragraph>
                           <TextRuns>
                             <TextRun>
-                              <Value>=iif(sum(fields!DrDay.Value)&gt; 0, (sum(fields!CrDay.Value)/sum(fields!DrDay.Value))*100,0)</Value>
+                              <Value>=iif(sum(fields!DrDay.Value)&gt; 0, (sum(iif(Fields!cate.Value = "외출", 0 ,fields!CrDay.Value))/sum(fields!DrDay.Value))*100,0)</Value>
                               <Style>
                                 <FontFamily>맑은 고딕</FontFamily>
                                 <FontSize>9pt</FontSize>
@@ -1316,7 +1316,7 @@ iif(sum(Fields!DrDay.Value) &gt;0, Math.Round( (sum(fields!CrDay.Value) / sum(Fi
                         <Paragraph>
                           <TextRuns>
                             <TextRun>
-                              <Value>=iif(Fields!cate.Value = "대체", sum(Fields!DrTime.Value) ,sum(Fields!DrDay.Value) )</Value>
+                              <Value>= iif(Fields!cate.Value = "외출", nothing, iif(Fields!cate.Value = "대체", sum(Fields!DrTime.Value) ,sum(Fields!DrDay.Value) ))</Value>
                               <Style>
                                 <FontFamily>맑은 고딕</FontFamily>
                                 <FontSize>9pt</FontSize>
@@ -1432,7 +1432,7 @@ iif(sum(Fields!DrDay.Value) &gt;0, Math.Round( (sum(fields!CrDay.Value) / sum(Fi
                         <Paragraph>
                           <TextRuns>
                             <TextRun>
-                              <Value>=iif(Fields!cate.Value = "대체", sum(Fields!DrTime.Value) , sum(Fields!DrDay.Value) ) - iif(Fields!cate.Value = "대체", sum(Fields!CrTime.Value) , sum(Fields!CrDay.Value) )</Value>
+                              <Value>= iif(Fields!cate.Value = "외출", nothing, iif(Fields!cate.Value = "대체", sum(Fields!DrTime.Value) , sum(Fields!DrDay.Value) ) - iif(Fields!cate.Value = "대체", sum(Fields!CrTime.Value) , sum(Fields!CrDay.Value) ))</Value>
                               <Style>
                                 <FontFamily>맑은 고딕</FontFamily>
                                 <FontSize>9pt</FontSize>
@@ -1490,9 +1490,9 @@ iif(sum(Fields!DrDay.Value) &gt;0, Math.Round( (sum(fields!CrDay.Value) / sum(Fi
                         <Paragraph>
                           <TextRuns>
                             <TextRun>
-                              <Value>=iif(Fields!cate.Value = "대체",  
+                              <Value>= iif(Fields!cate.Value = "외출", nothing, iif(Fields!cate.Value = "대체",  
 iif(sum(Fields!DrTime.Value) &gt;0, Math.Round( (sum(fields!CrTime.Value) / sum(Fields!DrTime.Value))*100,1) ,0) ,
-iif(sum(Fields!DrDay.Value) &gt;0, Math.Round( (sum(fields!CrDay.Value) / sum(Fields!DrDay.Value))*100,1),0))</Value>
+iif(sum(Fields!DrDay.Value) &gt;0, Math.Round( (sum(fields!CrDay.Value) / sum(Fields!DrDay.Value))*100,1),0)))</Value>
                               <Style>
                                 <FontFamily>맑은 고딕</FontFamily>
                                 <FontSize>9pt</FontSize>
@@ -1608,7 +1608,7 @@ iif(sum(Fields!DrDay.Value) &gt;0, Math.Round( (sum(fields!CrDay.Value) / sum(Fi
                         <Paragraph>
                           <TextRuns>
                             <TextRun>
-                              <Value>=Sum(Fields!CrDay.Value)</Value>
+                              <Value>=Sum(iif(Fields!cate.Value = "외출", 0 ,Fields!CrDay.Value))</Value>
                               <Style>
                                 <FontFamily>맑은 고딕</FontFamily>
                                 <FontSize>9pt</FontSize>
@@ -1666,7 +1666,7 @@ iif(sum(Fields!DrDay.Value) &gt;0, Math.Round( (sum(fields!CrDay.Value) / sum(Fi
                         <Paragraph>
                           <TextRuns>
                             <TextRun>
-                              <Value>=Sum(Fields!DrDay.Value)-Sum(Fields!CrDay.Value)</Value>
+                              <Value>=Sum(iif(Fields!cate.Value = "외출", 0 ,Fields!DrDay.Value))-Sum(iif(Fields!cate.Value = "외출", 0 ,Fields!CrDay.Value))</Value>
                               <Style>
                                 <FontFamily>맑은 고딕</FontFamily>
                                 <FontSize>9pt</FontSize>
@@ -1724,7 +1724,7 @@ iif(sum(Fields!DrDay.Value) &gt;0, Math.Round( (sum(fields!CrDay.Value) / sum(Fi
                         <Paragraph>
                           <TextRuns>
                             <TextRun>
-                              <Value>=iif(sum(fields!DrDay.Value)&gt; 0, (sum(fields!CrDay.Value)/sum(fields!DrDay.Value))*100,0)</Value>
+                              <Value>=iif(sum(fields!DrDay.Value)&gt; 0, (sum(iif(Fields!cate.Value = "외출", 0 ,fields!CrDay.Value))/sum(fields!DrDay.Value))*100,0)</Value>
                               <Style>
                                 <FontFamily>맑은 고딕</FontFamily>
                                 <FontSize>9pt</FontSize>
@@ -1771,6 +1771,7 @@ iif(sum(Fields!DrDay.Value) &gt;0, Math.Round( (sum(fields!CrDay.Value) / sum(Fi
                         <PaddingBottom>2pt</PaddingBottom>
                       </Style>
                     </Textbox>
+                    <rd:Selected>true</rd:Selected>
                   </CellContents>
                 </TablixCell>
               </TablixCells>
@@ -1859,7 +1860,7 @@ iif(sum(Fields!DrDay.Value) &gt;0, Math.Round( (sum(fields!CrDay.Value) / sum(Fi
                           <Paragraph>
                             <TextRuns>
                               <TextRun>
-                                <Value>= iif(Fields!cate.Value = "대체" ,  Fields!cate.Value  &amp; "(시간)" , Fields!cate.Value &amp; "(일)")</Value>
+                                <Value>=  Fields!cate.Value  &amp; iif(Fields!cate.Value = "대체" ,   "(시간)" , iif(Fields!cate.Value ="외출",  "(건)",  "(일)"))</Value>
                                 <Style>
                                   <FontFamily>맑은 고딕</FontFamily>
                                   <FontSize>9pt</FontSize>
@@ -2816,7 +2817,7 @@ iif(sum(Fields!DrDay.Value) &gt;0, Math.Round( (sum(fields!CrDay.Value) / sum(Fi
     <Height>1.50066in</Height>
     <Style />
   </Body>
-  <Width>8.7993in</Width>
+  <Width>7.50009in</Width>
   <Page>
     <PageHeight>21cm</PageHeight>
     <PageWidth>29.7cm</PageWidth>
diff --git a/SubProject/FBS0000/dsReport.Designer.cs b/SubProject/FBS0000/dsReport.Designer.cs
index 7d9f567..0d47b0f 100644
--- a/SubProject/FBS0000/dsReport.Designer.cs
+++ b/SubProject/FBS0000/dsReport.Designer.cs
@@ -2699,12 +2699,12 @@ namespace FBS0000.dsReportTableAdapters {
             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  Holyday.uid, Users.name, Holyday.cate, Holyday.term AS CrDay, Holyday.termDr AS DrDay, Holyday.DrTime, Holyday.CrTime, Holyday.gcode, EETGW_GroupUser.Process
+            this._commandCollection[0].CommandText = @"SELECT  Holyday.uid, Users.name, Holyday.cate, (CASE cate WHEN '외출' THEN 1 ELSE Holyday.term END) AS CrDay, Holyday.termDr AS DrDay, Holyday.DrTime, Holyday.CrTime, Holyday.gcode, 
+               EETGW_GroupUser.Process
 FROM     Users INNER JOIN
                Holyday ON Users.id = Holyday.uid LEFT OUTER JOIN
                EETGW_GroupUser ON Holyday.uid = EETGW_GroupUser.uid AND Holyday.gcode = EETGW_GroupUser.gcode
-WHERE  (Holyday.gcode = @gcode) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (EETGW_GroupUser.level > 0) AND (ISNULL(EETGW_GroupUser.useUserState, 0) = 1) AND 
-               (ISNULL(EETGW_GroupUser.exceptHoly, 0) = 0)
+WHERE  (Holyday.gcode = @gcode) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (EETGW_GroupUser.level > 0) AND (ISNULL(EETGW_GroupUser.useUserState, 0) = 1)
 ORDER BY Holyday.uid, CrDay";
             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/FBS0000/dsReport.xsd b/SubProject/FBS0000/dsReport.xsd
index 87d4d74..5a6f829 100644
--- a/SubProject/FBS0000/dsReport.xsd
+++ b/SubProject/FBS0000/dsReport.xsd
@@ -12,12 +12,12 @@
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>SELECT  Holyday.uid, Users.name, Holyday.cate, Holyday.term AS CrDay, Holyday.termDr AS DrDay, Holyday.DrTime, Holyday.CrTime, Holyday.gcode, EETGW_GroupUser.Process
+                    <CommandText>SELECT  Holyday.uid, Users.name, Holyday.cate, (CASE cate WHEN '외출' THEN 1 ELSE Holyday.term END) AS CrDay, Holyday.termDr AS DrDay, Holyday.DrTime, Holyday.CrTime, Holyday.gcode, 
+               EETGW_GroupUser.Process
 FROM     Users INNER JOIN
                Holyday ON Users.id = Holyday.uid LEFT OUTER JOIN
                EETGW_GroupUser ON Holyday.uid = EETGW_GroupUser.uid AND Holyday.gcode = EETGW_GroupUser.gcode
-WHERE  (Holyday.gcode = @gcode) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (EETGW_GroupUser.level &gt; 0) AND (ISNULL(EETGW_GroupUser.useUserState, 0) = 1) AND 
-               (ISNULL(EETGW_GroupUser.exceptHoly, 0) = 0)
+WHERE  (Holyday.gcode = @gcode) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (EETGW_GroupUser.level &gt; 0) AND (ISNULL(EETGW_GroupUser.useUserState, 0) = 1)
 ORDER BY Holyday.uid, CrDay</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />