CelHRTeam/EchoTex_Payroll
13
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Raw data upload #54

Merged
chapal merged 1 commits from dev_chapal into devqc 2026-05-13 15:37:56 +06:00
Conversation 0 Commits 1 Files Changed 2 +20 -20
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 90e3dbc838 - Show all commits

36
HRM.DA/Service/Attendance/AttnRawDataService.cs
View File

@ -395,14 +395,14 @@ namespace HRM.DA
DataTable _dtRawData = null; DataTable _dtRawData = null;
_dtRawData = new DataTable("AttnRawData"); _dtRawData = new DataTable("AttnRawData");
// _dtRawData.Columns.Add("ATTNRAWDATAID", typeof(int)); // _dtRawData.Columns.Add("ATTNRAWDATAID", typeof(int));
_dtRawData.Columns.Add("CARDID", typeof(int)); _dtRawData.Columns.Add("CardID", typeof(int));
_dtRawData.Columns.Add("EMPLOYEEID", typeof(int)); _dtRawData.Columns.Add("EmployeeID", typeof(int));
_dtRawData.Columns.Add("CARDNO", typeof(string)); _dtRawData.Columns.Add("CardNo", typeof(string));
_dtRawData.Columns.Add("PUNCHTIME", typeof(DateTime)); _dtRawData.Columns.Add("PunchTime", typeof(DateTime));
_dtRawData.Columns.Add("ENTRYMODE", typeof(int)); _dtRawData.Columns.Add("EntryMode", typeof(int));
_dtRawData.Columns.Add("DEVICEIPADDRESS", typeof(string)); _dtRawData.Columns.Add("DeviceIPAddress", typeof(string));
_dtRawData.Columns.Add("DEVICENO", typeof(string)); _dtRawData.Columns.Add("DeviceNo", typeof(string));
_dtRawData.Columns.Add("PUNCHDATE", typeof(DateTime)); //_dtRawData.Columns.Add("PUNCHDATE", typeof(DateTime));
foreach (AttnRawData item in attnRawDatas) foreach (AttnRawData item in attnRawDatas)
{ {
@ -422,8 +422,8 @@ namespace HRM.DA
item.PunchTime, item.PunchTime,
(int)item.EntryMode, (int)item.EntryMode,
item.DeviceIPAddress, item.DeviceIPAddress,
item.DeviceNo, item.DeviceNo
item.PunchTime); );
} }
using (SqlBulkCopy bulkCopy = new SqlBulkCopy((SqlConnection)tc.Connection, using (SqlBulkCopy bulkCopy = new SqlBulkCopy((SqlConnection)tc.Connection,
@ -433,14 +433,14 @@ namespace HRM.DA
bulkCopy.BatchSize = 5000; bulkCopy.BatchSize = 5000;
// bulkCopy.ColumnMappings.Add("ATTNRAWDATAID", "ATTNRAWDATAID"); // bulkCopy.ColumnMappings.Add("ATTNRAWDATAID", "ATTNRAWDATAID");
bulkCopy.ColumnMappings.Add("CARDID", "CARDID"); bulkCopy.ColumnMappings.Add("CardID", "CardID");
bulkCopy.ColumnMappings.Add("EMPLOYEEID", "EMPLOYEEID"); bulkCopy.ColumnMappings.Add("EmployeeID", "EmployeeID");
bulkCopy.ColumnMappings.Add("CARDNO", "CARDNO"); bulkCopy.ColumnMappings.Add("CardNo", "CardNo");
bulkCopy.ColumnMappings.Add("PUNCHTIME", "PUNCHTIME"); bulkCopy.ColumnMappings.Add("PunchTime", "PunchTime");
bulkCopy.ColumnMappings.Add("ENTRYMODE", "ENTRYMODE"); bulkCopy.ColumnMappings.Add("EntryMode", "EntryMode");
bulkCopy.ColumnMappings.Add("DEVICEIPADDRESS", "DEVICEIPADDRESS"); bulkCopy.ColumnMappings.Add("DeviceIPAddress", "DeviceIPAddress");
bulkCopy.ColumnMappings.Add("DEVICENO", "DEVICENO"); bulkCopy.ColumnMappings.Add("DeviceNo", "DeviceNo");
bulkCopy.ColumnMappings.Add("PUNCHDATE", "PUNCHDATE"); // bulkCopy.ColumnMappings.Add("PUNCHDATE", "PUNCHDATE");
bulkCopy.DestinationTableName = "AttnRawData"; bulkCopy.DestinationTableName = "AttnRawData";
bulkCopy.WriteToServer(_dtRawData); bulkCopy.WriteToServer(_dtRawData);

4
HRM.UI/ClientApp/src/app/attendance/read-attendance-rawdata/read-attendance-rawdata.component.ts
View File

@ -248,8 +248,8 @@ export class ReadAttendanceRawdataComponent {
item.employeeNo = x.employeeNo, item.employeeNo = x.employeeNo,
item.entryMode = (x.entryMode == undefined || x.entryMode.length <= 0) ? 0 : this.entryModes.find(e => e.name.trim().toLowerCase() == x.entryMode.trim().toLowerCase()).value, item.entryMode = (x.entryMode == undefined || x.entryMode.length <= 0) ? 0 : this.entryModes.find(e => e.name.trim().toLowerCase() == x.entryMode.trim().toLowerCase()).value,
item.cardNo = (x.cardNo !== undefined || x.cardNo !== "" || x.cardNo !== null) ? item.employeeNo : item.cardNo, item.cardNo = (x.cardNo !== undefined || x.cardNo !== "" || x.cardNo !== null) ? item.employeeNo : item.cardNo,
item.deviceNo = (x.deviceNo !== undefined || x.deviceNo !== "" || x.deviceNo !== null) ? null : item.deviceNo, item.deviceNo = (x.deviceNo !== undefined || x.deviceNo !== "" || x.deviceNo !== null) ? "" : item.deviceNo,
item.deviceIPAddress = (x.deviceIPAddress !== undefined || x.deviceIPAddress !== "" || x.deviceIPAddress !== null) ? null : item.deviceIPAddress item.deviceIPAddress = (x.deviceIPAddress !== undefined || x.deviceIPAddress !== "" || x.deviceIPAddress !== null) ? "" : item.deviceIPAddress
this.attnRawDatas.push(item); this.attnRawDatas.push(item);
}); });
//console.log(this.attnRawDatas); //console.log(this.attnRawDatas);