From 16a4f32ec1fd528d2bca64044c6bd7df7bfc038e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Fri, 22 Apr 2022 18:00:35 +0800 Subject: [PATCH] =?UTF-8?q?sqlserver=E7=9A=84=E6=89=B9=E9=87=8F=E6=8F=92?= =?UTF-8?q?=E5=85=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../archive/SalaryArchiveItemMapper.xml | 2 +- .../mapper/archive/SalaryArchiveMapper.xml | 2 +- .../archive/SalaryArchiveTaxAgentMapper.xml | 2 +- .../datacollection/AddUpDeductionMapper.xml | 2 +- .../datacollection/AddUpSituationMapper.xml | 2 +- .../datacollection/AttendQuoteDataMapper.xml | 2 +- .../AttendQuoteDataValueMapper.xml | 2 +- .../datacollection/AttendQuoteFieldMapper.xml | 2 +- .../datacollection/OtherDeductionMapper.xml | 2 +- .../salaryacct/ExcelAcctResultMapper.xml | 8 ++--- .../salaryacct/SalaryAcctEmployeeMapper.xml | 2 +- .../salaryacct/SalaryAcctResultMapper.xml | 2 +- .../salaryacct/SalaryAcctResultTempMapper.xml | 8 ++--- .../salarybill/SalarySendInfoMapper.xml | 32 +++++++++---------- .../mapper/salaryitem/SalaryItemMapper.xml | 2 +- .../salarysob/SalarySobAdjustRuleMapper.xml | 2 +- .../salarysob/SalarySobCheckRuleMapper.xml | 2 +- .../salarysob/SalarySobEmpFieldMapper.xml | 2 +- .../salarysob/SalarySobItemGroupMapper.xml | 2 +- .../mapper/salarysob/SalarySobItemMapper.xml | 2 +- .../mapper/salarysob/SalarySobRangeMapper.xml | 2 +- .../InsuranceAccountDetailMapper.xml | 2 +- .../InsuranceAccountInspectMapper.xml | 2 +- .../siaccount/SIAccountDetailTempMapper.xml | 2 +- .../mapper/siarchives/FundSchemeMapper.xml | 2 +- .../mapper/siarchives/OtherSchemeMapper.xml | 2 +- .../mapper/siarchives/SocialSchemeMapper.xml | 2 +- .../taxdeclaration/TaxDeclarationMapper.xml | 2 +- 28 files changed, 49 insertions(+), 49 deletions(-) diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveItemMapper.xml b/src/com/engine/salary/mapper/archive/SalaryArchiveItemMapper.xml index 16269542e..83b9ae7ec 100644 --- a/src/com/engine/salary/mapper/archive/SalaryArchiveItemMapper.xml +++ b/src/com/engine/salary/mapper/archive/SalaryArchiveItemMapper.xml @@ -376,6 +376,7 @@ + INSERT INTO hrsa_salary_archive_item ( salary_archive_id, employee_id, @@ -392,7 +393,6 @@ tenant_key ) VALUES - ( #{item.salaryArchiveId}, #{item.employeeId}, diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml index d7c9a9f16..d99ac809d 100644 --- a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml +++ b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml @@ -461,6 +461,7 @@ + INSERT INTO hrsa_salary_archive ( id, employee_id, @@ -470,7 +471,6 @@ tenant_key ) VALUES - ( #{item.id}, #{item.employeeId}, diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveTaxAgentMapper.xml b/src/com/engine/salary/mapper/archive/SalaryArchiveTaxAgentMapper.xml index 107e25f1c..b2fd2ec73 100644 --- a/src/com/engine/salary/mapper/archive/SalaryArchiveTaxAgentMapper.xml +++ b/src/com/engine/salary/mapper/archive/SalaryArchiveTaxAgentMapper.xml @@ -427,11 +427,11 @@ + INSERT INTO hrsa_salary_archive_tax_agent ( ) VALUES - ( #{item.salaryArchiveId}, #{item.employeeId}, diff --git a/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.xml b/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.xml index 421a0b048..61d4f350a 100644 --- a/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.xml @@ -607,6 +607,7 @@ + INSERT INTO hrsa_add_up_deduction( employee_id, tax_agent_id, @@ -622,7 +623,6 @@ tenant_key ) VALUES - ( #{item.employeeId}, #{item.taxAgentId}, diff --git a/src/com/engine/salary/mapper/datacollection/AddUpSituationMapper.xml b/src/com/engine/salary/mapper/datacollection/AddUpSituationMapper.xml index b0f351c70..0c67e7618 100644 --- a/src/com/engine/salary/mapper/datacollection/AddUpSituationMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/AddUpSituationMapper.xml @@ -793,6 +793,7 @@ + INSERT INTO hrsa_add_up_situation( employee_id, tax_agent_id, @@ -818,7 +819,6 @@ tenant_key ) VALUES - ( #{item.employeeId}, #{item.taxAgentId}, diff --git a/src/com/engine/salary/mapper/datacollection/AttendQuoteDataMapper.xml b/src/com/engine/salary/mapper/datacollection/AttendQuoteDataMapper.xml index 82e96cc1b..4359d18cf 100644 --- a/src/com/engine/salary/mapper/datacollection/AttendQuoteDataMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/AttendQuoteDataMapper.xml @@ -346,6 +346,7 @@ + INSERT INTO hrsa_attend_quote_data( id, employee_id, @@ -355,7 +356,6 @@ creator, tenant_key) VALUES - ( #{item.id}, #{item.employeeId}, diff --git a/src/com/engine/salary/mapper/datacollection/AttendQuoteDataValueMapper.xml b/src/com/engine/salary/mapper/datacollection/AttendQuoteDataValueMapper.xml index 7512eb1fd..0ea2c67dc 100644 --- a/src/com/engine/salary/mapper/datacollection/AttendQuoteDataValueMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/AttendQuoteDataValueMapper.xml @@ -256,6 +256,7 @@ + INSERT INTO hrsa_attend_quote_data_value( employee_id, attend_quote_id, @@ -267,7 +268,6 @@ creator, tenant_key) VALUES - ( #{item.employeeId}, #{item.attendQuoteId}, diff --git a/src/com/engine/salary/mapper/datacollection/AttendQuoteFieldMapper.xml b/src/com/engine/salary/mapper/datacollection/AttendQuoteFieldMapper.xml index 776a48c89..9fb5db724 100644 --- a/src/com/engine/salary/mapper/datacollection/AttendQuoteFieldMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/AttendQuoteFieldMapper.xml @@ -308,10 +308,10 @@ + INSERT INTO hrsa_attend_quote_field (field_name,source_type,field_type,enable_status,code,description,create_time,update_time,creator,delete_type,tenant_key) VALUES - ( #{item.fieldName}, #{item.sourceType}, diff --git a/src/com/engine/salary/mapper/datacollection/OtherDeductionMapper.xml b/src/com/engine/salary/mapper/datacollection/OtherDeductionMapper.xml index b1adfbbe4..2c6a43327 100644 --- a/src/com/engine/salary/mapper/datacollection/OtherDeductionMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/OtherDeductionMapper.xml @@ -518,6 +518,7 @@ + INSERT INTO hrsa_other_deduction( employee_id, tax_agent_id, @@ -532,7 +533,6 @@ tenant_key ) VALUES - ( #{item.employeeId}, #{item.taxAgentId}, diff --git a/src/com/engine/salary/mapper/salaryacct/ExcelAcctResultMapper.xml b/src/com/engine/salary/mapper/salaryacct/ExcelAcctResultMapper.xml index 6af2efc2e..1e756dda9 100644 --- a/src/com/engine/salary/mapper/salaryacct/ExcelAcctResultMapper.xml +++ b/src/com/engine/salary/mapper/salaryacct/ExcelAcctResultMapper.xml @@ -67,11 +67,11 @@ + INSERT INTO hrsa_excel_acct_result( salary_sob_id, salary_acct_emp_id, salary_acct_record_id, employee_id, - salary_item_id, result_value, creator, create_time, update_time, - delete_type, tenant_key) - VALUES - + salary_item_id, result_value, creator, create_time, update_time, + delete_type, tenant_key) + VALUES ( #{item.salarySobId}, #{item.salaryAcctEmpId}, diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml index 083072dfa..132ce894c 100644 --- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml +++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml @@ -77,11 +77,11 @@ + INSERT INTO hrsa_salary_acct_emp( salary_acct_record_id, salary_sob_id, employee_id, tax_agent_id, salary_month, creator, create_time, update_time, delete_type, tenant_key) VALUES - ( #{emp.salaryAcctRecordId}, #{emp.salarySobId}, diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultMapper.xml index 5b273b8f0..fd4eaf02e 100644 --- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultMapper.xml +++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultMapper.xml @@ -379,10 +379,10 @@ + INSERT INTO hrsa_salary_acct_result(id, salary_sob_id, salary_acct_emp_id, salary_acct_record_id, employee_id, tax_agent_id, salary_item_id, result_value, creator, create_time, update_time, delete_type, tenant_key) VALUES - ( #{item.id}, #{item.salarySobId}, diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultTempMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultTempMapper.xml index 7dc08f422..336e30f1f 100644 --- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultTempMapper.xml +++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultTempMapper.xml @@ -49,11 +49,11 @@ + INSERT INTO hrsa_acct_result_temp( salary_sob_id, salary_acct_emp_id, salary_acct_record_id, employee_id, - tax_agent_id, salary_item_id, result_value, calculate_key, creator, create_time, update_time, delete_type, - tenant_key) - VALUES - + tax_agent_id, salary_item_id, result_value, calculate_key, creator, create_time, update_time, delete_type, + tenant_key) + VALUES ( #{item.salarySobId}, #{item.salaryAcctEmpId}, diff --git a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml index 6a840850d..4591366a7 100644 --- a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml +++ b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml @@ -99,22 +99,22 @@ - INSERT INTO hrsa_salary_send_info ( - id, - salary_send_id, - salary_month, - salary_acct_record_id, - tax_agent_id, - employee_id, - send_status, - creator, - create_time, - update_time, - tenant_key - ) - VALUES - - ( + + INSERT INTO hrsa_salary_send_info ( + id, + salary_send_id, + salary_month, + salary_acct_record_id, + tax_agent_id, + employee_id, + send_status, + creator, + create_time, + update_time, + tenant_key + ) + VALUES + ( #{item.id}, #{item.salarySendId}, #{item.salaryMonth}, diff --git a/src/com/engine/salary/mapper/salaryitem/SalaryItemMapper.xml b/src/com/engine/salary/mapper/salaryitem/SalaryItemMapper.xml index 09bbba29a..3a9fa18a3 100644 --- a/src/com/engine/salary/mapper/salaryitem/SalaryItemMapper.xml +++ b/src/com/engine/salary/mapper/salaryitem/SalaryItemMapper.xml @@ -359,12 +359,12 @@ + INSERT INTO hrsa_salary_item (name, code, system_type, sys_salary_item_id, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, formula_id, description, can_edit, create_time, update_time, creator, delete_type, tenant_key, data_type) VALUES - (#{item.name}, #{item.code}, #{item.systemType}, #{item.sysSalaryItemId}, #{item.useDefault}, #{item.useInEmployeeSalary}, #{item.roundingMode}, #{item.pattern}, diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobAdjustRuleMapper.xml b/src/com/engine/salary/mapper/salarysob/SalarySobAdjustRuleMapper.xml index f91f06e11..c80e29b50 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobAdjustRuleMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobAdjustRuleMapper.xml @@ -286,12 +286,12 @@ + INSERT INTO hrsa_salary_sob_adjust_rule (salary_sob_id, salary_item_id, day_of_month, before_adjustment_type, after_adjustment_type, creator, create_time, update_time, delete_type, tenant_key) VALUES - ( #{item.salarySobId}, #{item.salaryItemId}, diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobCheckRuleMapper.xml b/src/com/engine/salary/mapper/salarysob/SalarySobCheckRuleMapper.xml index 811026572..6460759e9 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobCheckRuleMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobCheckRuleMapper.xml @@ -324,10 +324,10 @@ + INSERT INTO hrsa_salary_sob_check_rule(salary_sob_id, name, formula_id, description, create_time, update_time, creator, delete_type, tenant_key) VALUES - ( #{item.salarySobId}, #{item.name}, diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobEmpFieldMapper.xml b/src/com/engine/salary/mapper/salarysob/SalarySobEmpFieldMapper.xml index a58db1f1c..5f3f4c824 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobEmpFieldMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobEmpFieldMapper.xml @@ -266,11 +266,11 @@ + INSERT INTO hrsa_salary_sob_emp_field(salary_sob_id, field_code, sorted_index, creator, create_time, update_time, delete_type, tenant_key) VALUES - ( #{item.salarySobId}, #{item.fieldCode}, diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobItemGroupMapper.xml b/src/com/engine/salary/mapper/salarysob/SalarySobItemGroupMapper.xml index 582cdce30..961a188f6 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobItemGroupMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobItemGroupMapper.xml @@ -283,10 +283,10 @@ + INSERT INTO hrsa_salary_sob_item_group( salary_sob_id, name, sorted_index, description, create_time, update_time, creator, tenant_key) VALUES - ( #{item.salarySobId}, #{item.name}, diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml b/src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml index fc6314863..5accb0ea7 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml @@ -336,10 +336,10 @@ + INSERT INTO hrsa_salary_sob_item( salary_sob_id, salary_item_id, salary_sob_item_group_id, formula_id, sorted_index, description, create_time, update_time, creator, delete_type, tenant_key) VALUES - ( #{item.salarySobId}, #{item.salaryItemId}, diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobRangeMapper.xml b/src/com/engine/salary/mapper/salarysob/SalarySobRangeMapper.xml index fd4d64a6b..fc6296915 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobRangeMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobRangeMapper.xml @@ -282,10 +282,10 @@ + INSERT INTO hrsa_salary_sob_range( salary_sob_id, target_type, target_id, employee_status, include_type, creator, create_time, update_time, delete_type, tenant_key) VALUES - ( #{item.salarySobId}, #{item.targetType.value}, diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml index eff96524a..1e2382487 100644 --- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml +++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml @@ -411,13 +411,13 @@ + INSERT INTO hrsa_bill_detail (employee_id,bill_month,bill_status,payment_status,supplementary_month,supplementary_projects,resource_from,social_pay_org,social_account,fund_pay_org, fund_account,supplement_fund_account,other_pay_org,social_scheme_id,social_payment_base_string,fund_scheme_id,fund_payment_base_string,other_scheme_id,other_payment_base_string,social_per_json, social_per_sum,fund_per_json,fund_per_sum,other_per_json,other_per_sum,per_sum,social_com_json,social_com_sum,fund_com_json, fund_com_sum,other_com_json,other_com_sum,com_sum,social_sum,fund_sum,other_sum,total,creator,delete_type,create_time,update_time.tenant_key) VALUES - ( #{item.employeeId}, #{item.billMonth}, diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountInspectMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountInspectMapper.xml index f15695346..b50947b1f 100644 --- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountInspectMapper.xml +++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountInspectMapper.xml @@ -138,11 +138,11 @@ + INSERT INTO hrsa_bill_inspect (employee_id,bill_month,payment_status,inspect_status,supplementary_month, supplementary_projects,creator,delete_type,create_time,update_time.tenant_key) VALUES - ( #{item.employeeId}, #{item.billMonth}, diff --git a/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.xml b/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.xml index 81b85a670..f5c327cbc 100644 --- a/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.xml +++ b/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.xml @@ -219,13 +219,13 @@ + INSERT INTO hrsa_bill_detail_temp (employee_id,bill_month,bill_status,payment_status,supplementary_month,supplementary_projects,resource_from,social_pay_org,social_account,fund_pay_org, fund_account,supplement_fund_account,other_pay_org,social_scheme_id,social_payment_base_string,fund_scheme_id,fund_payment_base_string,other_scheme_id,other_payment_base_string,social_per_json, social_per_sum,fund_per_json,fund_per_sum,other_per_json,other_per_sum,per_sum,social_com_json,social_com_sum,fund_com_json, fund_com_sum,other_com_json,other_com_sum,com_sum,social_sum,fund_sum,other_sum,total,creator,delete_type,create_time,update_time.tenant_key) VALUES - ( #{item.employeeId}, #{item.billMonth}, diff --git a/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml index 593e5556e..b6e90ba3e 100644 --- a/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml +++ b/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml @@ -153,6 +153,7 @@ + INSERT INTO hrsa_fund_archives( fund_scheme_id, fund_account, @@ -171,7 +172,6 @@ welfare_type, employee_id) VALUES - ( #{item.fundSchemeId}, #{item.fundAccount}, diff --git a/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml index 4e23f614b..614a8d11b 100644 --- a/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml +++ b/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml @@ -142,6 +142,7 @@ + INSERT INTO hrsa_other_archives( other_scheme_id, other_start_time, @@ -158,7 +159,6 @@ payment_organization, other_payment_base_string) VALUES - ( #{item.otherSchemeId}, #{item.otherStartTime}, diff --git a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml index c86ea8766..ef4d76eb0 100644 --- a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml +++ b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml @@ -145,6 +145,7 @@ + INSERT INTO hrsa_social_archives( welfare_type, delete_type, @@ -162,7 +163,6 @@ social_account, payment_organization) VALUES - ( #{item.welfareType}, #{item.deleteType}, diff --git a/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml b/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml index 69c61121a..5a0f0bed7 100644 --- a/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml +++ b/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml @@ -97,10 +97,10 @@ + INSERT INTO hrsa_tax_declaration(id, salary_month, tax_cycle, tax_agent_id, description, creator, create_time, update_time, delete_type, tenant_key) VALUES - ( #{item.id}, #{item.salaryMonth},