diff --git a/HSUCO_Cargo_Garage_Operation_Program/Database.cs b/HSUCO_Cargo_Garage_Operation_Program/Database.cs index 323eb8a..d48661a 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/Database.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/Database.cs @@ -27,15 +27,15 @@ namespace HSUCO_Cargo_Garage_Operation_Program var createKeyTable = @" CREATE TABLE ""ApplicantList"" ( - ""ApplicantType"" INTEGER NOT NULL, - ""RegistrationNumberTruck"" TEXT NOT NULL, - ""RegistrationNumberPassenger"" TEXT NOT NULL, - ""Name"" TEXT NOT NULL, - ""Phone"" TEXT NOT NULL, - ""Address"" TEXT NOT NULL, - ""DateOfApplicant"" TEXT NOT NULL, - ""Inspection"" INTEGER NOT NULL - ); + ""ApplicantType"" INTEGER NOT NULL, + ""RegistrationNumberTruck"" TEXT NOT NULL, + ""RegistrationNumberPassenger"" TEXT NOT NULL, + ""Name"" TEXT NOT NULL, + ""Phone"" TEXT NOT NULL, + ""Address"" TEXT NOT NULL, + ""DateOfApplicant"" TEXT NOT NULL, + ""Inspection"" INTEGER NOT NULL + ); CREATE TABLE ""Certificate"" ( ""No"" INTEGER NOT NULL UNIQUE, @@ -43,27 +43,40 @@ namespace HSUCO_Cargo_Garage_Operation_Program ""UserNo"" INTEGER NOT NULL, PRIMARY KEY(""No"" AUTOINCREMENT) ); + CREATE TABLE ""DeleteList"" ( - ""ApplicantType"" INTEGER NOT NULL, - ""RegistrationNumberTruck"" TEXT NOT NULL, - ""RegistrationNumberPassenger"" TEXT NOT NULL, - ""Name"" TEXT NOT NULL, - ""Phone"" TEXT NOT NULL, - ""Address"" TEXT NOT NULL, - ""DateOfApplicant"" TEXT NOT NULL, - ""Inspection"" INTEGER NOT NULL, - ""DeleteDate"" TEXT NOT NULL, - ""DeleterName"" TEXT NOT NULL, - ""DeleteReason"" TEXT NOT NULL - ); + ""ApplicantType"" INTEGER NOT NULL, + ""RegistrationNumberTruck"" TEXT NOT NULL, + ""RegistrationNumberPassenger"" TEXT NOT NULL, + ""Name"" TEXT NOT NULL, + ""Phone"" TEXT NOT NULL, + ""Address"" TEXT NOT NULL, + ""DateOfApplicant"" TEXT NOT NULL, + ""Inspection"" INTEGER NOT NULL, + ""DeleteDate"" TEXT NOT NULL, + ""DeleterName"" TEXT NOT NULL, + ""DeleteReason"" TEXT NOT NULL + ); + + CREATE TABLE ""LedgerCertificate"" ( + ""No"" INTEGER NOT NULL, + ""IssueNumber"" TEXT NOT NULL, + ""Date"" TEXT NOT NULL + ); + + CREATE TABLE ""LedgerProceeds"" ( + ""No"" INTEGER, + ""Type"" INTEGER, + ""Amount"" INTEGER, + ""Date"" TEXT + ); CREATE TABLE ""RefundList"" ( - ""No"" INTEGER NOT NULL UNIQUE, - ""UserNo"" INTEGER NOT NULL, - ""RefundDate"" TEXT NOT NULL, - ""RefundAmount"" INTEGER NOT NULL, - PRIMARY KEY(""No"" AUTOINCREMENT) - ); + ""No"" INTEGER NOT NULL UNIQUE, + ""UserNo"" INTEGER NOT NULL, + ""RefundDate"" TEXT NOT NULL, + ""RefundAmount"" INTEGER NOT NULL + ); CREATE TABLE ""Settings"" ( ""SettingName"" TEXT NOT NULL, @@ -72,19 +85,19 @@ namespace HSUCO_Cargo_Garage_Operation_Program ); CREATE TABLE ""UserList"" ( - ""No"" INTEGER NOT NULL UNIQUE, - ""RegistrationNumberTruck"" TEXT NOT NULL, - ""RegistrationNumberPassenger"" TEXT NOT NULL, - ""Name"" TEXT NOT NULL, - ""Phone"" TEXT NOT NULL, - ""Address"" TEXT NOT NULL, - ""DateOfApplicant"" TEXT NOT NULL, - ""DateStart"" TEXT NOT NULL, - ""DateEnd"" TEXT NOT NULL, - ""Extended"" INTEGER NOT NULL, - ""RefundCheck"" INTEGER NOT NULL, - PRIMARY KEY(""No"" AUTOINCREMENT) - );"; + ""No"" INTEGER NOT NULL UNIQUE, + ""RegistrationNumberTruck"" TEXT NOT NULL, + ""RegistrationNumberPassenger"" TEXT NOT NULL, + ""Name"" TEXT NOT NULL, + ""Phone"" TEXT NOT NULL, + ""Address"" TEXT NOT NULL, + ""DateOfApplicant"" TEXT NOT NULL, + ""DateStart"" TEXT NOT NULL, + ""DateEnd"" TEXT NOT NULL, + ""Extended"" INTEGER NOT NULL, + ""RefundCheck"" INTEGER NOT NULL, + PRIMARY KEY(""No"" AUTOINCREMENT) + );"; using (var command = _sqLiteConnection.CreateCommand()) { @@ -389,9 +402,10 @@ namespace HSUCO_Cargo_Garage_Operation_Program public static List GetLedgerProceeds(DateTime startDateTime, DateTime endDateTime) { - List proceedsDatas = new List(); + var proceedsDatas = new List(); - string query = $"SELECT UserList.RegistrationNumberTruck, UserList.RegistrationNumberPassenger, UserList.Name, LedgerProceeds.Type, LedgerProceeds.Amount, LedgerProceeds.Date From LedgerProceeds INNER JOIN UserList ON LedgerProceeds.No = UserList.No Where LedgerProceeds.Date >='{startDateTime}' And LedgerProceeds.Date <='{endDateTime}'"; + var query = + $"SELECT UserList.RegistrationNumberTruck, UserList.RegistrationNumberPassenger, UserList.Name, LedgerProceeds.Type, LedgerProceeds.Amount, LedgerProceeds.Date From LedgerProceeds INNER JOIN UserList ON LedgerProceeds.No = UserList.No Where LedgerProceeds.Date >='{startDateTime}' And LedgerProceeds.Date <='{endDateTime}'"; using (var command = _sqLiteConnection.CreateCommand()) { @@ -401,7 +415,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program { while (reader.Read()) { - ProceedsData proceedsData = new ProceedsData(); + var proceedsData = new ProceedsData(); proceedsData.RegistrationNumberTruck = reader["RegistrationNumberTruck"].ToString(); proceedsData.RegistrationNumberPassenger = reader["RegistrationNumberPassenger"].ToString(); proceedsData.Name = reader["Name"].ToString(); @@ -418,8 +432,9 @@ namespace HSUCO_Cargo_Garage_Operation_Program public static List GetLedgerCertificate(DateTime startDateTime, DateTime endDateTime) { - List certificateDatas = new List(); - string query = $"SELECT UserList.RegistrationNumberTruck, UserList.RegistrationNumberPassenger, UserList.Name, LedgerCertificate.Date From LedgerCertificate INNER JOIN UserList ON LedgerCertificate.No = UserList.No Where LedgerCertificate.Date >='{startDateTime}' And LedgerCertificate.Date <='{endDateTime}'"; + var certificateDatas = new List(); + var query = + $"SELECT UserList.RegistrationNumberTruck, UserList.RegistrationNumberPassenger, UserList.Name, LedgerCertificate.Date From LedgerCertificate INNER JOIN UserList ON LedgerCertificate.No = UserList.No Where LedgerCertificate.Date >='{startDateTime}' And LedgerCertificate.Date <='{endDateTime}'"; using (var command = _sqLiteConnection.CreateCommand()) { @@ -429,7 +444,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program { while (reader.Read()) { - CertificateData certificateData = new CertificateData(); + var certificateData = new CertificateData(); certificateData.RegistrationNumberTruck = reader["RegistrationNumberTruck"].ToString(); certificateData.RegistrationNumberPassenger = reader["RegistrationNumberPassenger"].ToString(); certificateData.Name = reader["Name"].ToString(); @@ -489,7 +504,6 @@ namespace HSUCO_Cargo_Garage_Operation_Program } return settings; - // 셋팅 네임/ 세팅 벨류 셋팅 데이트 } public static void SaveSettings(Settings settings)