From d48ef0aeec47293025681a314c0f3330080dcf62 Mon Sep 17 00:00:00 2001 From: MustangDeng <670124965@qq.com> Date: Mon, 30 May 2022 09:14:12 +0800 Subject: [PATCH] =?UTF-8?q?oracle=20=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/ecology9/WEB-INF/config/MyBatis.xml | 1 + .../ecology9/sqlupgrade/Oracle/原始oracle新增.sql | 11 +++++++++++ src/com/engine/salary/mapper/SysTaxRateBaseMapper.xml | 4 ++-- src/com/engine/salary/mapper/TaxAgentMapper.xml | 2 +- src/com/engine/salary/mapper/TaxRateBaseMapper.xml | 2 +- src/com/engine/salary/mapper/TaxRateDetailMapper.xml | 4 ++-- .../mapper/archive/SalaryArchiveDimissionMapper.xml | 2 +- .../salary/mapper/archive/SalaryArchiveItemMapper.xml | 2 +- .../mapper/archive/SalaryArchiveTaxAgentMapper.xml | 2 +- .../datacollection/AttendQuoteDataValueMapper.xml | 2 +- .../mapper/datacollection/AttendQuoteFieldMapper.xml | 2 +- .../datacollection/AttendQuoteSyncSetMapper.xml | 2 +- .../mapper/datacollection/OtherDeductionMapper.xml | 2 +- .../mapper/salaryacct/SalaryAcctRecordMapper.xml | 2 +- .../mapper/salaryacct/SalaryAcctResultMapper.xml | 2 +- .../salary/mapper/salarybill/SalarySendMapper.xml | 2 +- .../salary/mapper/salarybill/SalaryTemplateMapper.xml | 2 +- .../salary/mapper/salaryitem/SysSalaryItemMapper.xml | 2 +- .../mapper/salarysob/SalarySobAdjustRuleMapper.xml | 2 +- .../mapper/salarysob/SalarySobCheckRuleMapper.xml | 2 +- .../salarysob/SalarySobDefaultEmpFieldMapper.xml | 2 +- .../salarysob/SalarySobDefaultItemGroupMapper.xml | 2 +- .../mapper/salarysob/SalarySobDefaultItemMapper.xml | 2 +- .../mapper/salarysob/SalarySobEmpFieldMapper.xml | 2 +- .../mapper/salarysob/SalarySobItemGroupMapper.xml | 2 +- .../salary/mapper/salarysob/SalarySobMapper.xml | 2 +- .../salary/mapper/salarysob/SalarySobRangeMapper.xml | 2 +- .../salary/mapper/sicategory/ICategoryMapper.xml | 2 +- .../mapper/sischeme/InsuranceSchemeDetailMapper.xml | 2 +- .../salary/mapper/sischeme/InsuranceSchemeMapper.xml | 4 ++-- .../taxdeclaration/TaxDeclarationDetailMapper.xml | 4 ++-- .../mapper/taxdeclaration/TaxDeclarationMapper.xml | 2 +- 32 files changed, 46 insertions(+), 34 deletions(-) create mode 100644 resource/ecology9/sqlupgrade/Oracle/原始oracle新增.sql diff --git a/resource/ecology9/WEB-INF/config/MyBatis.xml b/resource/ecology9/WEB-INF/config/MyBatis.xml index f996bde90..c3deda1e0 100644 --- a/resource/ecology9/WEB-INF/config/MyBatis.xml +++ b/resource/ecology9/WEB-INF/config/MyBatis.xml @@ -5,6 +5,7 @@ + diff --git a/resource/ecology9/sqlupgrade/Oracle/原始oracle新增.sql b/resource/ecology9/sqlupgrade/Oracle/原始oracle新增.sql new file mode 100644 index 000000000..5480d1cde --- /dev/null +++ b/resource/ecology9/sqlupgrade/Oracle/原始oracle新增.sql @@ -0,0 +1,11 @@ +ALTER TABLE hrsa_add_up_situation ADD ( + add_up_illness_medical varchar2(255) NULL , + add_up_tax_savings varchar2(255) NULL , + add_up_infant_care varchar2(255) NULL +) +/ +ALTER TABLE hrsa_add_up_deduction add ( + add_up_illness_medical varchar2(255) NULL, + add_up_infant_care varchar2(255) NULL +) +/ \ No newline at end of file diff --git a/src/com/engine/salary/mapper/SysTaxRateBaseMapper.xml b/src/com/engine/salary/mapper/SysTaxRateBaseMapper.xml index 0ceeaba86..9b79af4e2 100644 --- a/src/com/engine/salary/mapper/SysTaxRateBaseMapper.xml +++ b/src/com/engine/salary/mapper/SysTaxRateBaseMapper.xml @@ -85,7 +85,7 @@ - + select hrsa_sys_tax_rate_base_id.nextval from dual INSERT INTO hrsa_sys_tax_rate_base @@ -182,7 +182,7 @@ - + select hrsa_sys_tax_rate_base_id.nextval from dual INSERT INTO hrsa_sys_tax_rate_base diff --git a/src/com/engine/salary/mapper/TaxAgentMapper.xml b/src/com/engine/salary/mapper/TaxAgentMapper.xml index 16bd2ecc4..45779a89c 100644 --- a/src/com/engine/salary/mapper/TaxAgentMapper.xml +++ b/src/com/engine/salary/mapper/TaxAgentMapper.xml @@ -92,7 +92,7 @@ - + select hrsa_tax_agent_id.nextval from dual INSERT INTO hrsa_tax_agent diff --git a/src/com/engine/salary/mapper/TaxRateBaseMapper.xml b/src/com/engine/salary/mapper/TaxRateBaseMapper.xml index 3238746ba..064a2afb8 100644 --- a/src/com/engine/salary/mapper/TaxRateBaseMapper.xml +++ b/src/com/engine/salary/mapper/TaxRateBaseMapper.xml @@ -88,7 +88,7 @@ - + select hrsa_tax_rate_base_id.nextval from dual INSERT INTO hrsa_tax_rate_base diff --git a/src/com/engine/salary/mapper/TaxRateDetailMapper.xml b/src/com/engine/salary/mapper/TaxRateDetailMapper.xml index 65b8744a5..bf4e13da5 100644 --- a/src/com/engine/salary/mapper/TaxRateDetailMapper.xml +++ b/src/com/engine/salary/mapper/TaxRateDetailMapper.xml @@ -101,7 +101,7 @@ - + select hrsa_tax_rate_detail_id.nextval from dual INSERT INTO hrsa_tax_rate_detail @@ -253,7 +253,7 @@ - + select hrsa_tax_rate_detail_id.nextval from dual INSERT INTO hrsa_tax_rate_detail diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveDimissionMapper.xml b/src/com/engine/salary/mapper/archive/SalaryArchiveDimissionMapper.xml index e4aa67d2a..6b2ff51eb 100644 --- a/src/com/engine/salary/mapper/archive/SalaryArchiveDimissionMapper.xml +++ b/src/com/engine/salary/mapper/archive/SalaryArchiveDimissionMapper.xml @@ -134,7 +134,7 @@ - + select hrsa_salary_archive_dimission_id.nextval from dual INSERT INTO hrsa_salary_archive_dimission diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveItemMapper.xml b/src/com/engine/salary/mapper/archive/SalaryArchiveItemMapper.xml index 2ab4ed8f1..0ed033f13 100644 --- a/src/com/engine/salary/mapper/archive/SalaryArchiveItemMapper.xml +++ b/src/com/engine/salary/mapper/archive/SalaryArchiveItemMapper.xml @@ -222,7 +222,7 @@ - + select hrsa_salary_archive_item_id.nextval from dual INSERT INTO hrsa_salary_archive_item diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveTaxAgentMapper.xml b/src/com/engine/salary/mapper/archive/SalaryArchiveTaxAgentMapper.xml index 9f4a012af..c6bd431d0 100644 --- a/src/com/engine/salary/mapper/archive/SalaryArchiveTaxAgentMapper.xml +++ b/src/com/engine/salary/mapper/archive/SalaryArchiveTaxAgentMapper.xml @@ -217,7 +217,7 @@ - + select hrsa_salary_archive_tax_agent_id.nextval from dual INSERT INTO hrsa_salary_archive_tax_agent diff --git a/src/com/engine/salary/mapper/datacollection/AttendQuoteDataValueMapper.xml b/src/com/engine/salary/mapper/datacollection/AttendQuoteDataValueMapper.xml index e1ebfdb49..3abaa5347 100644 --- a/src/com/engine/salary/mapper/datacollection/AttendQuoteDataValueMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/AttendQuoteDataValueMapper.xml @@ -128,7 +128,7 @@ - + select hrsa_attend_quote_data_value_id.nextval from dual INSERT INTO hrsa_attend_quote_data_value diff --git a/src/com/engine/salary/mapper/datacollection/AttendQuoteFieldMapper.xml b/src/com/engine/salary/mapper/datacollection/AttendQuoteFieldMapper.xml index 5c95179c2..588b58aad 100644 --- a/src/com/engine/salary/mapper/datacollection/AttendQuoteFieldMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/AttendQuoteFieldMapper.xml @@ -136,7 +136,7 @@ - + select hrsa_attend_quote_field_id.nextval from dual INSERT INTO hrsa_attend_quote_field diff --git a/src/com/engine/salary/mapper/datacollection/AttendQuoteSyncSetMapper.xml b/src/com/engine/salary/mapper/datacollection/AttendQuoteSyncSetMapper.xml index 71492d218..cc3c88a84 100644 --- a/src/com/engine/salary/mapper/datacollection/AttendQuoteSyncSetMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/AttendQuoteSyncSetMapper.xml @@ -112,7 +112,7 @@ - + select hrsa_attend_quote_sync_set_id.nextval from dual INSERT INTO hrsa_attend_quote_sync_set diff --git a/src/com/engine/salary/mapper/datacollection/OtherDeductionMapper.xml b/src/com/engine/salary/mapper/datacollection/OtherDeductionMapper.xml index 9c5dba06a..43b91571e 100644 --- a/src/com/engine/salary/mapper/datacollection/OtherDeductionMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/OtherDeductionMapper.xml @@ -144,7 +144,7 @@ - + select hrsa_other_deduction_id.nextval from dual INSERT INTO hrsa_other_deduction diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml index 99332407f..30c2d8b8e 100644 --- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml +++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml @@ -205,7 +205,7 @@ - + select hrsa_salary_acct_record_id.nextval from dual INSERT INTO hrsa_salary_acct_record diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultMapper.xml index 65ba59808..5d275210c 100644 --- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultMapper.xml +++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultMapper.xml @@ -219,7 +219,7 @@ - + select hrsa_salary_acct_result_id.nextval from dual INSERT INTO hrsa_salary_acct_result diff --git a/src/com/engine/salary/mapper/salarybill/SalarySendMapper.xml b/src/com/engine/salary/mapper/salarybill/SalarySendMapper.xml index 2b5076625..a7c900ebd 100644 --- a/src/com/engine/salary/mapper/salarybill/SalarySendMapper.xml +++ b/src/com/engine/salary/mapper/salarybill/SalarySendMapper.xml @@ -284,7 +284,7 @@ - + select hrsa_salary_send_id.nextval from dual INSERT INTO hrsa_salary_send diff --git a/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml b/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml index beb154929..b2b25f0bf 100644 --- a/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml +++ b/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml @@ -493,7 +493,7 @@ - + select hrsa_salary_template_id.nextval from dual INSERT INTO hrsa_salary_template diff --git a/src/com/engine/salary/mapper/salaryitem/SysSalaryItemMapper.xml b/src/com/engine/salary/mapper/salaryitem/SysSalaryItemMapper.xml index 2bbcdc208..c264cd95e 100644 --- a/src/com/engine/salary/mapper/salaryitem/SysSalaryItemMapper.xml +++ b/src/com/engine/salary/mapper/salaryitem/SysSalaryItemMapper.xml @@ -255,7 +255,7 @@ - + select hrsa_sys_salary_item_id.nextval from dual INSERT INTO hrsa_sys_salary_item diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobAdjustRuleMapper.xml b/src/com/engine/salary/mapper/salarysob/SalarySobAdjustRuleMapper.xml index df0e07fd0..6f5fe26bd 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobAdjustRuleMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobAdjustRuleMapper.xml @@ -178,7 +178,7 @@ - + select hrsa_salary_sob_adjust_rule_id.nextval from dual INSERT INTO hrsa_salary_sob_adjust_rule diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobCheckRuleMapper.xml b/src/com/engine/salary/mapper/salarysob/SalarySobCheckRuleMapper.xml index 9533038b5..66e48849b 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobCheckRuleMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobCheckRuleMapper.xml @@ -206,7 +206,7 @@ - + select hrsa_salary_sob_check_rule_id.nextval from dual INSERT INTO hrsa_salary_sob_check_rule diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobDefaultEmpFieldMapper.xml b/src/com/engine/salary/mapper/salarysob/SalarySobDefaultEmpFieldMapper.xml index 30731b702..49cf908d0 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobDefaultEmpFieldMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobDefaultEmpFieldMapper.xml @@ -157,7 +157,7 @@ - + select hrsa_sob_default_emp_field_id.nextval from dual INSERT INTO hrsa_sob_default_emp_field diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobDefaultItemGroupMapper.xml b/src/com/engine/salary/mapper/salarysob/SalarySobDefaultItemGroupMapper.xml index a645e013b..78b70ee01 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobDefaultItemGroupMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobDefaultItemGroupMapper.xml @@ -167,7 +167,7 @@ - + select hrsa_sob_default_item_group_id.nextval from dual INSERT INTO hrsa_sob_default_item_group diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobDefaultItemMapper.xml b/src/com/engine/salary/mapper/salarysob/SalarySobDefaultItemMapper.xml index 001483652..0b9cac32f 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobDefaultItemMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobDefaultItemMapper.xml @@ -183,7 +183,7 @@ - + select hrsa_salary_sob_default_item_id.nextval from dual INSERT INTO hrsa_salary_sob_default_item diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobEmpFieldMapper.xml b/src/com/engine/salary/mapper/salarysob/SalarySobEmpFieldMapper.xml index 1cf16a2a3..f57d14360 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobEmpFieldMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobEmpFieldMapper.xml @@ -167,7 +167,7 @@ - + select hrsa_salary_sob_emp_field_id.nextval from dual INSERT INTO hrsa_salary_sob_emp_field diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobItemGroupMapper.xml b/src/com/engine/salary/mapper/salarysob/SalarySobItemGroupMapper.xml index 5d95d9687..56f620069 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobItemGroupMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobItemGroupMapper.xml @@ -167,7 +167,7 @@ - + select hrsa_salary_sob_item_group_id.nextval from dual INSERT INTO hrsa_salary_sob_item_group diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobMapper.xml b/src/com/engine/salary/mapper/salarysob/SalarySobMapper.xml index a4dde7031..236782600 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobMapper.xml @@ -232,7 +232,7 @@ - + select hrsa_salary_sob_id.nextval from dual INSERT INTO hrsa_salary_sob diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobRangeMapper.xml b/src/com/engine/salary/mapper/salarysob/SalarySobRangeMapper.xml index 2a62ec19f..dc47bd158 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobRangeMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobRangeMapper.xml @@ -178,7 +178,7 @@ - + select hrsa_salary_sob_range_id.nextval from dual INSERT INTO hrsa_salary_sob_range diff --git a/src/com/engine/salary/mapper/sicategory/ICategoryMapper.xml b/src/com/engine/salary/mapper/sicategory/ICategoryMapper.xml index b6b794323..762a93868 100644 --- a/src/com/engine/salary/mapper/sicategory/ICategoryMapper.xml +++ b/src/com/engine/salary/mapper/sicategory/ICategoryMapper.xml @@ -81,7 +81,7 @@ - + select hrsa_insurance_category_id.nextval from dual INSERT INTO hrsa_insurance_category diff --git a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.xml b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.xml index 0dfabe1a3..7f1b1340e 100644 --- a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.xml +++ b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.xml @@ -142,7 +142,7 @@ - + select hrsa_scheme_detail_id.nextval from dual INSERT INTO hrsa_scheme_detail diff --git a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.xml b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.xml index 1f5a3cfb5..147beae9c 100644 --- a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.xml +++ b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.xml @@ -103,8 +103,8 @@ - - select hrsa_social_security_scheme_id.nextval from dual + + select hrsa_social_s_s_id.nextval from dual INSERT INTO hrsa_social_security_scheme diff --git a/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationDetailMapper.xml b/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationDetailMapper.xml index 12a4468cf..c247afb1f 100644 --- a/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationDetailMapper.xml +++ b/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationDetailMapper.xml @@ -105,7 +105,7 @@ - + select hrsa_tax_declaration_detail_id.nextval from dual INSERT INTO hrsa_tax_declaration_detail @@ -209,7 +209,7 @@ - + select hrsa_tax_declaration_detail_id.nextval from dual INSERT INTO hrsa_tax_declaration_detail diff --git a/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml b/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml index b0d051fa2..7d889a9ee 100644 --- a/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml +++ b/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml @@ -192,7 +192,7 @@ - + select hrsa_tax_declaration_id.nextval from dual INSERT INTO hrsa_tax_declaration