From bd738a47bb2f0bbc468ce005fd65eca802b8e0b1 Mon Sep 17 00:00:00 2001
From: chi <chikyun.kim@amkor.co.kr>
Date: Wed, 30 Aug 2023 17:18:19 +0900
Subject: [PATCH] =?UTF-8?q?=EC=B6=9C=EA=B7=BC=EB=B6=80=20=EB=8D=B0?=
 =?UTF-8?q?=EC=9D=B4=ED=84=B0=20=EB=B3=80=EA=B2=BD=20=EC=9E=94=EB=9F=89=20?=
 =?UTF-8?q?=EC=88=98=EC=8B=9D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SubProject/FBS0000/Holiday/WorkTable.cs | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/SubProject/FBS0000/Holiday/WorkTable.cs b/SubProject/FBS0000/Holiday/WorkTable.cs
index 5a2be00..4f7e64f 100644
--- a/SubProject/FBS0000/Holiday/WorkTable.cs
+++ b/SubProject/FBS0000/Holiday/WorkTable.cs
@@ -69,7 +69,7 @@ namespace FBS0000
 
                 if (curDate.ToShortDateString() == ed.ToShortDateString()) break;
             }
-            cols.AddRange(new string[] { "발생", "사용", "잔여" });
+            cols.AddRange(new string[] { $"발생\n~{sd.AddDays(-1).ToString("MM/dd")}", "사용", $"잔여\n~{ed.ToString("MM/dd")}" });
             coltag.AddRange(new DateTime[] { initdate, initdate, initdate });
 
             //열제목 설정
@@ -148,12 +148,13 @@ namespace FBS0000
                 fpSpread1_Sheet1.Cells[rowindex, 2].Value = item.grade;
                 fpSpread1_Sheet1.Cells[rowindex, 3].Value = item.name;
 
-                if (item.empno == "77607")
+                if (item.empno == "395552")
                 {
 
                 }
                 //이월잔액
                 var jand = qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, item.empno, sd.ToString("yyyy-01-01"), sd.AddDays(-1).ToShortDateString(), "999999");
+                var jan = qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, item.empno, sd.ToString("yyyy-01-01"), ed.ToShortDateString(), "999999");
                 var used = 0.0;
 
                 fpSpread1_Sheet1.Rows[rowindex].ResetBorder();
@@ -255,6 +256,13 @@ namespace FBS0000
                             fpSpread1_Sheet1.Cells[rowindex, c].Tag = "1";
                         }
 
+                        //근태 시작일자가 조회시작일보다 적다면, 데이터가 걸쳐진 것이므로 회색으로 처리하자 2308320
+                        if(dr.sdate.ToShortDateString().CompareTo(sd.ToShortDateString()) < 0)
+                        {
+                            fpSpread1_Sheet1.Cells[rowindex, c].BackColor = Color.DimGray;
+                            fpSpread1_Sheet1.Cells[rowindex, c].ForeColor = Color.White;
+                        }
+
                         if (string.IsNullOrEmpty(dr.contents) == false)
                         {
                             fpSpread1_Sheet1.Cells[rowindex, c].Note += $"({dr.cate}){dr.contents} 기간:{dr.sdate.ToShortDateString()}~{dr.edate.ToShortDateString()}";
@@ -343,10 +351,11 @@ namespace FBS0000
                     fpSpread1_Sheet1.Columns[c].Tag = ps;
                 }
 
-                var jan = jand - used;
-                fpSpread1_Sheet1.Cells[rowindex, c++].Value = jand > 0 ? jand.ToString() : string.Empty;
-                fpSpread1_Sheet1.Cells[rowindex, c++].Value = used > 0 ? used.ToString() : string.Empty;
-                fpSpread1_Sheet1.Cells[rowindex, c++].Value = jan > 0 ? jan.ToString() : string.Empty;
+                used = (float)jand-(float)jan ;
+                //var jan = jand - used;
+                fpSpread1_Sheet1.Cells[rowindex, c++].Value = jand != 0 ? jand.ToString() : string.Empty;
+                fpSpread1_Sheet1.Cells[rowindex, c++].Value = used != 0 ? used.ToString() : string.Empty;
+                fpSpread1_Sheet1.Cells[rowindex, c++].Value = jan != 0 ? jan.ToString() : string.Empty;
 
                 rowindex += 1;
             } // --users