Amkor/Groupware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

toshortstring -> tostring

Browse Source
This commit is contained in:
ChiKyun Kim
2025-12-19 08:23:13 +09:00
parent ab46ccb924
commit b1c3bbac42
76 changed files with 324 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
SubProject/FBS0000/Holiday/WorkTable.cs
View File

@@ -20,7 +20,7 @@ namespace FBS0000
Properties.Settings.Default["gwcs"] = FCOMMON.info.CS;
var sd = DateTime.Now.ToString("yyyy-MM-01");
var ed = DateTime.Parse(sd).AddMonths(1).AddDays(-1).ToShortDateString();// DateTime.Now.AddMonths(1).ToString("yyyy-MM-01")).AddDays(-1).ToShortDateString();
var ed = DateTime.Parse(sd).AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd");// DateTime.Now.AddMonths(1).ToString("yyyy-MM-01")).AddDays(-1).ToString("yyyy-MM-dd");
tbSD.Text = sd;
tbED.Text = ed;
@@ -68,7 +68,7 @@ namespace FBS0000
cols.Add(curDate.Day.ToString("00") + "\r\n" + curDate.DayOfWeek.ToString().Substring(0, 3));
coltag.Add(curDate);
if (curDate.ToShortDateString() == ed.ToShortDateString()) break;
if (curDate.ToString("yyyy-MM-dd") == ed.ToString("yyyy-MM-dd")) break;
}
cols.AddRange(new string[] { $"발생\n~{sd.AddDays(-1).ToString("MM/dd")}", "사용", $"잔여\n~{ed.ToString("MM/dd")}" });
coltag.AddRange(new DateTime[] { initdate, initdate, initdate });
@@ -159,8 +159,8 @@ namespace FBS0000
}
//이월잔액
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 jand = qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, item.empno, sd.ToString("yyyy-01-01"), sd.AddDays(-1).ToString("yyyy-MM-dd"), "999999", "%");
var jan = qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, item.empno, sd.ToString("yyyy-01-01"), ed.ToString("yyyy-MM-dd"), "999999", "%");
var used = 0.0;
fpSpread1_Sheet1.Rows[rowindex].ResetBorder();
@@ -177,7 +177,7 @@ namespace FBS0000
var curDate = sd.AddDays(c - 4);
var bholy = false;
//이날짜가 휴일인지 체크한다.
var drHoly = HolyList.Where(t => t.pdate == curDate.ToShortDateString()).FirstOrDefault();
var drHoly = HolyList.Where(t => t.pdate == curDate.ToString("yyyy-MM-dd")).FirstOrDefault();
if (drHoly != null && drHoly.free)
{
@@ -209,9 +209,9 @@ namespace FBS0000
//입사일이면 메세지 추가
if (item.indate == curDate.ToShortDateString())
if (item.indate == curDate.ToString("yyyy-MM-dd"))
fpSpread1_Sheet1.Cells[rowindex, c].Note += "입사";
if (item.outdate == curDate.ToShortDateString())
if (item.outdate == curDate.ToString("yyyy-MM-dd"))
fpSpread1_Sheet1.Cells[rowindex, c].Note += "퇴사";
//현재인원값
@@ -220,16 +220,16 @@ namespace FBS0000
// Boolean usePerson = true;
//
//if (bIndate == true && curDate.ToShortDateString().CompareTo(dtIn.ToShortDateString()) < 0)
//if (bIndate == true && curDate.ToString("yyyy-MM-dd").CompareTo(dtIn.ToString("yyyy-MM-dd")) < 0)
// usePerson = false;
//if (bOutdate == true && curDate.ToShortDateString().CompareTo(dtOut.ToShortDateString()) > 0)
//if (bOutdate == true && curDate.ToString("yyyy-MM-dd").CompareTo(dtOut.ToString("yyyy-MM-dd")) > 0)
// usePerson = false;
ps[3] = bholy ? 1 : 0;
ps[2] += 1;
//근태기록에 자료가 있는지 확인한다.
var dr = dtHoly.Where(t => t.uid == item.empno && (t.term > 0 || t.CrTime > 0) && (t.sdate.ToShortDateString().CompareTo(curDate.ToShortDateString()) <= 0 && t.edate.ToShortDateString().CompareTo(curDate.ToShortDateString()) >= 0)).FirstOrDefault();
var dr = dtHoly.Where(t => t.uid == item.empno && (t.term > 0 || t.CrTime > 0) && (t.sdate.ToString("yyyy-MM-dd").CompareTo(curDate.ToString("yyyy-MM-dd")) <= 0 && t.edate.ToString("yyyy-MM-dd").CompareTo(curDate.ToString("yyyy-MM-dd")) >= 0)).FirstOrDefault();
if (dr != null && fpSpread1_Sheet1.Cells[rowindex, c].Tag == null) //휴일이 아니여야 한다
{
@@ -263,7 +263,7 @@ namespace FBS0000
}
//근태 시작일자가 조회시작일보다 적다면, 데이터가 걸쳐진 것이므로 회색으로 처리하자 2308320
if (dr.sdate.ToShortDateString().CompareTo(sd.ToShortDateString()) < 0)
if (dr.sdate.ToString("yyyy-MM-dd").CompareTo(sd.ToString("yyyy-MM-dd")) < 0)
{
fpSpread1_Sheet1.Cells[rowindex, c].BackColor = Color.DimGray;
fpSpread1_Sheet1.Cells[rowindex, c].ForeColor = Color.White;
@@ -271,11 +271,11 @@ namespace FBS0000
if (string.IsNullOrEmpty(dr.contents) == false)
{
fpSpread1_Sheet1.Cells[rowindex, c].Note += $"({dr.cate}){dr.contents} 기간:{dr.sdate.ToShortDateString()}~{dr.edate.ToShortDateString()}";
fpSpread1_Sheet1.Cells[rowindex, c].Note += $"({dr.cate}){dr.contents} 기간:{dr.sdate.ToString("yyyy-MM-dd")}~{dr.edate.ToString("yyyy-MM-dd")}";
}
else if (dr.sdate.ToShortDateString() != dr.edate.ToShortDateString())
else if (dr.sdate.ToString("yyyy-MM-dd") != dr.edate.ToString("yyyy-MM-dd"))
{
fpSpread1_Sheet1.Cells[rowindex, c].Note += $"({dr.cate}) 기간:{dr.sdate.ToShortDateString()}~{dr.edate.ToShortDateString()}";
fpSpread1_Sheet1.Cells[rowindex, c].Note += $"({dr.cate}) 기간:{dr.sdate.ToString("yyyy-MM-dd")}~{dr.edate.ToString("yyyy-MM-dd")}";
}
//else fpSpread1_Sheet1.Cells[rowindex, c].Note = string.Empty;
}
@@ -284,7 +284,7 @@ namespace FBS0000
ps[0] += 1;
var pdate = curDate.ToShortDateString();
var pdate = curDate.ToString("yyyy-MM-dd");
if (pdate == "2022-02-07" && item.empno == "66630")
{
@@ -335,7 +335,7 @@ namespace FBS0000
var celltag = fpSpread1_Sheet1.Cells[rowindex, c].Tag;
if (celltag == null) //다른곳에서 지정했다면 처리하지 않는다.
{
if (DateTime.Now.ToShortDateString().CompareTo(pdate) > 0)
if (DateTime.Now.ToString("yyyy-MM-dd").CompareTo(pdate) > 0)
{
fpSpread1_Sheet1.Cells[rowindex, c].Value = "--";
fpSpread1_Sheet1.Cells[rowindex, c].ForeColor = Color.Red;
@@ -482,8 +482,8 @@ namespace FBS0000
var f = new FCOMMON.fSelectMonth();
if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return;
var sdDate = DateTime.Parse(DateTime.Now.ToString("yyyy-") + f.selectmon.ToString() + "-01");
tbSD.Text = sdDate.ToShortDateString();
tbED.Text = sdDate.AddMonths(1).AddDays(-1).ToShortDateString();
tbSD.Text = sdDate.ToString("yyyy-MM-dd");
tbED.Text = sdDate.AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd");
this.RefreshData();
}
@@ -517,8 +517,8 @@ namespace FBS0000
var sd = DateTime.Parse(DateTime.Parse(tbSD.Text).ToString("yyyy-MM-01"));
sd = sd.AddMonths(-1);
var ed = sd.AddMonths(1).AddDays(-1);
tbSD.Text = sd.ToShortDateString();
tbED.Text = ed.ToShortDateString();
tbSD.Text = sd.ToString("yyyy-MM-dd");
tbED.Text = ed.ToString("yyyy-MM-dd");
}
private void toolStripButton5_Click(object sender, EventArgs e)
@@ -526,8 +526,8 @@ namespace FBS0000
var sd = DateTime.Parse(DateTime.Parse(tbSD.Text).ToString("yyyy-MM-01"));
sd = sd.AddMonths(1);
var ed = sd.AddMonths(1).AddDays(-1);
tbSD.Text = sd.ToShortDateString();
tbED.Text = ed.ToShortDateString();
tbSD.Text = sd.ToString("yyyy-MM-dd");
tbED.Text = ed.ToString("yyyy-MM-dd");
}
private void btXls_Click(object sender, EventArgs e)