diff --git a/resource/sql/分权.sql b/resource/sql/分权.sql index ff55b57c1..99649532f 100644 --- a/resource/sql/分权.sql +++ b/resource/sql/分权.sql @@ -6,14 +6,14 @@ CREATE TABLE hrsa_tax_agent_emp update_time datetime(0) NULL DEFAULT NULL COMMENT '修改时间', creator bigint(20) NULL DEFAULT NULL COMMENT '创建人id', delete_type int(11) NULL DEFAULT 0, - tenant_key varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '租户KEY', + tenant_key varchar(10) NULL DEFAULT NULL COMMENT '租户KEY', tax_agent_id bigint(20) NULL DEFAULT NULL COMMENT '个税扣缴义务人的主键id', employee_id bigint(20) NULL DEFAULT NULL COMMENT '人员信息表的主键id', - employee_name varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + employee_name varchar(255) NULL DEFAULT NULL, PRIMARY KEY (id) USING BTREE, INDEX idx_tenant_key(tenant_key) USING BTREE, INDEX idx_tax_agent(tax_agent_id) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; +) ; DROP TABLE IF EXISTS hrsa_tax_agent_emp_change; CREATE TABLE hrsa_tax_agent_emp_change @@ -23,16 +23,16 @@ CREATE TABLE hrsa_tax_agent_emp_change update_time datetime(0) NULL DEFAULT NULL COMMENT '修改时间', creator bigint(20) NULL DEFAULT NULL COMMENT '创建人id', delete_type int(11) NULL DEFAULT 0 COMMENT '是否删除', - tenant_key varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '租户KEY', + tenant_key varchar(10) NULL DEFAULT NULL COMMENT '租户KEY', tax_agent_id bigint(20) NOT NULL COMMENT '个税扣缴义务人的主键id', employee_id bigint(20) NOT NULL COMMENT '人员信息表的主键id', change_type int(11) NOT NULL DEFAULT 0 COMMENT '增量类型。1：新增、2：删除', - employee_name varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + employee_name varchar(255) NULL DEFAULT NULL, module_type int(4) NOT NULL DEFAULT 0, PRIMARY KEY (id) USING BTREE, INDEX idx_tenant_key(tenant_key) USING BTREE, INDEX idx_tax_agent(tax_agent_id) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; +) ; DROP TABLE IF EXISTS hrsa_tax_agent_admin; @@ -45,11 +45,11 @@ CREATE TABLE hrsa_tax_agent_admin update_time datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP (0) ON UPDATE CURRENT_TIMESTAMP (0) COMMENT '更新时间', creator bigint(20) NOT NULL DEFAULT 0 COMMENT '创建人', delete_type int(11) NOT NULL DEFAULT 0 COMMENT '是否已删除。0：未删除、1：已删除', - tenant_key varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '租户ID', + tenant_key varchar(10) NOT NULL DEFAULT '' COMMENT '租户ID', PRIMARY KEY (id) USING BTREE, INDEX idx_tenant_key(tenant_key) USING BTREE, INDEX idx_employee_id(employee_id) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '个税扣缴义务人管理员表' ROW_FORMAT = Dynamic; +) ; DROP TABLE IF EXISTS hrsa_tax_agent_manage_range; CREATE TABLE hrsa_tax_agent_manage_range @@ -60,19 +60,19 @@ CREATE TABLE hrsa_tax_agent_manage_range tax_agent_sub_admin_id bigint(20) NOT NULL DEFAULT 0 COMMENT '个税扣缴义务人的分管理员的id', target_type tinyint(4) NOT NULL DEFAULT 1 COMMENT '对象类型。1：人员、2：部门、3：岗位', target_id bigint(20) NOT NULL DEFAULT 0 COMMENT '对象id', - employee_status varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + employee_status varchar(100) NOT NULL, include_type int(4) NOT NULL DEFAULT 1, creator bigint(20) NOT NULL DEFAULT 0 COMMENT '创建人', create_time datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP (0) COMMENT '创建时间', update_time datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP (0) ON UPDATE CURRENT_TIMESTAMP (0) COMMENT '更新时间', delete_type int(11) NOT NULL DEFAULT 0 COMMENT '是否已删除。0：未删除、1：已删除', - tenant_key varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '租户ID', + tenant_key varchar(10) NOT NULL DEFAULT '' COMMENT '租户ID', range_type int(4) NOT NULL DEFAULT 0, PRIMARY KEY (id) USING BTREE, INDEX idx_tenant(tenant_key) USING BTREE, INDEX idx_tax_agent_sub_admin_id(tax_agent_sub_admin_id) USING BTREE, INDEX idx_tenant_key(tenant_key) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '个税扣缴义务人的管理范围表' ROW_FORMAT = Dynamic; +) ; DROP TABLE IF EXISTS hrsa_tax_agent_base; CREATE TABLE hrsa_tax_agent_base @@ -83,10 +83,10 @@ CREATE TABLE hrsa_tax_agent_base update_time datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP (0) ON UPDATE CURRENT_TIMESTAMP (0) COMMENT '更新时间', creator bigint(20) NOT NULL DEFAULT 0 COMMENT '创建人', delete_type int(11) NOT NULL DEFAULT 0 COMMENT '是否已删除。0：未删除、1：已删除', - tenant_key varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '租户ID', + tenant_key varchar(10) NOT NULL DEFAULT '' COMMENT '租户ID', PRIMARY KEY (id) USING BTREE, INDEX idx_tenant_key(tenant_key) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '个税扣缴义务人基础信息表' ROW_FORMAT = Dynamic; +) ; DROP TABLE IF EXISTS hrsa_tax_agent_sub_admin; CREATE TABLE hrsa_tax_agent_sub_admin @@ -94,18 +94,18 @@ CREATE TABLE hrsa_tax_agent_sub_admin id bigint(20) NOT NULL COMMENT '主键', tax_agent_id bigint(20) NOT NULL COMMENT '个税扣缴义务人的主键id', employee_id bigint(20) NOT NULL COMMENT '人员信息表的主键id', - description varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', + description varchar(100) NULL DEFAULT NULL COMMENT '描述', create_time datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', update_time datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP (0) COMMENT '更新时间', creator bigint(20) NOT NULL DEFAULT 0 COMMENT '创建人', delete_type int(11) NOT NULL DEFAULT 0 COMMENT '是否已删除。0：未删除、1：已删除', - tenant_key varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '租户ID', - remark text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL, + tenant_key varchar(10) NOT NULL DEFAULT '' COMMENT '租户ID', + remark text NULL, PRIMARY KEY (id) USING BTREE, INDEX idx_tenant_key(tenant_key) USING BTREE, INDEX idx_tax_agent_id(tax_agent_id) USING BTREE, INDEX idx_employee_id(employee_id) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '个税扣缴义务人分管理员表' ROW_FORMAT = Dynamic; +) ; DROP TABLE IF EXISTS hrsa_tax_agent_sub_admin_emp; CREATE TABLE hrsa_tax_agent_sub_admin_emp @@ -115,28 +115,28 @@ CREATE TABLE hrsa_tax_agent_sub_admin_emp update_time datetime(0) NULL DEFAULT NULL COMMENT '修改时间', creator bigint(20) NULL DEFAULT NULL COMMENT '创建人id', delete_type int(11) NULL DEFAULT 0 COMMENT '是否删除', - tenant_key varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '租户KEY', + tenant_key varchar(10) NULL DEFAULT NULL COMMENT '租户KEY', tax_agent_id bigint(20) NOT NULL DEFAULT 0 COMMENT '个税扣缴义务人的主键id', tax_agent_sub_admin_id bigint(20) NOT NULL DEFAULT 0 COMMENT '个税扣缴义务人的分管理员的id', employee_id bigint(20) NOT NULL DEFAULT 0 COMMENT '人员信息表的主键id', - employee_name varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '人员姓名', + employee_name varchar(255) NULL DEFAULT NULL COMMENT '人员姓名', PRIMARY KEY (id) USING BTREE, INDEX idx_tenant_key(tenant_key) USING BTREE, INDEX idx_tax_agent(tax_agent_id) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; +) ; -ALTER TABLE hrsa_tax_agent ADD COLUMN payment_agency varchar(255) NULL COMMENT '代缴机构' AFTER tenant_key; +ALTER TABLE hrsa_tax_agent ADD COLUMN payment_agency varchar(255) NULL COMMENT '代缴机构' ; -ALTER TABLE hrsa_salary_sob ADD COLUMN tax_agent_id bigint(0) NULL COMMENT '个税扣缴义务人的主键id' AFTER tenant_key; +ALTER TABLE hrsa_salary_sob ADD COLUMN tax_agent_id bigint(0) NULL COMMENT '个税扣缴义务人的主键id' ; INSERT INTO hrsa_tax_agent_base(id, devolution_status, create_time, update_time, creator, delete_type, tenant_key) VALUES (1653303537239, 1, '2022-05-23 18:58:53', '2022-05-23 19:12:12', 1, 0, 'all_teams'); -ALTER TABLE hrsa_bill_detail_temp ADD COLUMN payment_organization bigint(0) NULL COMMENT '个税扣缴义务人id' AFTER tenant_key; +ALTER TABLE hrsa_bill_detail_temp ADD COLUMN payment_organization bigint(0) NULL COMMENT '个税扣缴义务人id' ; -ALTER TABLE hrsa_bill_detail ADD COLUMN payment_organization bigint(0) NULL COMMENT '个税扣缴义务人id' AFTER tenant_key; +ALTER TABLE hrsa_bill_detail ADD COLUMN payment_organization bigint(0) NULL COMMENT '个税扣缴义务人id' ; -ALTER TABLE hrsa_bill_batch ADD COLUMN payment_organization bigint(0) NULL COMMENT '个税扣缴义务人id' AFTER tenant_key; \ No newline at end of file +ALTER TABLE hrsa_bill_batch ADD COLUMN payment_organization bigint(0) NULL COMMENT '个税扣缴义务人id' ; \ No newline at end of file diff --git a/resource/sql/分权oracle.sql b/resource/sql/分权oracle.sql new file mode 100644 index 000000000..1a632f98c --- /dev/null +++ b/resource/sql/分权oracle.sql @@ -0,0 +1,134 @@ +CREATE TABLE hrsa_tax_agent_emp +( + id NUMBER(38,0) primary key NOT NULL, + create_time date DEFAULT sysdate, + update_time date DEFAULT sysdate, + creator NUMBER(38,0) DEFAULT 0, + delete_type number DEFAULT 0 , + tenant_key varchar2(10) DEFAULT '', + tax_agent_id NUMBER(38,0) NOT NULL, + employee_id NUMBER(38,0) NOT NULL, + employee_name varchar2(255) +) ; +/ + +CREATE TABLE hrsa_tax_agent_emp_change +( + id NUMBER(38,0) primary key NOT NULL, + create_time date DEFAULT sysdate, + update_time date DEFAULT sysdate, + creator NUMBER(38,0) DEFAULT 0, + delete_type number DEFAULT 0 , + tenant_key varchar2(10) DEFAULT '' + tax_agent_id NUMBER(38,0) NOT NULL, + employee_id NUMBER(38,0) NOT NULL, + change_type number NOT NULL DEFAULT 0 , + employee_name varchar2(255) NULL DEFAULT NULL, + module_type int(4) NOT NULL DEFAULT 0 +) ; +/ + + +CREATE TABLE hrsa_tax_agent_admin +( + id NUMBER(38,0) primary key NOT NULL, + tax_agent_id NUMBER(38,0) NOT NULL, + employee_id NUMBER(38,0) NOT NULL, + create_time date DEFAULT sysdate, + update_time date DEFAULT sysdate, + creator NUMBER(38,0) DEFAULT 0, + delete_type number DEFAULT 0 , + tenant_key varchar2(10) DEFAULT '' +) ; +/ + +CREATE TABLE hrsa_tax_agent_manage_range +( + id NUMBER(38,0) primary key NOT NULL, + tax_agent_id NUMBER(38,0) NOT NULL, + employee_id NUMBER(38,0) NOT NULL, + tax_agent_sub_admin_id NUMBER(38,0) NOT NULL, + target_type number NOT NULL DEFAULT 1, + target_id NUMBER(38,0) NOT NULL, + employee_status varchar2(100) NOT NULL, + include_type number NOT NULL DEFAULT 1, + creator NUMBER(38,0) DEFAULT '0', + create_time date DEFAULT sysdate, + update_time date DEFAULT sysdate, + delete_type number DEFAULT 0 , + tenant_key varchar2(10) DEFAULT '', + range_type number NOT NULL DEFAULT 0 +) ; +/ + +CREATE TABLE hrsa_tax_agent_base +( + id NUMBER(38,0) primary key NOT NULL, + devolution_status int(11) NOT NULL DEFAULT 0 COMMENT '分权开启状态。0：关、1：开', + create_time date DEFAULT sysdate, + update_time date DEFAULT sysdate, + creator NUMBER(38,0) DEFAULT '0', + delete_type number DEFAULT 0 , + tenant_key varchar2(10) DEFAULT '' +) ; +/ + +CREATE TABLE hrsa_tax_agent_sub_admin +( + id NUMBER(38,0) primary key NOT NULL, + tax_agent_id NUMBER(38,0) NOT NULL, + employee_id NUMBER(38,0) NOT NULL, + description varchar2(100) , + create_time date DEFAULT sysdate, + update_time date DEFAULT sysdate, + creator NUMBER(38,0) DEFAULT '0', + delete_type number DEFAULT 0 , + tenant_key varchar2(10) DEFAULT '', + remark text +) ; +/ + +CREATE TABLE hrsa_tax_agent_sub_admin_emp +( + id NUMBER(38,0) primary key NOT NULL, + create_time date DEFAULT sysdate, + update_time date DEFAULT sysdate, + creator NUMBER(38,0) DEFAULT '0', + delete_type number DEFAULT 0 , + tenant_key varchar2(10) DEFAULT '', + tax_agent_id NUMBER(38,0) NOT NULL, + tax_agent_sub_admin_id NUMBER(38,0) NOT NULL, + employee_id NUMBER(38,0) NOT NULL, + employee_name varchar2(255) +) ; +/ + +ALTER TABLE hrsa_tax_agent add ( + payment_agency varchar2(255) +) +/ + +ALTER TABLE hrsa_salary_sob add ( + tax_agent_id NUMBER(38,0) +) +/ + + + +INSERT INTO hrsa_tax_agent_base(id, devolution_status, create_time, update_time, creator, delete_type, tenant_key) VALUES (1653303537239, 1, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 1, 0, 'all_teams'); +/ + +ALTER TABLE hrsa_bill_detail_temp add ( + payment_organization NUMBER(38,0) +) +/ + +ALTER TABLE hrsa_bill_detail add ( + payment_organization NUMBER(38,0) +) +/ + +ALTER TABLE hrsa_bill_batch add ( + payment_organization NUMBER(38,0) +) +/ \ No newline at end of file diff --git a/resource/sql/申报表.sql b/resource/sql/申报表.sql index 00d198ce7..8d150edb2 100644 --- a/resource/sql/申报表.sql +++ b/resource/sql/申报表.sql @@ -6,4 +6,14 @@ ALTER TABLE hrsa_tax_declaration ADD income_category int NULL GO ALTER TABLE hrsa_tax_declaration_detail ADD employee_type int NULL -GO \ No newline at end of file +GO + +ALTER TABLE hrsa_tax_declaration add ( + income_category number +) +/ + +ALTER TABLE hrsa_tax_declaration_detail add ( + employee_type number +) +/ \ No newline at end of file