oracle 适配

2022-05-30 09:14:12 +08:00 · 2022-05-30 09:14:12 +08:00 · d48ef0aeec
parent df92c102e2
commit d48ef0aeec
32 changed files with 46 additions and 34 deletions
--- a/resource/ecology9/WEB-INF/config/MyBatis.xml
+++ b/resource/ecology9/WEB-INF/config/MyBatis.xml
@ -5,6 +5,7 @@
 <configuration>
 	<settings>
 		<setting name="mapUnderscoreToCamelCase" value="true"></setting>
+		<setting name="jdbcTypeForNull" value="NULL"/>
 	</settings>
 	<plugins>
 		<plugin interceptor="weaver.conn.mybatis.MyBatisCachePlugin"></plugin>
--- a/resource/ecology9/sqlupgrade/Oracle/原始oracle新增.sql
+++ 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
+)
+/
--- a/src/com/engine/salary/mapper/SysTaxRateBaseMapper.xml
+++ b/src/com/engine/salary/mapper/SysTaxRateBaseMapper.xml
@ -85,7 +85,7 @@

    <insert id="insert" parameterType="com.engine.salary.entity.taxrate.SysTaxRateBase" databaseId="oracle"
    >
-        <selectKey  keyProperty="id" resultType="int" order="BEFORE">
+        <selectKey  keyProperty="id" resultType="long" order="BEFORE">
            select hrsa_sys_tax_rate_base_id.nextval from dual
        </selectKey>
        INSERT INTO hrsa_sys_tax_rate_base
@ -182,7 +182,7 @@

    <insert id="insertIgnoreNull" parameterType="com.engine.salary.entity.taxrate.SysTaxRateBase" databaseId="oracle"
    >
-        <selectKey  keyProperty="id" resultType="int" order="BEFORE">
+        <selectKey  keyProperty="id" resultType="long" order="BEFORE">
            select hrsa_sys_tax_rate_base_id.nextval from dual
        </selectKey>
        INSERT INTO hrsa_sys_tax_rate_base
--- a/src/com/engine/salary/mapper/TaxAgentMapper.xml
+++ b/src/com/engine/salary/mapper/TaxAgentMapper.xml
@ -92,7 +92,7 @@

    <insert id="insert" parameterType="com.engine.salary.entity.taxrate.TaxAgent"  databaseId="oracle"
    >
-        <selectKey  keyProperty="id" resultType="int" order="BEFORE">
+        <selectKey  keyProperty="id" resultType="long" order="BEFORE">
            select hrsa_tax_agent_id.nextval from dual
        </selectKey>
        INSERT INTO hrsa_tax_agent
--- a/src/com/engine/salary/mapper/TaxRateBaseMapper.xml
+++ b/src/com/engine/salary/mapper/TaxRateBaseMapper.xml
@ -88,7 +88,7 @@

    <insert id="insert" parameterType="com.engine.salary.entity.taxrate.TaxRateBase" databaseId="oracle"
    >
-        <selectKey  keyProperty="id" resultType="int" order="BEFORE">
+        <selectKey  keyProperty="id" resultType="long" order="BEFORE">
            select hrsa_tax_rate_base_id.nextval from dual
        </selectKey>
        INSERT INTO hrsa_tax_rate_base
--- a/src/com/engine/salary/mapper/TaxRateDetailMapper.xml
+++ b/src/com/engine/salary/mapper/TaxRateDetailMapper.xml
@ -101,7 +101,7 @@

    <insert id="insert" parameterType="com.engine.salary.entity.taxrate.TaxRateDetail" databaseId="oracle"
    >
-        <selectKey  keyProperty="id" resultType="int" order="BEFORE">
+        <selectKey  keyProperty="id" resultType="long" order="BEFORE">
            select hrsa_tax_rate_detail_id.nextval from dual
        </selectKey>
        INSERT INTO hrsa_tax_rate_detail
@ -253,7 +253,7 @@

    <insert id="insertIgnoreNull" parameterType="com.engine.salary.entity.taxrate.TaxRateDetail" databaseId="oracle"
    >
-        <selectKey  keyProperty="id" resultType="int" order="BEFORE">
+        <selectKey  keyProperty="id" resultType="long" order="BEFORE">
            select hrsa_tax_rate_detail_id.nextval from dual
        </selectKey>
        INSERT INTO hrsa_tax_rate_detail
--- a/src/com/engine/salary/mapper/archive/SalaryArchiveDimissionMapper.xml
+++ b/src/com/engine/salary/mapper/archive/SalaryArchiveDimissionMapper.xml
@ -134,7 +134,7 @@

    <insert id="insertIgnoreNull" parameterType="com.engine.salary.entity.salaryarchive.po.SalaryArchiveDimissionPO" databaseId="oracle"
    >
-        <selectKey  keyProperty="id" resultType="int" order="BEFORE">
+        <selectKey  keyProperty="id" resultType="long" order="BEFORE">
            select hrsa_salary_archive_dimission_id.nextval from dual
        </selectKey>
        INSERT INTO hrsa_salary_archive_dimission
--- a/src/com/engine/salary/mapper/archive/SalaryArchiveItemMapper.xml
+++ b/src/com/engine/salary/mapper/archive/SalaryArchiveItemMapper.xml
@ -222,7 +222,7 @@

    <insert id="insertIgnoreNull" parameterType="com.engine.salary.entity.salaryarchive.po.SalaryArchiveItemPO" databaseId="oracle"
    >
-        <selectKey  keyProperty="id" resultType="int" order="BEFORE">
+        <selectKey  keyProperty="id" resultType="long" order="BEFORE">
            select hrsa_salary_archive_item_id.nextval from dual
        </selectKey>
        INSERT INTO hrsa_salary_archive_item
--- a/src/com/engine/salary/mapper/archive/SalaryArchiveTaxAgentMapper.xml
+++ b/src/com/engine/salary/mapper/archive/SalaryArchiveTaxAgentMapper.xml
@ -217,7 +217,7 @@

    <insert id="insertIgnoreNull" parameterType="com.engine.salary.entity.salaryarchive.po.SalaryArchiveTaxAgentPO" databaseId="oracle"
    >
-        <selectKey  keyProperty="id" resultType="int" order="BEFORE">
+        <selectKey  keyProperty="id" resultType="long" order="BEFORE">
            select hrsa_salary_archive_tax_agent_id.nextval from dual
        </selectKey>
        INSERT INTO hrsa_salary_archive_tax_agent
--- a/src/com/engine/salary/mapper/datacollection/AttendQuoteDataValueMapper.xml
+++ b/src/com/engine/salary/mapper/datacollection/AttendQuoteDataValueMapper.xml
@ -128,7 +128,7 @@

    <insert id="insertIgnoreNull" parameterType="com.engine.salary.entity.datacollection.po.AttendQuoteDataValuePO" databaseId="oracle"
    >
-        <selectKey  keyProperty="id" resultType="int" order="BEFORE">
+        <selectKey  keyProperty="id" resultType="long" order="BEFORE">
            select hrsa_attend_quote_data_value_id.nextval from dual
        </selectKey>
        INSERT INTO hrsa_attend_quote_data_value
--- a/src/com/engine/salary/mapper/datacollection/AttendQuoteFieldMapper.xml
+++ b/src/com/engine/salary/mapper/datacollection/AttendQuoteFieldMapper.xml
@ -136,7 +136,7 @@

    <insert id="insertIgnoreNull" parameterType="com.engine.salary.entity.datacollection.po.AttendQuoteFieldPO" databaseId="oracle"
    >
-        <selectKey  keyProperty="id" resultType="int" order="BEFORE">
+        <selectKey  keyProperty="id" resultType="long" order="BEFORE">
            select hrsa_attend_quote_field_id.nextval from dual
        </selectKey>
        INSERT INTO hrsa_attend_quote_field
--- a/src/com/engine/salary/mapper/datacollection/AttendQuoteSyncSetMapper.xml
+++ b/src/com/engine/salary/mapper/datacollection/AttendQuoteSyncSetMapper.xml
@ -112,7 +112,7 @@

    <insert id="insertIgnoreNull" parameterType="com.engine.salary.entity.datacollection.po.AttendQuoteFieldSettingPO" databaseId="oracle"
    >
-        <selectKey  keyProperty="id" resultType="int" order="BEFORE">
+        <selectKey  keyProperty="id" resultType="long" order="BEFORE">
            select hrsa_attend_quote_sync_set_id.nextval from dual
        </selectKey>
        INSERT INTO hrsa_attend_quote_sync_set
--- a/src/com/engine/salary/mapper/datacollection/OtherDeductionMapper.xml
+++ b/src/com/engine/salary/mapper/datacollection/OtherDeductionMapper.xml
@ -144,7 +144,7 @@

    <insert id="insertIgnoreNull" parameterType="com.engine.salary.entity.datacollection.po.OtherDeductionPO" databaseId="oracle"
    >
-        <selectKey  keyProperty="id" resultType="int" order="BEFORE">
+        <selectKey  keyProperty="id" resultType="long" order="BEFORE">
            select hrsa_other_deduction_id.nextval from dual
        </selectKey>
        INSERT INTO hrsa_other_deduction
--- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml
+++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml
@ -205,7 +205,7 @@

    <insert id="insertIgnoreNull" parameterType="com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO" databaseId="oracle"
    >
-        <selectKey  keyProperty="id" resultType="int" order="BEFORE">
+        <selectKey  keyProperty="id" resultType="long" order="BEFORE">
            select hrsa_salary_acct_record_id.nextval from dual
        </selectKey>
        INSERT INTO hrsa_salary_acct_record
--- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultMapper.xml
+++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultMapper.xml
@ -219,7 +219,7 @@

    <insert id="insertIgnoreNull" parameterType="com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO" databaseId="oracle"
    >
-        <selectKey  keyProperty="id" resultType="int" order="BEFORE">
+        <selectKey  keyProperty="id" resultType="long" order="BEFORE">
            select hrsa_salary_acct_result_id.nextval from dual
        </selectKey>
        INSERT INTO hrsa_salary_acct_result
--- a/src/com/engine/salary/mapper/salarybill/SalarySendMapper.xml
+++ b/src/com/engine/salary/mapper/salarybill/SalarySendMapper.xml
@ -284,7 +284,7 @@

    <insert id="insertIgnoreNull" parameterType="com.engine.salary.entity.salaryBill.po.SalarySendPO" databaseId="oracle"
    >
-        <selectKey  keyProperty="id" resultType="int" order="BEFORE">
+        <selectKey  keyProperty="id" resultType="long" order="BEFORE">
            select hrsa_salary_send_id.nextval from dual
        </selectKey>
        INSERT INTO hrsa_salary_send
--- a/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml
+++ b/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml
@ -493,7 +493,7 @@

    <insert id="insertIgnoreNull" parameterType="com.engine.salary.entity.salaryBill.po.SalaryTemplatePO" databaseId="oracle"
    >
-        <selectKey  keyProperty="id" resultType="int" order="BEFORE">
+        <selectKey  keyProperty="id" resultType="long" order="BEFORE">
            select hrsa_salary_template_id.nextval from dual
        </selectKey>
        INSERT INTO hrsa_salary_template
--- a/src/com/engine/salary/mapper/salaryitem/SysSalaryItemMapper.xml
+++ b/src/com/engine/salary/mapper/salaryitem/SysSalaryItemMapper.xml
@ -255,7 +255,7 @@

    <insert id="insertIgnoreNull" parameterType="com.engine.salary.entity.salaryitem.po.SysSalaryItemPO" databaseId="oracle"
    >
-        <selectKey  keyProperty="id" resultType="int" order="BEFORE">
+        <selectKey  keyProperty="id" resultType="long" order="BEFORE">
            select hrsa_sys_salary_item_id.nextval from dual
        </selectKey>
        INSERT INTO hrsa_sys_salary_item
--- a/src/com/engine/salary/mapper/salarysob/SalarySobAdjustRuleMapper.xml
+++ b/src/com/engine/salary/mapper/salarysob/SalarySobAdjustRuleMapper.xml
@ -178,7 +178,7 @@

    <insert id="insertIgnoreNull" parameterType="com.engine.salary.entity.salarysob.po.SalarySobAdjustRulePO" databaseId="oracle"
    >
-        <selectKey  keyProperty="id" resultType="int" order="BEFORE">
+        <selectKey  keyProperty="id" resultType="long" order="BEFORE">
            select hrsa_salary_sob_adjust_rule_id.nextval from dual
        </selectKey>
        INSERT INTO hrsa_salary_sob_adjust_rule
--- a/src/com/engine/salary/mapper/salarysob/SalarySobCheckRuleMapper.xml
+++ b/src/com/engine/salary/mapper/salarysob/SalarySobCheckRuleMapper.xml
@ -206,7 +206,7 @@

    <insert id="insertIgnoreNull" parameterType="com.engine.salary.entity.salarysob.po.SalarySobCheckRulePO" databaseId="oracle"
    >
-        <selectKey  keyProperty="id" resultType="int" order="BEFORE">
+        <selectKey  keyProperty="id" resultType="long" order="BEFORE">
            select hrsa_salary_sob_check_rule_id.nextval from dual
        </selectKey>
        INSERT INTO hrsa_salary_sob_check_rule
--- a/src/com/engine/salary/mapper/salarysob/SalarySobDefaultEmpFieldMapper.xml
+++ b/src/com/engine/salary/mapper/salarysob/SalarySobDefaultEmpFieldMapper.xml
@ -157,7 +157,7 @@

    <insert id="insertIgnoreNull" parameterType="com.engine.salary.entity.salarysob.po.SalarySobDefaultEmpFieldPO" databaseId="oracle"
    >
-        <selectKey  keyProperty="id" resultType="int" order="BEFORE">
+        <selectKey  keyProperty="id" resultType="long" order="BEFORE">
            select hrsa_sob_default_emp_field_id.nextval from dual
        </selectKey>
        INSERT INTO hrsa_sob_default_emp_field
--- a/src/com/engine/salary/mapper/salarysob/SalarySobDefaultItemGroupMapper.xml
+++ b/src/com/engine/salary/mapper/salarysob/SalarySobDefaultItemGroupMapper.xml
@ -167,7 +167,7 @@

    <insert id="insertIgnoreNull" parameterType="com.engine.salary.entity.salarysob.po.SalarySobDefaultItemGroupPO" databaseId="oracle"
    >
-        <selectKey  keyProperty="id" resultType="int" order="BEFORE">
+        <selectKey  keyProperty="id" resultType="long" order="BEFORE">
            select hrsa_sob_default_item_group_id.nextval from dual
        </selectKey>
        INSERT INTO hrsa_sob_default_item_group
--- a/src/com/engine/salary/mapper/salarysob/SalarySobDefaultItemMapper.xml
+++ b/src/com/engine/salary/mapper/salarysob/SalarySobDefaultItemMapper.xml
@ -183,7 +183,7 @@

    <insert id="insertIgnoreNull" parameterType="com.engine.salary.entity.salarysob.po.SalarySobDefaultItemPO" databaseId="oracle"
    >
-        <selectKey  keyProperty="id" resultType="int" order="BEFORE">
+        <selectKey  keyProperty="id" resultType="long" order="BEFORE">
            select hrsa_salary_sob_default_item_id.nextval from dual
        </selectKey>
        INSERT INTO hrsa_salary_sob_default_item
--- a/src/com/engine/salary/mapper/salarysob/SalarySobEmpFieldMapper.xml
+++ b/src/com/engine/salary/mapper/salarysob/SalarySobEmpFieldMapper.xml
@ -167,7 +167,7 @@

    <insert id="insertIgnoreNull" parameterType="com.engine.salary.entity.salarysob.po.SalarySobEmpFieldPO" databaseId="oracle"
    >
-        <selectKey  keyProperty="id" resultType="int" order="BEFORE">
+        <selectKey  keyProperty="id" resultType="long" order="BEFORE">
            select hrsa_salary_sob_emp_field_id.nextval from dual
        </selectKey>
        INSERT INTO hrsa_salary_sob_emp_field
--- a/src/com/engine/salary/mapper/salarysob/SalarySobItemGroupMapper.xml
+++ b/src/com/engine/salary/mapper/salarysob/SalarySobItemGroupMapper.xml
@ -167,7 +167,7 @@

    <insert id="insertIgnoreNull" parameterType="com.engine.salary.entity.salarysob.po.SalarySobItemGroupPO" databaseId="oracle"
    >
-        <selectKey  keyProperty="id" resultType="int" order="BEFORE">
+        <selectKey  keyProperty="id" resultType="long" order="BEFORE">
            select hrsa_salary_sob_item_group_id.nextval from dual
        </selectKey>
        INSERT INTO hrsa_salary_sob_item_group
--- a/src/com/engine/salary/mapper/salarysob/SalarySobMapper.xml
+++ b/src/com/engine/salary/mapper/salarysob/SalarySobMapper.xml
@ -232,7 +232,7 @@

    <insert id="insertIgnoreNull" parameterType="com.engine.salary.entity.salarysob.po.SalarySobPO" databaseId="oracle"
    >
-        <selectKey  keyProperty="id" resultType="int" order="BEFORE">
+        <selectKey  keyProperty="id" resultType="long" order="BEFORE">
            select hrsa_salary_sob_id.nextval from dual
        </selectKey>
        INSERT INTO hrsa_salary_sob
--- a/src/com/engine/salary/mapper/salarysob/SalarySobRangeMapper.xml
+++ b/src/com/engine/salary/mapper/salarysob/SalarySobRangeMapper.xml
@ -178,7 +178,7 @@

    <insert id="insertIgnoreNull" parameterType="com.engine.salary.entity.salarysob.po.SalarySobRangePO" databaseId="oracle"
    >
-        <selectKey  keyProperty="id" resultType="int" order="BEFORE">
+        <selectKey  keyProperty="id" resultType="long" order="BEFORE">
            select hrsa_salary_sob_range_id.nextval from dual
        </selectKey>
        INSERT INTO hrsa_salary_sob_range
--- a/src/com/engine/salary/mapper/sicategory/ICategoryMapper.xml
+++ b/src/com/engine/salary/mapper/sicategory/ICategoryMapper.xml
@ -81,7 +81,7 @@

    <insert id="insert" parameterType="com.engine.salary.entity.sicategory.po.ICategoryPO" databaseId="oracle"
    >
-        <selectKey  keyProperty="id" resultType="int" order="BEFORE">
+        <selectKey  keyProperty="id" resultType="long" order="BEFORE">
            select hrsa_insurance_category_id.nextval from dual
        </selectKey>
        INSERT INTO hrsa_insurance_category
--- a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.xml
+++ b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.xml
@ -142,7 +142,7 @@

    <insert id="insert" parameterType="com.engine.salary.entity.sischeme.po.InsuranceSchemeDetailPO" databaseId="oracle"
    >
-        <selectKey  keyProperty="id" resultType="int" order="BEFORE">
+        <selectKey  keyProperty="id" resultType="long" order="BEFORE">
            select hrsa_scheme_detail_id.nextval from dual
        </selectKey>
        INSERT INTO hrsa_scheme_detail
--- a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.xml
+++ b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.xml
@ -103,8 +103,8 @@

    <insert id="insert" parameterType="com.engine.salary.entity.sischeme.po.InsuranceSchemePO" databaseId="oracle"
    >
-        <selectKey  keyProperty="id" resultType="int" order="BEFORE">
-            select hrsa_social_security_scheme_id.nextval from dual
+        <selectKey  keyProperty="id" resultType="long" order="BEFORE">
+            select hrsa_social_s_s_id.nextval from dual
        </selectKey>
        INSERT INTO hrsa_social_security_scheme
        <trim prefix="(" suffix=")" suffixOverrides=",">
--- a/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationDetailMapper.xml
+++ b/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationDetailMapper.xml
@ -105,7 +105,7 @@

    <insert id="insert" parameterType="com.engine.salary.entity.taxdeclaration.TaxDeclarationDetail" databaseId="oracle"
    >
-        <selectKey  keyProperty="id" resultType="int" order="BEFORE">
+        <selectKey  keyProperty="id" resultType="long" order="BEFORE">
            select hrsa_tax_declaration_detail_id.nextval from dual
        </selectKey>
        INSERT INTO hrsa_tax_declaration_detail
@ -209,7 +209,7 @@

    <insert id="insertIgnoreNull" parameterType="com.engine.salary.entity.taxdeclaration.TaxDeclarationDetail" databaseId="oracle"
    >
-        <selectKey  keyProperty="id" resultType="int" order="BEFORE">
+        <selectKey  keyProperty="id" resultType="long" order="BEFORE">
            select hrsa_tax_declaration_detail_id.nextval from dual
        </selectKey>
        INSERT INTO hrsa_tax_declaration_detail
--- a/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml
+++ b/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml
@ -192,7 +192,7 @@

    <insert id="insertIgnoreNull" parameterType="com.engine.salary.entity.taxdeclaration.TaxDeclaration" databaseId="oracle"
    >
-        <selectKey  keyProperty="id" resultType="int" order="BEFORE">
+        <selectKey  keyProperty="id" resultType="long" order="BEFORE">
            select hrsa_tax_declaration_id.nextval from dual
        </selectKey>
        INSERT INTO hrsa_tax_declaration