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

migratino complete

Browse Source
This commit is contained in:
chi
2025-04-07 00:54:29 +09:00
parent 2b22ca9c51
commit 8ac3600ec1
158 changed files with 39098 additions and 21257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
SubProject/FPJ0000/JobReport_/fJobChartMenu.cs
View File

@@ -111,7 +111,7 @@ namespace FPJ0000.JobReport_
}
void refrehData()
{
var db = new EEEntities();
//var db = new EEEntities();
progressBar1.Value = 0;
progressBar1.Maximum = 10;
@@ -136,7 +136,8 @@ namespace FPJ0000.JobReport_
var vED = dte.Value.ToShortDateString();
//휴가일수확인
var drDays = db.HolidayLIst.Where(t => t.free == false && t.pdate.CompareTo(vSD) >= 0 && t.pdate.CompareTo(vED) <= 0);
var taHolidylist = new dsJobReportTableAdapters.HolidayLIstTableAdapter();
var drDays = taHolidylist.GetData(vSD, vED).Where(t => t.IsfreeNull() || t.free == false);// db.HolidayLIst.Where(t => t.free == false && t.pdate.CompareTo(vSD) >= 0 && t.pdate.CompareTo(vED) <= 0);
//근무일수적용
if (drDays == null || drDays.Count() < 1) this.fpSpread1.Sheets[0].Cells[3, 6].Value = 0;
@@ -149,21 +150,22 @@ namespace FPJ0000.JobReport_
ComplexBorderSide bottom = new ComplexBorderSide(Color.Gray, 1);
//사용자목록을 가져온다
List<vJobReportForUser> baseData;
var userCount = 0;
var taJobreportuser = new dsJobReportTableAdapters.vJobReportForUserTableAdapter();
if (cmbUser.SelectedIndex > 0)
{
//사용자번호
var UserNo = getUserID();// cmbUser.Text.Substring(1, cmbUser.Text.IndexOf(']') - 1);
userCount = db.vJobReportForUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.id == UserNo).GroupBy(t=>t.id).Count();
userCount = 1;// db.vJobReportForUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.id == UserNo).GroupBy(t=>t.id).Count();
}
else if (tbProcess.SelectedIndex > 0)
{
userCount = db.vJobReportForUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.userProcess == tbProcess.Text).GroupBy(t => t.id).Count();
userCount = (int)taJobreportuser.GetProcessUserCount(FCOMMON.info.Login.gcode,tbProcess.Text);// db.vJobReportForUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.userProcess == tbProcess.Text).GroupBy(t => t.id).Count();
}
else
{
userCount = db.vJobReportForUser.Where(t => t.gcode == FCOMMON.info.Login.gcode).GroupBy(t => t.id).Count();
userCount = (int)taJobreportuser.GetUserCount(FCOMMON.info.Login.gcode);// db.vJobReportForUser.Where(t => t.gcode == FCOMMON.info.Login.gcode).GroupBy(t => t.id).Count();
}
@@ -175,31 +177,32 @@ namespace FPJ0000.JobReport_
//해당 그룹의 기간데이터를 가져온다
dsJobReport.vJobReportForUserDataTable baseData;
if (cmbUser.SelectedIndex > 0)
{
//사용자번호
var UserNo = getUserID();// cmbUser.Text.Substring(1, cmbUser.Text.IndexOf(']') - 1);
baseData = db.vJobReportForUser
.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.id == UserNo && t.pdate.CompareTo(vSD) >= 0 && t.pdate.CompareTo(vED) <= 0)
.OrderBy(t => t.name)
.OrderBy(t => t.pdate)
.ToList();
baseData = taJobreportuser.GetDataID(FCOMMON.info.Login.gcode, UserNo, vSD, vED); // db.vJobReportForUser
//.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.id == UserNo && t.pdate.CompareTo(vSD) >= 0 && t.pdate.CompareTo(vED) <= 0)
//.OrderBy(t => t.name)
//.OrderBy(t => t.pdate)
//.ToList();
}
else if (tbProcess.SelectedIndex > 0)
{
baseData = db.vJobReportForUser
.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.pdate.CompareTo(vSD) >= 0 && t.pdate.CompareTo(vED) <= 0 && t.userProcess == tbProcess.Text)
.OrderBy(t => t.name)
.OrderBy(t => t.pdate)
.ToList();
baseData = taJobreportuser.GetByProcess(FCOMMON.info.Login.gcode, tbProcess.Text, vSD, vED);// db.vJobReportForUser
//.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.pdate.CompareTo(vSD) >= 0 && t.pdate.CompareTo(vED) <= 0 && t.userProcess == tbProcess.Text)
//.OrderBy(t => t.name)
//.OrderBy(t => t.pdate)
//.ToList();
}
else
{
baseData = db.vJobReportForUser
.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.pdate.CompareTo(vSD) >= 0 && t.pdate.CompareTo(vED) <= 0)
.OrderBy(t => t.name)
.OrderBy(t => t.pdate)
.ToList();
baseData = taJobreportuser.GetByDate(FCOMMON.info.Login.gcode, vSD, vED);// db.vJobReportForUser
//.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.pdate.CompareTo(vSD) >= 0 && t.pdate.CompareTo(vED) <= 0)
//.OrderBy(t => t.name)
//.OrderBy(t => t.pdate)
//.ToList();
}
col = 0;