diff --git a/resource/ecology9/sqlupgrade/Oracle/原始sql.sql b/resource/ecology9/sqlupgrade/Oracle/原始sql.sql index e66c85e51..0b827d5f0 100644 --- a/resource/ecology9/sqlupgrade/Oracle/原始sql.sql +++ b/resource/ecology9/sqlupgrade/Oracle/原始sql.sql @@ -353,7 +353,7 @@ CREATE TABLE hrsa_bill_detail( creator NUMBER(38,0) NOT NULL, create_time date NOT NULL, update_time date NOT NULL, - delete_type number NOT NULL, + delete_type number DEFAULT 0, tenant_key varchar2(10) NOT NULL ) @@ -401,7 +401,7 @@ CREATE TABLE hrsa_bill_detail_temp( creator NUMBER(38,0) NOT NULL, create_time date NOT NULL, update_time date NOT NULL, - delete_type number NOT NULL, + delete_type number DEFAULT 0, tenant_key varchar2(10) NOT NULL ) @@ -437,7 +437,7 @@ CREATE TABLE hrsa_bill_inspect( creator NUMBER(38,0) NOT NULL, create_time date NOT NULL, update_time date NOT NULL, - delete_type number NOT NULL, + delete_type number DEFAULT 0, tenant_key varchar2(10) NOT NULL ) @@ -454,7 +454,7 @@ CREATE TABLE hrsa_check_result( creator NUMBER(38,0) NOT NULL, create_time date NOT NULL, update_time date NOT NULL, - delete_type number NOT NULL, + delete_type number DEFAULT 0, tenant_key varchar2(10) NOT NULL ) @@ -489,7 +489,7 @@ CREATE TABLE hrsa_check_result_record( creator NUMBER(38,0) NOT NULL, create_time date NOT NULL, update_time date NOT NULL, - delete_type number NOT NULL, + delete_type number DEFAULT 0, tenant_key varchar2(10) NOT NULL ) @@ -520,7 +520,7 @@ CREATE TABLE hrsa_ck_result_detail_temp( creator NUMBER(38,0) NOT NULL, create_time date NOT NULL, update_time date NOT NULL, - delete_type number NOT NULL, + delete_type number DEFAULT 0, tenant_key varchar2(10) NOT NULL, calculate_key varchar2(50) NOT NULL ) @@ -554,7 +554,7 @@ CREATE TABLE hrsa_excel_acct_result( creator NUMBER(38,0) NOT NULL, create_time date NOT NULL, update_time date NOT NULL, - delete_type number NOT NULL, + delete_type number DEFAULT 0, tenant_key varchar2(10) NOT NULL, tax_agent_id NUMBER(38,0) NOT NULL ) @@ -589,7 +589,7 @@ CREATE TABLE hrsa_formula( formula varchar2(4000) NOT NULL, formulaRunScript varchar2(4000) NOT NULL, creator NUMBER(38,0) NOT NULL, - delete_type number NOT NULL, + delete_type number DEFAULT 0, create_time date NOT NULL, update_time date NOT NULL ) @@ -606,7 +606,7 @@ CREATE TABLE hrsa_formula_var( source varchar2(255) NOT NULL, order_index number NOT NULL, creator NUMBER(38,0) NOT NULL, - delete_type number NOT NULL, + delete_type number DEFAULT 0, create_time date NOT NULL, update_time date NOT NULL ) @@ -629,7 +629,7 @@ CREATE TABLE hrsa_fund_archives( create_time date NOT NULL, update_time date NOT NULL, creator number NOT NULL, - delete_type number NOT NULL, + delete_type number DEFAULT 0, tenant_key varchar2(10) NOT NULL ) @@ -666,7 +666,7 @@ CREATE TABLE hrsa_other_archives( create_time date NOT NULL, update_time date NOT NULL, creator NUMBER(38,0) NOT NULL, - delete_type number NOT NULL, + delete_type number DEFAULT 0, tenant_key varchar2(10) NOT NULL ) @@ -825,7 +825,7 @@ CREATE TABLE hrsa_salary_archive_dimission( create_time date NOT NULL, update_time date NOT NULL, creator NUMBER(38,0) NOT NULL, - delete_type number NOT NULL, + delete_type number DEFAULT 0, tenant_key varchar2(10) NOT NULL ) @@ -1082,7 +1082,7 @@ CREATE TABLE hrsa_salary_sob_check_rule( create_time date NOT NULL, update_time date NOT NULL, creator NUMBER(38,0) NOT NULL, - delete_type number NOT NULL, + delete_type number DEFAULT 0, tenant_key varchar2(10) NOT NULL ) @@ -1180,7 +1180,7 @@ CREATE TABLE hrsa_salary_sob_item( create_time date NOT NULL, update_time date NOT NULL, creator NUMBER(38,0) NOT NULL, - delete_type number NOT NULL, + delete_type number DEFAULT 0, tenant_key varchar2(10) NOT NULL ) @@ -1210,7 +1210,7 @@ CREATE TABLE hrsa_salary_sob_item_group( create_time date NOT NULL, update_time date NOT NULL, creator NUMBER(38,0) NOT NULL, - delete_type number NOT NULL, + delete_type number DEFAULT 0, tenant_key varchar2(10) NOT NULL ) @@ -1384,7 +1384,7 @@ CREATE TABLE hrsa_social_archives( create_time date NOT NULL, update_time date NOT NULL, creator number NOT NULL, - delete_type number NOT NULL, + delete_type number DEFAULT 0, tenant_key varchar2(10) NOT NULL ) @@ -1503,7 +1503,7 @@ CREATE TABLE hrsa_sys_tax_rate_base( create_time date NOT NULL, update_time date NOT NULL, creator number NOT NULL, - delete_type number NOT NULL, + delete_type number DEFAULT 0, tenant_key varchar2(10) NOT NULL ) @@ -1539,7 +1539,7 @@ CREATE TABLE hrsa_sys_tax_rate_detail( create_time date NOT NULL, update_time date NOT NULL, creator number NOT NULL, - delete_type number NOT NULL, + delete_type number DEFAULT 0, tenant_key varchar2(10) NOT NULL ) diff --git a/src/com/engine/salary/mapper/SysTaxRateBaseMapper.xml b/src/com/engine/salary/mapper/SysTaxRateBaseMapper.xml index 9b79af4e2..9ebe4337f 100644 --- a/src/com/engine/salary/mapper/SysTaxRateBaseMapper.xml +++ b/src/com/engine/salary/mapper/SysTaxRateBaseMapper.xml @@ -85,8 +85,8 @@ - - select hrsa_sys_tax_rate_base_id.nextval from dual + + select hrsa_sys_tax_rate_base_id.currval from dual INSERT INTO hrsa_sys_tax_rate_base @@ -182,8 +182,8 @@ - - select hrsa_sys_tax_rate_base_id.nextval from dual + + select hrsa_sys_tax_rate_base_id.currval 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 45779a89c..4182d535f 100644 --- a/src/com/engine/salary/mapper/TaxAgentMapper.xml +++ b/src/com/engine/salary/mapper/TaxAgentMapper.xml @@ -92,8 +92,8 @@ - - select hrsa_tax_agent_id.nextval from dual + + select hrsa_tax_agent_id.currval 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 064a2afb8..185132237 100644 --- a/src/com/engine/salary/mapper/TaxRateBaseMapper.xml +++ b/src/com/engine/salary/mapper/TaxRateBaseMapper.xml @@ -88,8 +88,8 @@ - - select hrsa_tax_rate_base_id.nextval from dual + + select hrsa_tax_rate_base_id.currval 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 bf4e13da5..5f4bd9d9b 100644 --- a/src/com/engine/salary/mapper/TaxRateDetailMapper.xml +++ b/src/com/engine/salary/mapper/TaxRateDetailMapper.xml @@ -101,8 +101,8 @@ - - select hrsa_tax_rate_detail_id.nextval from dual + + select hrsa_tax_rate_detail_id.currval from dual INSERT INTO hrsa_tax_rate_detail @@ -253,8 +253,8 @@ - - select hrsa_tax_rate_detail_id.nextval from dual + + select hrsa_tax_rate_detail_id.currval 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 6b2ff51eb..7fd7908be 100644 --- a/src/com/engine/salary/mapper/archive/SalaryArchiveDimissionMapper.xml +++ b/src/com/engine/salary/mapper/archive/SalaryArchiveDimissionMapper.xml @@ -134,8 +134,8 @@ - - select hrsa_salary_archive_dimission_id.nextval from dual + + select hrsa_salary_archive_dimission_id.currval 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 0ed033f13..639237dc3 100644 --- a/src/com/engine/salary/mapper/archive/SalaryArchiveItemMapper.xml +++ b/src/com/engine/salary/mapper/archive/SalaryArchiveItemMapper.xml @@ -222,8 +222,8 @@ - - select hrsa_salary_archive_item_id.nextval from dual + + select hrsa_salary_archive_item_id.currval 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 c6bd431d0..98bbd6b2d 100644 --- a/src/com/engine/salary/mapper/archive/SalaryArchiveTaxAgentMapper.xml +++ b/src/com/engine/salary/mapper/archive/SalaryArchiveTaxAgentMapper.xml @@ -217,8 +217,8 @@ - - select hrsa_salary_archive_tax_agent_id.nextval from dual + + select hrsa_salary_archive_tax_agent_id.currval 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 3abaa5347..faf21ac85 100644 --- a/src/com/engine/salary/mapper/datacollection/AttendQuoteDataValueMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/AttendQuoteDataValueMapper.xml @@ -128,8 +128,8 @@ - - select hrsa_attend_quote_data_value_id.nextval from dual + + select hrsa_attend_quote_data_value_id.currval 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 588b58aad..4729824ab 100644 --- a/src/com/engine/salary/mapper/datacollection/AttendQuoteFieldMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/AttendQuoteFieldMapper.xml @@ -136,8 +136,8 @@ - - select hrsa_attend_quote_field_id.nextval from dual + + select hrsa_attend_quote_field_id.currval 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 cc3c88a84..4239b9155 100644 --- a/src/com/engine/salary/mapper/datacollection/AttendQuoteSyncSetMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/AttendQuoteSyncSetMapper.xml @@ -112,8 +112,8 @@ - - select hrsa_attend_quote_sync_set_id.nextval from dual + + select hrsa_attend_quote_sync_set_id.currval 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 43b91571e..8b23e4ef8 100644 --- a/src/com/engine/salary/mapper/datacollection/OtherDeductionMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/OtherDeductionMapper.xml @@ -144,8 +144,8 @@ - - select hrsa_other_deduction_id.nextval from dual + + select hrsa_other_deduction_id.currval 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 30c2d8b8e..9ff42c494 100644 --- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml +++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml @@ -205,8 +205,8 @@ - - select hrsa_salary_acct_record_id.nextval from dual + + select hrsa_salary_acct_record_id.currval 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 5d275210c..5c84efe1b 100644 --- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultMapper.xml +++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultMapper.xml @@ -219,8 +219,8 @@ - - select hrsa_salary_acct_result_id.nextval from dual + + select hrsa_salary_acct_result_id.currval 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 a7c900ebd..de7443907 100644 --- a/src/com/engine/salary/mapper/salarybill/SalarySendMapper.xml +++ b/src/com/engine/salary/mapper/salarybill/SalarySendMapper.xml @@ -284,8 +284,8 @@ - - select hrsa_salary_send_id.nextval from dual + + select hrsa_salary_send_id.currval 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 b2b25f0bf..54e653d61 100644 --- a/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml +++ b/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml @@ -493,8 +493,8 @@ - - select hrsa_salary_template_id.nextval from dual + + select hrsa_salary_template_id.currval from dual INSERT INTO hrsa_salary_template diff --git a/src/com/engine/salary/mapper/salaryitem/SalaryItemMapper.xml b/src/com/engine/salary/mapper/salaryitem/SalaryItemMapper.xml index e23dd6aa7..397497866 100644 --- a/src/com/engine/salary/mapper/salaryitem/SalaryItemMapper.xml +++ b/src/com/engine/salary/mapper/salaryitem/SalaryItemMapper.xml @@ -353,7 +353,7 @@ #{item.useDefault}, #{item.useInEmployeeSalary}, #{item.roundingMode}, #{item.pattern}, #{item.valueType}, #{item.formulaId}, #{item.description}, #{item.canEdit}, - #{item.createTime}, #{item.updateTime}, #{item.creator}, 0, #{item.tenantKey, #{item.dataType}} from dual + #{item.createTime}, #{item.updateTime}, #{item.creator}, 0, #{item.tenantKey}, #{item.dataType} from dual diff --git a/src/com/engine/salary/mapper/salaryitem/SysSalaryItemMapper.xml b/src/com/engine/salary/mapper/salaryitem/SysSalaryItemMapper.xml index c264cd95e..9f189673c 100644 --- a/src/com/engine/salary/mapper/salaryitem/SysSalaryItemMapper.xml +++ b/src/com/engine/salary/mapper/salaryitem/SysSalaryItemMapper.xml @@ -255,8 +255,8 @@ - - select hrsa_sys_salary_item_id.nextval from dual + + select hrsa_sys_salary_item_id.currval 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 6f5fe26bd..62480c013 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobAdjustRuleMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobAdjustRuleMapper.xml @@ -178,8 +178,8 @@ - - select hrsa_salary_sob_adjust_rule_id.nextval from dual + + select hrsa_salary_sob_adjust_rule_id.currval 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 66e48849b..79626c772 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobCheckRuleMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobCheckRuleMapper.xml @@ -206,8 +206,8 @@ - - select hrsa_salary_sob_check_rule_id.nextval from dual + + select hrsa_salary_sob_check_rule_id.currval 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 49cf908d0..baefe0d64 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobDefaultEmpFieldMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobDefaultEmpFieldMapper.xml @@ -157,8 +157,8 @@ - - select hrsa_sob_default_emp_field_id.nextval from dual + + select hrsa_sob_default_emp_field_id.currval 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 78b70ee01..81e68abdd 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobDefaultItemGroupMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobDefaultItemGroupMapper.xml @@ -167,8 +167,8 @@ - - select hrsa_sob_default_item_group_id.nextval from dual + + select hrsa_sob_default_item_group_id.currval 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 0b9cac32f..424133cfd 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobDefaultItemMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobDefaultItemMapper.xml @@ -183,8 +183,8 @@ - - select hrsa_salary_sob_default_item_id.nextval from dual + + select hrsa_salary_sob_default_item_id.currval 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 f57d14360..4b00b326b 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobEmpFieldMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobEmpFieldMapper.xml @@ -167,8 +167,8 @@ - - select hrsa_salary_sob_emp_field_id.nextval from dual + + select hrsa_salary_sob_emp_field_id.currval 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 56f620069..2f8118d1b 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobItemGroupMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobItemGroupMapper.xml @@ -167,8 +167,8 @@ - - select hrsa_salary_sob_item_group_id.nextval from dual + + select hrsa_salary_sob_item_group_id.currval 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 236782600..4850742a9 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobMapper.xml @@ -232,8 +232,8 @@ - - select hrsa_salary_sob_id.nextval from dual + + select hrsa_salary_sob_id.currval 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 dc47bd158..e14027ccc 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobRangeMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobRangeMapper.xml @@ -178,8 +178,8 @@ - - select hrsa_salary_sob_range_id.nextval from dual + + select hrsa_salary_sob_range_id.currval from dual INSERT INTO hrsa_salary_sob_range diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.xml index 1fe5dc1b0..578d953f6 100644 --- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.xml +++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.xml @@ -83,7 +83,7 @@ - + select nvl(max(id),0)+1 from hrsa_bill_batch INSERT INTO hrsa_bill_batch diff --git a/src/com/engine/salary/mapper/sicategory/ICategoryMapper.xml b/src/com/engine/salary/mapper/sicategory/ICategoryMapper.xml index 762a93868..518455ea1 100644 --- a/src/com/engine/salary/mapper/sicategory/ICategoryMapper.xml +++ b/src/com/engine/salary/mapper/sicategory/ICategoryMapper.xml @@ -81,8 +81,8 @@ - - select hrsa_insurance_category_id.nextval from dual + + select hrsa_insurance_category_id.currval 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 7f1b1340e..d6a55eb4d 100644 --- a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.xml +++ b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.xml @@ -142,8 +142,8 @@ - - select hrsa_scheme_detail_id.nextval from dual + + select hrsa_scheme_detail_id.currval 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 eb79dd53c..a5e6422b3 100644 --- a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.xml +++ b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.xml @@ -103,7 +103,7 @@ - + select nvl(max(id),0)+1 from hrsa_social_security_scheme 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 c247afb1f..04dd4fb3b 100644 --- a/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationDetailMapper.xml +++ b/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationDetailMapper.xml @@ -105,8 +105,8 @@ - - select hrsa_tax_declaration_detail_id.nextval from dual + + select hrsa_tax_declaration_detail_id.currval from dual INSERT INTO hrsa_tax_declaration_detail @@ -209,8 +209,8 @@ - - select hrsa_tax_declaration_detail_id.nextval from dual + + select hrsa_tax_declaration_detail_id.currval 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 7d889a9ee..d05ad50a3 100644 --- a/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml +++ b/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml @@ -192,8 +192,8 @@ - - select hrsa_tax_declaration_id.nextval from dual + + select hrsa_tax_declaration_id.currval from dual INSERT INTO hrsa_tax_declaration