From fc806ebcc7e5985c9ac651101e361b3cf77bf3dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Mon, 18 Apr 2022 21:35:08 +0800
Subject: [PATCH] sql

---
 resource/sql/mysql.sql                        |  6 +++++
 resource/sql/sqlserver.sql                    | 26 +++++++++++++++++--
 .../mapper/salaryitem/SalaryItemMapper.xml    |  6 +++++
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/resource/sql/mysql.sql b/resource/sql/mysql.sql
index a955b7c8f..2268d52c0 100644
--- a/resource/sql/mysql.sql
+++ b/resource/sql/mysql.sql
@@ -45,6 +45,12 @@ alter table hrsa_bill_detail_temp modify id bigint auto_increment;
 alter table hrsa_bill_inspect modify id bigint auto_increment;
 
 
+ALTER TABLE hrsa_salary_item
+ADD COLUMN data_type varchar(20) NOT NULL COMMENT '字段类型。string：字符、number：数字' AFTER tenant_key;
+
+ALTER TABLE hrsa_sys_salary_item
+ADD COLUMN data_type varchar(20) NOT NULL COMMENT '字段类型。string：字符、number：数字' AFTER tenant_key;
+
 
 ALTER TABLE hrsa_salary_sob_default_item
 ADD COLUMN sob_default_item_group_id bigint(0) NOT NULL COMMENT '薪资账套默认薪资项目分类的id' AFTER tenant_key,
diff --git a/resource/sql/sqlserver.sql b/resource/sql/sqlserver.sql
index 69b03f727..2960ff684 100644
--- a/resource/sql/sqlserver.sql
+++ b/resource/sql/sqlserver.sql
@@ -35,5 +35,27 @@ CREATE TABLE hrsa_formula_var
 );
 
 
-ALTER TABLE hrsa_salary_sob_default_item ADD  sob_default_item_group_id bigint NOT NULL ;
-ALTER TABLE hrsa_salary_sob_default_item ADD  sorted_index int NOT NULL ;
\ No newline at end of file
+ALTER TABLE hrsa_salary_sob_default_item
+    ADD sob_default_item_group_id bigint NOT NULL;
+ALTER TABLE hrsa_salary_sob_default_item
+    ADD sorted_index int NOT NULL;
+
+ALTER TABLE hrsa_salary_item
+    ADD data_type varchar(20) NOT NULL;
+
+
+CREATE TABLE hrsa_salary_sob_item
+(
+    id                       bigint(20) identity (1,1) PRIMARY KEY,
+    salary_sob_id            bigint(20) NOT NULL,
+    salary_item_id           bigint(20) NOT NULL,
+    salary_sob_item_group_id bigint(20) NOT NULL,
+    formula_id               bigint(20) NOT NULL,
+    sorted_index             int(11) NOT NULL,
+    description              varchar(1000) NOT NULL DEFAULT '',
+    create_time              datetime      NOT NULL,
+    update_time              datetime      NOT NULL,
+    creator                  bigint(20) NOT NULL,
+    delete_type              int(11) NOT NULL,
+    tenant_key               varchar(10)   NOT NULL
+);
\ No newline at end of file
diff --git a/src/com/engine/salary/mapper/salaryitem/SalaryItemMapper.xml b/src/com/engine/salary/mapper/salaryitem/SalaryItemMapper.xml
index f154fda90..09bbba29a 100644
--- a/src/com/engine/salary/mapper/salaryitem/SalaryItemMapper.xml
+++ b/src/com/engine/salary/mapper/salaryitem/SalaryItemMapper.xml
@@ -192,6 +192,9 @@
             <if test="updateTime != null">
                 update_time,
             </if>
+            <if test="dataType != null">
+                data_type,
+            </if>
         </trim>
         <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -248,6 +251,9 @@
             <if test="updateTime != null">
                 #{updateTime},
             </if>
+            <if test="dataType != null">
+                #{dataType},
+            </if>
         </trim>
     </insert>