From 9902d984b5b3ac2b625bece602acebfd36c391d1 Mon Sep 17 00:00:00 2001 From: Crudelis Date: Mon, 18 Sep 2023 18:07:01 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B8=EC=A6=9D=EC=84=9C=20=EC=9E=91?= =?UTF-8?q?=EC=97=85=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 인증서 중간 작업 세이브 --- .../CustomUserControl/ListCertificate.cs | 1 - .../CustomUserControl/UserList.cs | 2 +- HSUCO_Cargo_Garage_Operation_Program/DataModel.cs | 8 ++++++-- HSUCO_Cargo_Garage_Operation_Program/Database.cs | 10 ++++++---- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ListCertificate.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ListCertificate.cs index feb34e4..ceaa0f0 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ListCertificate.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/ListCertificate.cs @@ -60,7 +60,6 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl certificateDatas[i].IssueNumber, certificateDatas[i].IssueDate, certificateDatas[i].CargoVehicleNumber, - certificateDatas[i].PassengerVehicleNumber, certificateDatas[i].Name, diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/UserList.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/UserList.cs index eee6778..379f01d 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/UserList.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/UserList.cs @@ -184,7 +184,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl CertificateData certificateData = new CertificateData(); certificateData.CargoVehicleNumber = dataGridView_List.SelectedRows[0].Cells[1].Value.ToString(); - certificateData.PassengerVehicleNumber = dataGridView_List.SelectedRows[0].Cells[2].Value.ToString(); + //certificateData.PassengerVehicleNumber = dataGridView_List.SelectedRows[0].Cells[2].Value.ToString(); certificateData.Name = dataGridView_List.SelectedRows[0].Cells[3].Value.ToString(); certificateData.StartDate = diff --git a/HSUCO_Cargo_Garage_Operation_Program/DataModel.cs b/HSUCO_Cargo_Garage_Operation_Program/DataModel.cs index 76819b7..c285f5b 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/DataModel.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/DataModel.cs @@ -77,9 +77,13 @@ namespace HSUCO_Cargo_Garage_Operation_Program public struct CertificateData { - public string CargoVehicleNumber { get; set; } - public string PassengerVehicleNumber { get; set; } public string Name { get; set; } + public string PersonalNumber { get; set; } + public string Address { get; set; } + public string CargoVehicleNumber { get; set; } + public string Amount { get; set; } + public string AreaSize { get; set; } + public string IssueNumber { get; set; } public DateTime IssueDate { get; set; } public DateTime StartDate { get; set; } diff --git a/HSUCO_Cargo_Garage_Operation_Program/Database.cs b/HSUCO_Cargo_Garage_Operation_Program/Database.cs index e661f09..e1777ee 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/Database.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/Database.cs @@ -477,7 +477,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program { var certificateDatas = new List(); var query = - $"SELECT UserList.CargoVehicleNumber, UserList.PassengerVehicleNumber, UserList.Name, LedgerCertificate.IssueNumber, LedgerCertificate.IssueDate, LedgerCertificate.StartDate, LedgerCertificate.EndDate From LedgerCertificate INNER JOIN UserList ON LedgerCertificate.No = UserList.No Where LedgerCertificate.IssueDate >='{startDateTime.StartDateTime()}' And LedgerCertificate.IssueDate <='{endDateTime.EndDateTime()}'"; + $"SELECT UserList.Name, UserList.PersonalNumber, UserList.Address, UserList.CargoVehicleNumber, LedgerCertificate.IssueNumber, LedgerCertificate.IssueDate, LedgerCertificate.StartDate, LedgerCertificate.EndDate From LedgerCertificate INNER JOIN UserList ON LedgerCertificate.No = UserList.No Where LedgerCertificate.IssueDate >='{startDateTime.StartDateTime()}' And LedgerCertificate.IssueDate <='{endDateTime.EndDateTime()}'"; using (var command = _sqLiteConnection.CreateCommand()) { @@ -488,9 +488,11 @@ namespace HSUCO_Cargo_Garage_Operation_Program while (reader.Read()) { var certificateData = new CertificateData(); - certificateData.CargoVehicleNumber = reader["CargoVehicleNumber"].ToString(); - certificateData.PassengerVehicleNumber = reader["PassengerVehicleNumber"].ToString(); certificateData.Name = reader["Name"].ToString(); + certificateData.PersonalNumber = reader["PersonalNumber"].ToString(); + certificateData.Address = reader["Address"].ToString(); + certificateData.CargoVehicleNumber = reader["CargoVehicleNumber"].ToString(); + certificateData.IssueNumber = reader["IssueNumber"].ToString(); certificateData.IssueDate = DateTime.Parse(reader["IssueDate"].ToString()); certificateData.StartDate = DateTime.Parse(reader["StartDate"].ToString()); @@ -516,7 +518,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program while (reader.Read()) { certificateData.CargoVehicleNumber = reader["CargoVehicleNumber"].ToString(); - certificateData.PassengerVehicleNumber = reader["PassengerVehicleNumber"].ToString(); + //certificateData.PassengerVehicleNumber = reader["PassengerVehicleNumber"].ToString(); certificateData.Name = reader["Name"].ToString(); certificateData.IssueNumber = reader["IssueNumber"].ToString(); certificateData.IssueDate = DateTime.Parse(reader["IssueDate"].ToString());