diff --git a/resource/sqlupgrade/DM/2022/sql2022120100901.sql b/resource/sqlupgrade/DM/2022/sql2022120100901.sql deleted file mode 100644 index 9b45402f5..000000000 --- a/resource/sqlupgrade/DM/2022/sql2022120100901.sql +++ /dev/null @@ -1,27 +0,0 @@ -create table hrsa_sub_table -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar(10), - sub_table_name varchar(100) not null, - dimension varchar(20) not null, - start_month varchar(10), - end_month varchar(10), - pay_org_string varchar(500), - pay_agency_string varchar(500), - sub_company_string varchar(500), - depart_string varchar(500), - grade_string varchar(500), - position_string varchar(500), - status_string varchar(500), - employee_type varchar(500), - employee_string varchar(500), - payment_type_string varchar(100) -); -/ - -create index idx_table_tk_8413fde2 on hrsa_sub_table(tenant_key); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/DM/2022/sql2022120101001.sql b/resource/sqlupgrade/DM/2022/sql2022120101001.sql deleted file mode 100644 index 8ad5b3129..000000000 --- a/resource/sqlupgrade/DM/2022/sql2022120101001.sql +++ /dev/null @@ -1,23 +0,0 @@ -create table hrsa_sub_table_item -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar(10), - table_id number not null, - item_name varchar(50) not null, - item_value varchar(500) not null, - index_value int not null, - total_rule varchar(500), - count_rule varchar(500), - unit_type int default 2 -); -/ - -create index idx_report_tenant_key on hrsa_sub_table_item(tenant_key); -/ - -create index idx_tk_table_dt_517df716 on hrsa_sub_table_item(tenant_key,delete_type,table_id,creator); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/DM/2022/sql2022120901602.sql b/resource/sqlupgrade/DM/2022/sql2022120901602.sql deleted file mode 100644 index 81a0b8693..000000000 --- a/resource/sqlupgrade/DM/2022/sql2022120901602.sql +++ /dev/null @@ -1,5 +0,0 @@ -alter table hrsa_sub_table add table_type int; -/ - -alter table hrsa_sub_table modify table_type default 0; -/ \ No newline at end of file diff --git a/resource/sqlupgrade/DM/2022/sql2022121503101.sql b/resource/sqlupgrade/DM/2022/sql2022121503101.sql deleted file mode 100644 index fb9159c03..000000000 --- a/resource/sqlupgrade/DM/2022/sql2022121503101.sql +++ /dev/null @@ -1,19 +0,0 @@ -create table hrsa_salary_stats_dim -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar(10), - dim_name varchar(100), - dim_type varchar(20), - remark varchar(500), - setting varchar(2000), - is_default int, - dim_code varchar(50) -); -/ - -create index idx_tenant_key_sal_stats_dim on hrsa_salary_stats_dim(tenant_key); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/DM/2022/sql2022121613501.sql b/resource/sqlupgrade/DM/2022/sql2022121613501.sql deleted file mode 100644 index 2cb7ab3fb..000000000 --- a/resource/sqlupgrade/DM/2022/sql2022121613501.sql +++ /dev/null @@ -1,27 +0,0 @@ -create table hrsa_salary_stats_report -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar(10), - report_name varchar(100), - dimension varchar(1000), - tax_agent_setting varchar(1000), - income_category_setting varchar(20), - sub_company_setting varchar(1000), - depart_setting varchar(1000), - grade_setting varchar(1000), - position_setting varchar(1000), - status_setting varchar(1000), - employee_setting varchar(1000), - hiredate_setting varchar(1000), - leavedate_setting varchar(1000), - salary_start_month date, - salary_end_month date -); -/ - -create index idx_tenant_key_sal_stats_rep on hrsa_salary_stats_report(tenant_key); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/DM/2022/sql2022122005801.sql b/resource/sqlupgrade/DM/2022/sql2022122005801.sql deleted file mode 100644 index 289ad7775..000000000 --- a/resource/sqlupgrade/DM/2022/sql2022122005801.sql +++ /dev/null @@ -1,24 +0,0 @@ -create table hrsa_salary_statistics_item -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar(10), - item_name varchar(50), - item_value varchar(1000), - count_rule varchar(500), - sum_rule varchar(500), - avg_rule varchar(500), - max_rule varchar(500), - min_rule varchar(500), - median_rule varchar(500), - index_value int, - unit_type int, - stat_report_id number -); -/ - -create index idx_tenant_key_sal_stat_item on hrsa_salary_statistics_item(tenant_key); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/DM/2023/sql2023011206201.sql b/resource/sqlupgrade/DM/2023/sql2023011206201.sql deleted file mode 100644 index 1bcc5602a..000000000 --- a/resource/sqlupgrade/DM/2023/sql2023011206201.sql +++ /dev/null @@ -1,22 +0,0 @@ -create table hrsa_charts_setting -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar(10), - table_id number not null, - charts_type int not null, - item_values varchar(500), - item_col_value varchar(50) not null, - dimension_range int not null, - item_sort_value varchar(500), - item_col_sort_value varchar(50), - sort_type int, - sort_num int -); -/ - -create index index_echarts_tk_ae4c0e13 on hrsa_charts_setting(tenant_key); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/DM/2023/sql2023013104001.sql b/resource/sqlupgrade/DM/2023/sql2023013104001.sql deleted file mode 100644 index bd3d42415..000000000 --- a/resource/sqlupgrade/DM/2023/sql2023013104001.sql +++ /dev/null @@ -1,22 +0,0 @@ -create table hrsa_salary_echarts_setting -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar(10), - report_id number not null, - charts_type int not null, - item_values varchar(500), - item_col_value varchar(50) not null, - dimension_range int not null, - item_sort_value varchar(500), - item_col_sort_value varchar(50), - sort_type int, - sort_num int -); -/ - -create index idx_salary_echart_set_tk on hrsa_salary_echarts_setting(tenant_key); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/DM/2023/sql2023021000102.sql b/resource/sqlupgrade/DM/2023/sql2023021000102.sql deleted file mode 100644 index a1b09bbb5..000000000 --- a/resource/sqlupgrade/DM/2023/sql2023021000102.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_dim modify dim_type varchar(30); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/DM/2023/sql2023021604102.sql b/resource/sqlupgrade/DM/2023/sql2023021604102.sql deleted file mode 100644 index a5bb145fe..000000000 --- a/resource/sqlupgrade/DM/2023/sql2023021604102.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_report modify income_category_setting varchar(1000); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/DM/2023/sql2023021705001.sql b/resource/sqlupgrade/DM/2023/sql2023021705001.sql deleted file mode 100644 index 708255326..000000000 --- a/resource/sqlupgrade/DM/2023/sql2023021705001.sql +++ /dev/null @@ -1,82 +0,0 @@ -create table hrsa_statreportlogs_detail -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar(10), - uuid varchar(36) not null, - mainid varchar(36) not null, - dataid varchar(50) not null, - belongdataid varchar(50) not null, - tablename varchar(200) not null, - tablenamelabelid varchar(50) default '-1' not null, - tablenamedesc varchar(50) not null, - fieldname varchar(200) not null, - fieldnamelabelid varchar(50) default '-1' not null, - newvalue clob not null, - oldvalue clob not null, - newrealvalue clob not null, - oldrealvalue clob not null, - fielddesc varchar(200) not null, - showorder int not null, - isdetail int default 0 not null -); -/ - -create index idx_tenant_4fd0f4bc on hrsa_statreportlogs_detail(tenant_key); -/ - -create index idx_del_up_e798e3ef on hrsa_statreportlogs_detail(delete_type,update_time); -/ - -create table hrsa_statreportlogs -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar(10), - uuid varchar(36) not null, - log_date date not null, - device varchar(500) not null, - log_operator number not null, - operatorname varchar(100), - targetid number default '-1' not null, - targetname clob not null, - modulename varchar(100) not null, - functionname varchar(100) not null, - interfacename varchar(100) not null, - requesturl varchar(200) not null, - requesturi varchar(200) not null, - operatetype varchar(50) not null, - operatetypename varchar(100) not null, - operatedesc varchar(3000) not null, - params clob not null, - belongmainid varchar(36) not null, - clientip varchar(50) not null, - groupid varchar(50) not null, - groupnamelabel varchar(1000) not null, - redoservice varchar(200) not null, - redocontext clob not null, - cancelservice varchar(200) not null, - cancelcontext clob not null, - totalruntime number default '0' not null, - mainruntime number default '0' not null, - log_result varchar(100) not null, - fromterminal varchar(100) not null, - resultdesc clob not null, - old_content varchar(3000) not null, - link_type varchar(20) not null, - link_id number default '0' not null, - old_link_id number default '0' not null -); -/ - -create index idx_tenan_0ad78df3 on hrsa_statreportlogs(tenant_key); -/ - -create index idx_del_u_7c93862b on hrsa_statreportlogs(delete_type,update_time); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/DM/2023/sql2023032901802.sql b/resource/sqlupgrade/DM/2023/sql2023032901802.sql deleted file mode 100644 index 28569b30a..000000000 --- a/resource/sqlupgrade/DM/2023/sql2023032901802.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_report add remark varchar(100); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/DM/2023/sql2023032906602.sql b/resource/sqlupgrade/DM/2023/sql2023032906602.sql deleted file mode 100644 index 2904d96eb..000000000 --- a/resource/sqlupgrade/DM/2023/sql2023032906602.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_report add second_dimension varchar(100); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/DM/2023/sql2023032915202.sql b/resource/sqlupgrade/DM/2023/sql2023032915202.sql deleted file mode 100644 index 6a8164591..000000000 --- a/resource/sqlupgrade/DM/2023/sql2023032915202.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_report add sort_index varchar(100); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/DM/2023/sql2023032916202.sql b/resource/sqlupgrade/DM/2023/sql2023032916202.sql deleted file mode 100644 index a78cd0884..000000000 --- a/resource/sqlupgrade/DM/2023/sql2023032916202.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_report add sort_type varchar(100); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/DM/2023/sql2023040404902.sql b/resource/sqlupgrade/DM/2023/sql2023040404902.sql deleted file mode 100644 index c444c3992..000000000 --- a/resource/sqlupgrade/DM/2023/sql2023040404902.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_dim add label_id int; -/ \ No newline at end of file diff --git a/resource/sqlupgrade/Mysql/2022/sql2022120100901.sql b/resource/sqlupgrade/Mysql/2022/sql2022120100901.sql deleted file mode 100644 index ee1284958..000000000 --- a/resource/sqlupgrade/Mysql/2022/sql2022120100901.sql +++ /dev/null @@ -1,27 +0,0 @@ -create table hrsa_sub_table -( - id bigint primary key comment 'ID' , - create_time datetime comment '创建时间' , - update_time datetime comment '修改时间' , - creator bigint comment '创建人id' , - delete_type int default 0 comment '是否删除' , - tenant_key varchar(10) comment '租户KEY' , - sub_table_name varchar(100) not null comment '表名' , - dimension varchar(20) not null comment '统计维度' , - start_month varchar(10) comment '开始月' , - end_month varchar(10) comment '终止月' , - pay_org_string varchar(500) comment '个税扣缴义务人高级搜索' , - pay_agency_string varchar(500) comment '缴纳组织高级搜索' , - sub_company_string varchar(500) comment '分部高级搜索' , - depart_string varchar(500) comment '部门高级搜索' , - grade_string varchar(500) comment '职级高级搜索' , - position_string varchar(500) comment '岗位高级搜索' , - status_string varchar(500) comment '人员状态高级搜索' , - employee_type varchar(500) comment '人员类型高级搜索' , - employee_string varchar(500) comment '人员高级搜索' , - payment_type_string varchar(100) comment '缴纳类型' -) -; - -create index idx_table_tk_8413fde2 on hrsa_sub_table(tenant_key) -; \ No newline at end of file diff --git a/resource/sqlupgrade/Mysql/2022/sql2022120101001.sql b/resource/sqlupgrade/Mysql/2022/sql2022120101001.sql deleted file mode 100644 index 8f205871c..000000000 --- a/resource/sqlupgrade/Mysql/2022/sql2022120101001.sql +++ /dev/null @@ -1,23 +0,0 @@ -create table hrsa_sub_table_item -( - id bigint primary key comment 'ID' , - create_time datetime comment '创建时间' , - update_time datetime comment '修改时间' , - creator bigint comment '创建人id' , - delete_type int default 0 comment '是否删除' , - tenant_key varchar(10) comment '租户KEY' , - table_id bigint not null comment '数据表id' , - item_name varchar(50) not null comment '统计项名称' , - item_value varchar(500) not null comment '统计项集合' , - index_value int not null comment '顺序' , - total_rule varchar(500) comment '合计规则' , - count_rule varchar(500) comment '计数规则' , - unit_type int default 2 comment '统计单位' -) -; - -create index idx_report_tenant_key on hrsa_sub_table_item(tenant_key) -; - -create index idx_tk_table_dt_517df716 on hrsa_sub_table_item(tenant_key,delete_type,table_id,creator) -; \ No newline at end of file diff --git a/resource/sqlupgrade/Mysql/2022/sql2022120901602.sql b/resource/sqlupgrade/Mysql/2022/sql2022120901602.sql deleted file mode 100644 index f7c90dd80..000000000 --- a/resource/sqlupgrade/Mysql/2022/sql2022120901602.sql +++ /dev/null @@ -1,5 +0,0 @@ -alter table hrsa_sub_table add table_type int -; - -alter table hrsa_sub_table modify column table_type int default 0 -; \ No newline at end of file diff --git a/resource/sqlupgrade/Mysql/2022/sql2022121503101.sql b/resource/sqlupgrade/Mysql/2022/sql2022121503101.sql deleted file mode 100644 index 068b25eaa..000000000 --- a/resource/sqlupgrade/Mysql/2022/sql2022121503101.sql +++ /dev/null @@ -1,19 +0,0 @@ -create table hrsa_salary_stats_dim -( - id bigint primary key comment 'ID' , - create_time datetime comment '创建时间' , - update_time datetime comment '修改时间' , - creator bigint comment '创建人id' , - delete_type int default 0 comment '是否删除' , - tenant_key varchar(10) comment '租户KEY' , - dim_name varchar(100) comment '统计维度名称' , - dim_type varchar(20) comment '统计维度类型' , - remark varchar(500) comment '描述' , - setting varchar(2000) comment '设置内容', - is_default int comment '是否默认' , - dim_code varchar(50) comment '统计维度编码' -) -; - -create index idx_tenant_key_sal_stats_dim on hrsa_salary_stats_dim(tenant_key) -; \ No newline at end of file diff --git a/resource/sqlupgrade/Mysql/2022/sql2022121613501.sql b/resource/sqlupgrade/Mysql/2022/sql2022121613501.sql deleted file mode 100644 index c923fcfe6..000000000 --- a/resource/sqlupgrade/Mysql/2022/sql2022121613501.sql +++ /dev/null @@ -1,27 +0,0 @@ -create table hrsa_salary_stats_report -( - id bigint primary key comment 'ID' , - create_time datetime comment '创建时间' , - update_time datetime comment '修改时间' , - creator bigint comment '创建人id' , - delete_type int default 0 comment '是否删除' , - tenant_key varchar(10) comment '租户KEY' , - report_name varchar(100) comment '报表名称' , - dimension varchar(1000) comment '统计维度(多个的话以逗号分隔)' , - tax_agent_setting varchar(1000) comment '个税扣缴义务人配置' , - income_category_setting varchar(20) comment '收入所得项目配置' , - sub_company_setting varchar(1000) comment '分部配置' , - depart_setting varchar(1000) comment '部门配置' , - grade_setting varchar(1000) comment '职级配置' , - position_setting varchar(1000) comment '岗位配置' , - status_setting varchar(1000) comment '状态配置' , - employee_setting varchar(1000) comment '人员配置' , - hiredate_setting varchar(1000) comment '入职日期配置' , - leavedate_setting varchar(1000) comment '离职日期配置' , - salary_start_month datetime comment '薪资所属月份-起始' , - salary_end_month datetime comment '薪资所属月份-截止' -) -; - -create index idx_tenant_key_sal_stats_rep on hrsa_salary_stats_report(tenant_key) -; \ No newline at end of file diff --git a/resource/sqlupgrade/Mysql/2022/sql2022122005801.sql b/resource/sqlupgrade/Mysql/2022/sql2022122005801.sql deleted file mode 100644 index de1259f69..000000000 --- a/resource/sqlupgrade/Mysql/2022/sql2022122005801.sql +++ /dev/null @@ -1,24 +0,0 @@ -create table hrsa_salary_statistics_item -( - id bigint primary key comment 'ID' , - create_time datetime comment '创建时间' , - update_time datetime comment '修改时间' , - creator bigint comment '创建人id' , - delete_type int default 0 comment '是否删除' , - tenant_key varchar(10) comment '租户KEY' , - item_name varchar(50) comment '统计项名称' , - item_value varchar(1000) comment '统计项集合' , - count_rule varchar(500) comment '计数规则' , - sum_rule varchar(500) comment '求和规则' , - avg_rule varchar(500) comment '平均值规则' , - max_rule varchar(500) comment '最大值规则' , - min_rule varchar(500) comment '最小值规则' , - median_rule varchar(500) comment '中位数规则' , - index_value int comment '顺序' , - unit_type int comment '统计单位', - stat_report_id bigint comment '统计报表id' -) -; - -create index idx_tenant_key_sal_stat_item on hrsa_salary_statistics_item(tenant_key) -; \ No newline at end of file diff --git a/resource/sqlupgrade/Mysql/2023/sql2023011206201.sql b/resource/sqlupgrade/Mysql/2023/sql2023011206201.sql deleted file mode 100644 index 594c7d566..000000000 --- a/resource/sqlupgrade/Mysql/2023/sql2023011206201.sql +++ /dev/null @@ -1,22 +0,0 @@ -create table hrsa_charts_setting -( - id bigint primary key comment 'ID' , - create_time datetime comment '创建时间' , - update_time datetime comment '修改时间' , - creator bigint comment '创建人id' , - delete_type int default 0 comment '是否删除' , - tenant_key varchar(10) comment '租户KEY' , - table_id bigint not null comment '报表id' , - charts_type int not null comment '报表类型' , - item_values varchar(500) comment '统计项目' , - item_col_value varchar(50) not null comment '统计列' , - dimension_range int not null comment '维度统计范围' , - item_sort_value varchar(500) comment '排序统计项目' , - item_col_sort_value varchar(50) comment '排序列' , - sort_type int comment '排序类型' , - sort_num int comment '排序取数值' -) -; - -create index index_echarts_tk_ae4c0e13 on hrsa_charts_setting(tenant_key) -; \ No newline at end of file diff --git a/resource/sqlupgrade/Mysql/2023/sql2023013104001.sql b/resource/sqlupgrade/Mysql/2023/sql2023013104001.sql deleted file mode 100644 index 4cfea914a..000000000 --- a/resource/sqlupgrade/Mysql/2023/sql2023013104001.sql +++ /dev/null @@ -1,22 +0,0 @@ -create table hrsa_salary_echarts_setting -( - id bigint primary key comment 'ID' , - create_time datetime comment '创建时间' , - update_time datetime comment '修改时间' , - creator bigint comment '创建人id' , - delete_type int default 0 comment '是否删除' , - tenant_key varchar(10) comment '租户KEY' , - report_id bigint not null comment '报表id' , - charts_type int not null comment '报表类型' , - item_values varchar(500) comment '统计项目' , - item_col_value varchar(50) not null comment '统计列' , - dimension_range int not null comment '维度统计范围' , - item_sort_value varchar(500) comment '排序统计项目' , - item_col_sort_value varchar(50) comment '排序列' , - sort_type int comment '排序类型' , - sort_num int comment '排序取数值' -) -; - -create index idx_salary_echart_set_tk on hrsa_salary_echarts_setting(tenant_key) -; \ No newline at end of file diff --git a/resource/sqlupgrade/Mysql/2023/sql2023021000102.sql b/resource/sqlupgrade/Mysql/2023/sql2023021000102.sql deleted file mode 100644 index d55b2e705..000000000 --- a/resource/sqlupgrade/Mysql/2023/sql2023021000102.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_dim modify column dim_type varchar(30) -; \ No newline at end of file diff --git a/resource/sqlupgrade/Mysql/2023/sql2023021604102.sql b/resource/sqlupgrade/Mysql/2023/sql2023021604102.sql deleted file mode 100644 index 3428a6b34..000000000 --- a/resource/sqlupgrade/Mysql/2023/sql2023021604102.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_report modify column income_category_setting varchar(1000) -; \ No newline at end of file diff --git a/resource/sqlupgrade/Mysql/2023/sql2023021705001.sql b/resource/sqlupgrade/Mysql/2023/sql2023021705001.sql deleted file mode 100644 index 7f79e1836..000000000 --- a/resource/sqlupgrade/Mysql/2023/sql2023021705001.sql +++ /dev/null @@ -1,82 +0,0 @@ -create table hrsa_statreportlogs_detail -( - id bigint primary key comment 'ID' , - create_time datetime comment '创建时间' , - update_time datetime comment '修改时间' , - creator bigint comment '创建人id' , - delete_type int default 0 comment '是否删除' , - tenant_key varchar(10) comment '租户KEY' , - uuid varchar(36) not null comment '日志UUID' , - mainid varchar(36) not null comment '主表id' , - dataid varchar(50) not null comment '数据id' , - belongdataid varchar(50) not null comment '主表数据id' , - tablename varchar(200) not null comment '表名' , - tablenamelabelid varchar(50) default '-1' not null comment '表名labelid' , - tablenamedesc varchar(50) not null comment '对应数据库的表' , - fieldname varchar(200) not null comment '字段名' , - fieldnamelabelid varchar(50) default '-1' not null comment '字段名labelid' , - newvalue text not null comment '更新后的值' , - oldvalue text not null comment '更新前的值' , - newrealvalue text not null comment '更新后的显示值' , - oldrealvalue text not null comment '更新前的显示值' , - fielddesc varchar(200) not null comment '字段名' , - showorder int(11) not null comment '字段名' , - isdetail int(11) default 0 not null comment '是否明细字段' -) -; - -create index idx_tenant_4fd0f4bc on hrsa_statreportlogs_detail(tenant_key) -; - -create index idx_del_up_e798e3ef on hrsa_statreportlogs_detail(delete_type,update_time) -; - -create table hrsa_statreportlogs -( - id bigint primary key comment 'ID' , - create_time datetime comment '创建时间' , - update_time datetime comment '修改时间' , - creator bigint comment '创建人id' , - delete_type int default 0 comment '是否删除' , - tenant_key varchar(10) comment '租户KEY' , - uuid varchar(36) not null comment '日志UUID' , - log_date datetime not null comment '记录时间' , - device varchar(500) not null comment '终端信息' , - log_operator bigint not null comment '操作者' , - operatorname varchar(100) comment '操作人姓名' , - targetid bigint default '-1' not null comment '操作目标id' , - targetname text not null comment '操作目标名称' , - modulename varchar(100) not null comment '模块' , - functionname varchar(100) not null comment '服务（方法）' , - interfacename varchar(100) not null comment '访问接口名' , - requesturl varchar(200) not null comment '请求全路径' , - requesturi varchar(200) not null comment '请求地址' , - operatetype varchar(50) not null comment '操作类型' , - operatetypename varchar(100) not null comment '操作类型名称' , - operatedesc varchar(3000) not null comment '操作详细说明' , - params text not null comment '涉及的相关参数' , - belongmainid varchar(36) not null comment '所属主表uuid' , - clientip varchar(50) not null comment '操作IP' , - groupid varchar(50) not null comment '分组' , - groupnamelabel varchar(1000) not null comment '分组标题' , - redoservice varchar(200) not null comment '重做业务接口' , - redocontext text not null comment '重做参数' , - cancelservice varchar(200) not null comment '撤销业务接口' , - cancelcontext text not null comment '撤销参数' , - totalruntime bigint default '0' not null comment '总运行时长' , - mainruntime bigint default '0' not null comment '主方法运行时长' , - log_result varchar(100) not null comment '日志结果' , - fromterminal varchar(100) not null comment '来自pc web' , - resultdesc text not null comment '运行结果描述' , - old_content varchar(3000) not null comment '原先内容' , - link_type varchar(20) not null comment '链接类型' , - link_id bigint default '0' not null comment '链接id' , - old_link_id bigint default '0' not null comment '原先链接id' -) -; - -create index idx_tenan_0ad78df3 on hrsa_statreportlogs(tenant_key) -; - -create index idx_del_u_7c93862b on hrsa_statreportlogs(delete_type,update_time) -; \ No newline at end of file diff --git a/resource/sqlupgrade/Mysql/2023/sql2023032901802.sql b/resource/sqlupgrade/Mysql/2023/sql2023032901802.sql deleted file mode 100644 index cb8547275..000000000 --- a/resource/sqlupgrade/Mysql/2023/sql2023032901802.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_report add remark varchar(100) -; \ No newline at end of file diff --git a/resource/sqlupgrade/Mysql/2023/sql2023032906602.sql b/resource/sqlupgrade/Mysql/2023/sql2023032906602.sql deleted file mode 100644 index fa36a694a..000000000 --- a/resource/sqlupgrade/Mysql/2023/sql2023032906602.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_report add second_dimension varchar(100) -; \ No newline at end of file diff --git a/resource/sqlupgrade/Mysql/2023/sql2023032915202.sql b/resource/sqlupgrade/Mysql/2023/sql2023032915202.sql deleted file mode 100644 index 2839f913e..000000000 --- a/resource/sqlupgrade/Mysql/2023/sql2023032915202.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_report add sort_index varchar(100) -; \ No newline at end of file diff --git a/resource/sqlupgrade/Mysql/2023/sql2023032916202.sql b/resource/sqlupgrade/Mysql/2023/sql2023032916202.sql deleted file mode 100644 index fc2e40f84..000000000 --- a/resource/sqlupgrade/Mysql/2023/sql2023032916202.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_report add sort_type varchar(100) -; \ No newline at end of file diff --git a/resource/sqlupgrade/Mysql/2023/sql2023040404902.sql b/resource/sqlupgrade/Mysql/2023/sql2023040404902.sql deleted file mode 100644 index 80a9ba9b9..000000000 --- a/resource/sqlupgrade/Mysql/2023/sql2023040404902.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_dim add label_id int -; \ No newline at end of file diff --git a/resource/sqlupgrade/Mysql/报表.sql b/resource/sqlupgrade/Mysql/报表.sql deleted file mode 100644 index 4fa33dc8b..000000000 --- a/resource/sqlupgrade/Mysql/报表.sql +++ /dev/null @@ -1,244 +0,0 @@ -create table hrsa_sub_table -( - id bigint primary key comment 'ID' , - create_time datetime comment '创建时间' , - update_time datetime comment '修改时间' , - creator bigint comment '创建人id' , - delete_type int default 0 comment '是否删除' , - tenant_key varchar(10) comment '租户KEY' , - sub_table_name varchar(100) not null comment '表名' , - dimension varchar(20) not null comment '统计维度' , - start_month varchar(10) comment '开始月' , - end_month varchar(10) comment '终止月' , - pay_org_string varchar(500) comment '个税扣缴义务人高级搜索' , - pay_agency_string varchar(500) comment '缴纳组织高级搜索' , - sub_company_string varchar(500) comment '分部高级搜索' , - depart_string varchar(500) comment '部门高级搜索' , - grade_string varchar(500) comment '职级高级搜索' , - position_string varchar(500) comment '岗位高级搜索' , - status_string varchar(500) comment '人员状态高级搜索' , - employee_type varchar(500) comment '人员类型高级搜索' , - employee_string varchar(500) comment '人员高级搜索' , - payment_type_string varchar(100) comment '缴纳类型' -) -; - -create table hrsa_sub_table_item -( - id bigint primary key comment 'ID' , - create_time datetime comment '创建时间' , - update_time datetime comment '修改时间' , - creator bigint comment '创建人id' , - delete_type int default 0 comment '是否删除' , - tenant_key varchar(10) comment '租户KEY' , - table_id bigint not null comment '数据表id' , - item_name varchar(50) not null comment '统计项名称' , - item_value varchar(500) not null comment '统计项集合' , - index_value int not null comment '顺序' , - total_rule varchar(500) comment '合计规则' , - count_rule varchar(500) comment '计数规则' , - unit_type int default 2 comment '统计单位' -) -; - -alter table hrsa_sub_table add table_type int -; - -alter table hrsa_sub_table modify column table_type int default 0 -; - -create table hrsa_salary_stats_dim -( - id bigint primary key comment 'ID' , - create_time datetime comment '创建时间' , - update_time datetime comment '修改时间' , - creator bigint comment '创建人id' , - delete_type int default 0 comment '是否删除' , - tenant_key varchar(10) comment '租户KEY' , - dim_name varchar(100) comment '统计维度名称' , - dim_type varchar(20) comment '统计维度类型' , - remark varchar(500) comment '描述' , - setting varchar(2000) comment '设置内容', - is_default int comment '是否默认' , - dim_code varchar(50) comment '统计维度编码' -) -; - -create table hrsa_salary_stats_report -( - id bigint primary key comment 'ID' , - create_time datetime comment '创建时间' , - update_time datetime comment '修改时间' , - creator bigint comment '创建人id' , - delete_type int default 0 comment '是否删除' , - tenant_key varchar(10) comment '租户KEY' , - report_name varchar(100) comment '报表名称' , - dimension varchar(1000) comment '统计维度(多个的话以逗号分隔)' , - tax_agent_setting varchar(1000) comment '个税扣缴义务人配置' , - income_category_setting varchar(20) comment '收入所得项目配置' , - sub_company_setting varchar(1000) comment '分部配置' , - depart_setting varchar(1000) comment '部门配置' , - grade_setting varchar(1000) comment '职级配置' , - position_setting varchar(1000) comment '岗位配置' , - status_setting varchar(1000) comment '状态配置' , - employee_setting varchar(1000) comment '人员配置' , - hiredate_setting varchar(1000) comment '入职日期配置' , - leavedate_setting varchar(1000) comment '离职日期配置' , - salary_start_month datetime comment '薪资所属月份-起始' , - salary_end_month datetime comment '薪资所属月份-截止' -) -; - -create table hrsa_salary_statistics_item -( - id bigint primary key comment 'ID' , - create_time datetime comment '创建时间' , - update_time datetime comment '修改时间' , - creator bigint comment '创建人id' , - delete_type int default 0 comment '是否删除' , - tenant_key varchar(10) comment '租户KEY' , - item_name varchar(50) comment '统计项名称' , - item_value varchar(1000) comment '统计项集合' , - count_rule varchar(500) comment '计数规则' , - sum_rule varchar(500) comment '求和规则' , - avg_rule varchar(500) comment '平均值规则' , - max_rule varchar(500) comment '最大值规则' , - min_rule varchar(500) comment '最小值规则' , - median_rule varchar(500) comment '中位数规则' , - index_value int comment '顺序' , - unit_type int comment '统计单位', - stat_report_id bigint comment '统计报表id' -) -; - -create table hrsa_charts_setting -( - id bigint primary key comment 'ID' , - create_time datetime comment '创建时间' , - update_time datetime comment '修改时间' , - creator bigint comment '创建人id' , - delete_type int default 0 comment '是否删除' , - tenant_key varchar(10) comment '租户KEY' , - table_id bigint not null comment '报表id' , - charts_type int not null comment '报表类型' , - item_values varchar(500) comment '统计项目' , - item_col_value varchar(50) not null comment '统计列' , - dimension_range int not null comment '维度统计范围' , - item_sort_value varchar(500) comment '排序统计项目' , - item_col_sort_value varchar(50) comment '排序列' , - sort_type int comment '排序类型' , - sort_num int comment '排序取数值' -) -; - -create table hrsa_salary_echarts_setting -( - id bigint primary key comment 'ID' , - create_time datetime comment '创建时间' , - update_time datetime comment '修改时间' , - creator bigint comment '创建人id' , - delete_type int default 0 comment '是否删除' , - tenant_key varchar(10) comment '租户KEY' , - report_id bigint not null comment '报表id' , - charts_type int not null comment '报表类型' , - item_values varchar(500) comment '统计项目' , - item_col_value varchar(50) not null comment '统计列' , - dimension_range int not null comment '维度统计范围' , - item_sort_value varchar(500) comment '排序统计项目' , - item_col_sort_value varchar(50) comment '排序列' , - sort_type int comment '排序类型' , - sort_num int comment '排序取数值' -) -; - -alter table hrsa_salary_stats_dim modify column dim_type varchar(30) -; - -alter table hrsa_salary_stats_report modify column income_category_setting varchar(1000) -; - -create table hrsa_statreportlogs_detail -( - id bigint primary key comment 'ID' , - create_time datetime comment '创建时间' , - update_time datetime comment '修改时间' , - creator bigint comment '创建人id' , - delete_type int default 0 comment '是否删除' , - tenant_key varchar(10) comment '租户KEY' , - uuid varchar(36) not null comment '日志UUID' , - mainid varchar(36) not null comment '主表id' , - dataid varchar(50) not null comment '数据id' , - belongdataid varchar(50) not null comment '主表数据id' , - tablename varchar(200) not null comment '表名' , - tablenamelabelid varchar(50) default '-1' not null comment '表名labelid' , - tablenamedesc varchar(50) not null comment '对应数据库的表' , - fieldname varchar(200) not null comment '字段名' , - fieldnamelabelid varchar(50) default '-1' not null comment '字段名labelid' , - newvalue text not null comment '更新后的值' , - oldvalue text not null comment '更新前的值' , - newrealvalue text not null comment '更新后的显示值' , - oldrealvalue text not null comment '更新前的显示值' , - fielddesc varchar(200) not null comment '字段名' , - showorder int(11) not null comment '字段名' , - isdetail int(11) default 0 not null comment '是否明细字段' -) -; - -create table hrsa_statreportlogs -( - id bigint primary key comment 'ID' , - create_time datetime comment '创建时间' , - update_time datetime comment '修改时间' , - creator bigint comment '创建人id' , - delete_type int default 0 comment '是否删除' , - tenant_key varchar(10) comment '租户KEY' , - uuid varchar(36) not null comment '日志UUID' , - log_date datetime not null comment '记录时间' , - device varchar(500) not null comment '终端信息' , - log_operator bigint not null comment '操作者' , - operatorname varchar(100) comment '操作人姓名' , - targetid bigint default '-1' not null comment '操作目标id' , - targetname text not null comment '操作目标名称' , - modulename varchar(100) not null comment '模块' , - functionname varchar(100) not null comment '服务（方法）' , - interfacename varchar(100) not null comment '访问接口名' , - requesturl varchar(200) not null comment '请求全路径' , - requesturi varchar(200) not null comment '请求地址' , - operatetype varchar(50) not null comment '操作类型' , - operatetypename varchar(100) not null comment '操作类型名称' , - operatedesc varchar(3000) not null comment '操作详细说明' , - params text not null comment '涉及的相关参数' , - belongmainid varchar(36) not null comment '所属主表uuid' , - clientip varchar(50) not null comment '操作IP' , - groupid varchar(50) not null comment '分组' , - groupnamelabel varchar(1000) not null comment '分组标题' , - redoservice varchar(200) not null comment '重做业务接口' , - redocontext text not null comment '重做参数' , - cancelservice varchar(200) not null comment '撤销业务接口' , - cancelcontext text not null comment '撤销参数' , - totalruntime bigint default '0' not null comment '总运行时长' , - mainruntime bigint default '0' not null comment '主方法运行时长' , - log_result varchar(100) not null comment '日志结果' , - fromterminal varchar(100) not null comment '来自pc web' , - resultdesc text not null comment '运行结果描述' , - old_content varchar(3000) not null comment '原先内容' , - link_type varchar(20) not null comment '链接类型' , - link_id bigint default '0' not null comment '链接id' , - old_link_id bigint default '0' not null comment '原先链接id' -) -; - -alter table hrsa_salary_stats_report add remark varchar(100) -; - -alter table hrsa_salary_stats_report add second_dimension varchar(100) -; - -alter table hrsa_salary_stats_report add sort_index varchar(100) -; - -alter table hrsa_salary_stats_report add sort_type varchar(100) -; - -alter table hrsa_salary_stats_dim add label_id int -; \ No newline at end of file diff --git a/resource/sqlupgrade/Mysql/浏览按钮.sql b/resource/sqlupgrade/Mysql/浏览按钮.sql deleted file mode 100644 index de0b61e6f..000000000 --- a/resource/sqlupgrade/Mysql/浏览按钮.sql +++ /dev/null @@ -1,38 +0,0 @@ -select @current_date:= date_format( now(),'%Y-%m-%d'); -select @current_time:= date_format( now(),'%T'); -INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WSURL, WSOPERATION, XMLTEXT, INPARA, SHOWTYPE, KEYFIELD, PARENTFIELD, SHOWFIELD, DETAILPAGEURL, TYPENAME, SELECTTYPE, SHOWPAGEURL, BROWSERFROM, NAME, CUSTOMID, CUSTOMHREF, SQLTEXT1, SQLTEXT2, NAMEHEADER, DESCRIPTIONHEADER, WSWORKNAME, SEARCHBYID, CREATEDATE, CREATETIME, MODIFYDATE, MODIFYTIME, SEARCHBYNAME, onlylowestnode, characterset, uuid, isSupportPaging, ESBID, ESBSHOWID, mobiledetailpageurl, isPhyPage, subcompanyid, unconditionalQuery) VALUES ('salaryItemBrowser', '1', '1', '', 'select * from hrsa_salary_item where delete_type = 0', '', '', '', '', '1', 'id', '', '', '', '', '', '', 2, '薪资项目', NULL, '', NULL, NULL, NULL, NULL, '', '', @current_date, @current_time, NULL, NULL, '', '', '0',uuid(), '', '', '', '', '1', 0, 1); -select @datashowset_id:= max(id) from datashowset; -INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime) VALUES ('salaryItemBrowser', '0', 0, @current_date, @current_time, NULL, NULL); -INSERT INTO datashowparam(MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES (@datashowset_id, '名称', 'name', '', 1, 1, uuid(), NULL); -INSERT INTO datasearchparam(MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES (@datashowset_id, '名称', 'name', '2', '', 1, uuid(), ''); - - - - -declare @datashowset_id int -declare @current_date varchar(100) -declare @current_time varchar(100) - -set @current_date = (select CONVERT(varchar(100), GETDATE(), 23)) -set @current_time = (select CONVERT(varchar(100), GETDATE(), 24)) - -INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WSURL, WSOPERATION, XMLTEXT, INPARA, SHOWTYPE, KEYFIELD, PARENTFIELD, SHOWFIELD, DETAILPAGEURL, TYPENAME, SELECTTYPE, SHOWPAGEURL, BROWSERFROM, NAME, CUSTOMID, CUSTOMHREF, SQLTEXT1, SQLTEXT2, NAMEHEADER, DESCRIPTIONHEADER, WSWORKNAME, SEARCHBYID, CREATEDATE, CREATETIME, MODIFYDATE, MODIFYTIME, SEARCHBYNAME, onlylowestnode, characterset, uuid, isSupportPaging, ESBID, ESBSHOWID, mobiledetailpageurl, isPhyPage, subcompanyid, unconditionalQuery) VALUES ('salaryItemBrowser', '1', '1', '', 'select * from hrsa_salary_item where delete_type = 0', '', '', '', '', '1', 'id', '', '', '', '', '', '', 2, '薪资项目', NULL, '', NULL, NULL, NULL, NULL, '', '', @current_date, @current_time, NULL, NULL, '', '', '0',newid(), '', '', '', '', '1', 0, 1) -set @datashowset_id = (select max(id) from datashowset) -INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime) VALUES ('salaryItemBrowser', '0', 0, @current_date, @current_time, NULL, NULL) -INSERT INTO datashowparam(MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES (@datashowset_id, '名称', 'name', '', 1, 1, newid(), NULL) -INSERT INTO datasearchparam(MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES (@datashowset_id, '名称', 'name', '2', '', 1, newid(), '') -GO - - - -declare -datashowset_id NUMBER; -hrmjobgroups_id NUMBER; -begin -INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WSURL, WSOPERATION, XMLTEXT, INPARA, SHOWTYPE, KEYFIELD, PARENTFIELD, SHOWFIELD, DETAILPAGEURL, TYPENAME, SELECTTYPE, SHOWPAGEURL, BROWSERFROM, NAME, CUSTOMID, CUSTOMHREF, SQLTEXT1, SQLTEXT2, NAMEHEADER, DESCRIPTIONHEADER, WSWORKNAME, SEARCHBYID, CREATEDATE, CREATETIME, MODIFYDATE, MODIFYTIME, SEARCHBYNAME, onlylowestnode, characterset, uuid, isSupportPaging, ESBID, ESBSHOWID, mobiledetailpageurl, isPhyPage, subcompanyid, unconditionalQuery) VALUES ('salaryItemBrowser', '1', '1', '', 'select * from hrsa_salary_item where delete_type = 0', '', '', '', '', '1', 'id', '', '', '', '', '', '', 2, '薪资项目', NULL, '', NULL, NULL, NULL, NULL, '', '', TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL, '', '', '0',SYS_GUID(), '', '', '', '', '1', 0, 1); -SELECT max(id) INTO datashowset_id FROM DATASHOWSET; -INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime) VALUES ('salaryItemBrowser', '0', 0, TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL); -INSERT INTO datashowparam(MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES (datashowset_id, '名称', 'name', '', 1, 1, SYS_GUID(), NULL); -INSERT INTO datasearchparam(MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES (datashowset_id, '名称', 'name', '2', '', 1, SYS_GUID(), ''); -end; -/ \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/2022/sql2022120100901.sql b/resource/sqlupgrade/Oracle/2022/sql2022120100901.sql deleted file mode 100644 index f6775e3fb..000000000 --- a/resource/sqlupgrade/Oracle/2022/sql2022120100901.sql +++ /dev/null @@ -1,27 +0,0 @@ -create table hrsa_sub_table -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar2(10), - sub_table_name varchar2(100) not null, - dimension varchar2(20) not null, - start_month varchar2(10), - end_month varchar2(10), - pay_org_string varchar2(500), - pay_agency_string varchar2(500), - sub_company_string varchar2(500), - depart_string varchar2(500), - grade_string varchar2(500), - position_string varchar2(500), - status_string varchar2(500), - employee_type varchar2(500), - employee_string varchar2(500), - payment_type_string varchar2(100) -) -/ - -create index idx_table_tk_8413fde2 on hrsa_sub_table(tenant_key) -/ \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/2022/sql2022120101001.sql b/resource/sqlupgrade/Oracle/2022/sql2022120101001.sql deleted file mode 100644 index 85d21951d..000000000 --- a/resource/sqlupgrade/Oracle/2022/sql2022120101001.sql +++ /dev/null @@ -1,23 +0,0 @@ -create table hrsa_sub_table_item -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar2(10), - table_id number not null, - item_name varchar2(50) not null, - item_value varchar2(500) not null, - index_value int not null, - total_rule varchar2(500), - count_rule varchar2(500), - unit_type int default 2 -) -/ - -create index idx_report_tenant_key on hrsa_sub_table_item(tenant_key) -/ - -create index idx_tk_table_dt_517df716 on hrsa_sub_table_item(tenant_key,delete_type,table_id,creator) -/ \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/2022/sql2022120901602.sql b/resource/sqlupgrade/Oracle/2022/sql2022120901602.sql deleted file mode 100644 index 92c4fbfec..000000000 --- a/resource/sqlupgrade/Oracle/2022/sql2022120901602.sql +++ /dev/null @@ -1,5 +0,0 @@ -alter table hrsa_sub_table add table_type int -/ - -alter table hrsa_sub_table modify table_type default 0 -/ \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/2022/sql2022121503101.sql b/resource/sqlupgrade/Oracle/2022/sql2022121503101.sql deleted file mode 100644 index 52b6a3318..000000000 --- a/resource/sqlupgrade/Oracle/2022/sql2022121503101.sql +++ /dev/null @@ -1,19 +0,0 @@ -create table hrsa_salary_stats_dim -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar2(10), - dim_name varchar2(100), - dim_type varchar2(20), - remark varchar2(500), - setting varchar2(2000), - is_default int, - dim_code varchar2(50) -) -/ - -create index idx_tenant_key_sal_stats_dim on hrsa_salary_stats_dim(tenant_key) -/ \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/2022/sql2022121613501.sql b/resource/sqlupgrade/Oracle/2022/sql2022121613501.sql deleted file mode 100644 index e8fa04962..000000000 --- a/resource/sqlupgrade/Oracle/2022/sql2022121613501.sql +++ /dev/null @@ -1,27 +0,0 @@ -create table hrsa_salary_stats_report -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar2(10), - report_name varchar2(100), - dimension varchar2(1000), - tax_agent_setting varchar2(1000), - income_category_setting varchar2(20), - sub_company_setting varchar2(1000), - depart_setting varchar2(1000), - grade_setting varchar2(1000), - position_setting varchar2(1000), - status_setting varchar2(1000), - employee_setting varchar2(1000), - hiredate_setting varchar2(1000), - leavedate_setting varchar2(1000), - salary_start_month date, - salary_end_month date -) -/ - -create index idx_tenant_key_sal_stats_rep on hrsa_salary_stats_report(tenant_key) -/ \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/2022/sql2022122005801.sql b/resource/sqlupgrade/Oracle/2022/sql2022122005801.sql deleted file mode 100644 index e3a2076f4..000000000 --- a/resource/sqlupgrade/Oracle/2022/sql2022122005801.sql +++ /dev/null @@ -1,24 +0,0 @@ -create table hrsa_salary_statistics_item -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar2(10), - item_name varchar2(50), - item_value varchar2(1000), - count_rule varchar2(500), - sum_rule varchar2(500), - avg_rule varchar2(500), - max_rule varchar2(500), - min_rule varchar2(500), - median_rule varchar2(500), - index_value int, - unit_type int, - stat_report_id number -) -/ - -create index idx_tenant_key_sal_stat_item on hrsa_salary_statistics_item(tenant_key) -/ \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/2023/sql2023011206201.sql b/resource/sqlupgrade/Oracle/2023/sql2023011206201.sql deleted file mode 100644 index fbb7bcfba..000000000 --- a/resource/sqlupgrade/Oracle/2023/sql2023011206201.sql +++ /dev/null @@ -1,22 +0,0 @@ -create table hrsa_charts_setting -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar2(10), - table_id number not null, - charts_type int not null, - item_values varchar2(500), - item_col_value varchar2(50) not null, - dimension_range int not null, - item_sort_value varchar2(500), - item_col_sort_value varchar2(50), - sort_type int, - sort_num int -) -/ - -create index index_echarts_tk_ae4c0e13 on hrsa_charts_setting(tenant_key) -/ \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/2023/sql2023013104001.sql b/resource/sqlupgrade/Oracle/2023/sql2023013104001.sql deleted file mode 100644 index b3a854e00..000000000 --- a/resource/sqlupgrade/Oracle/2023/sql2023013104001.sql +++ /dev/null @@ -1,22 +0,0 @@ -create table hrsa_salary_echarts_setting -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar2(10), - report_id number not null, - charts_type int not null, - item_values varchar2(500), - item_col_value varchar2(50) not null, - dimension_range int not null, - item_sort_value varchar2(500), - item_col_sort_value varchar2(50), - sort_type int, - sort_num int -) -/ - -create index idx_salary_echart_set_tk on hrsa_salary_echarts_setting(tenant_key) -/ \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/2023/sql2023021000102.sql b/resource/sqlupgrade/Oracle/2023/sql2023021000102.sql deleted file mode 100644 index 92d4c554d..000000000 --- a/resource/sqlupgrade/Oracle/2023/sql2023021000102.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_dim modify dim_type varchar2(30) -/ \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/2023/sql2023021604102.sql b/resource/sqlupgrade/Oracle/2023/sql2023021604102.sql deleted file mode 100644 index 1933ee237..000000000 --- a/resource/sqlupgrade/Oracle/2023/sql2023021604102.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_report modify income_category_setting varchar2(1000) -/ \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/2023/sql2023021705001.sql b/resource/sqlupgrade/Oracle/2023/sql2023021705001.sql deleted file mode 100644 index b215d10b7..000000000 --- a/resource/sqlupgrade/Oracle/2023/sql2023021705001.sql +++ /dev/null @@ -1,82 +0,0 @@ -create table hrsa_statreportlogs_detail -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar2(10), - uuid varchar2(36) not null, - mainid varchar2(36) not null, - dataid varchar2(50) not null, - belongdataid varchar2(50) not null, - tablename varchar2(200) not null, - tablenamelabelid varchar2(50) default '-1' not null, - tablenamedesc varchar2(50) not null, - fieldname varchar2(200) not null, - fieldnamelabelid varchar2(50) default '-1' not null, - newvalue clob not null, - oldvalue clob not null, - newrealvalue clob not null, - oldrealvalue clob not null, - fielddesc varchar2(200) not null, - showorder int not null, - isdetail int default 0 not null -) -/ - -create index idx_tenant_4fd0f4bc on hrsa_statreportlogs_detail(tenant_key) -/ - -create index idx_del_up_e798e3ef on hrsa_statreportlogs_detail(delete_type,update_time) -/ - -create table hrsa_statreportlogs -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar2(10), - uuid varchar2(36) not null, - log_date date not null, - device varchar2(500) not null, - log_operator number not null, - operatorname varchar2(100), - targetid number default '-1' not null, - targetname clob not null, - modulename varchar2(100) not null, - functionname varchar2(100) not null, - interfacename varchar2(100) not null, - requesturl varchar2(200) not null, - requesturi varchar2(200) not null, - operatetype varchar2(50) not null, - operatetypename varchar2(100) not null, - operatedesc varchar2(3000) not null, - params clob not null, - belongmainid varchar2(36) not null, - clientip varchar2(50) not null, - groupid varchar2(50) not null, - groupnamelabel varchar2(1000) not null, - redoservice varchar2(200) not null, - redocontext clob not null, - cancelservice varchar2(200) not null, - cancelcontext clob not null, - totalruntime number default '0' not null, - mainruntime number default '0' not null, - log_result varchar2(100) not null, - fromterminal varchar2(100) not null, - resultdesc clob not null, - old_content varchar2(3000) not null, - link_type varchar2(20) not null, - link_id number default '0' not null, - old_link_id number default '0' not null -) -/ - -create index idx_tenan_0ad78df3 on hrsa_statreportlogs(tenant_key) -/ - -create index idx_del_u_7c93862b on hrsa_statreportlogs(delete_type,update_time) -/ \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/2023/sql2023032901802.sql b/resource/sqlupgrade/Oracle/2023/sql2023032901802.sql deleted file mode 100644 index 76cf30e53..000000000 --- a/resource/sqlupgrade/Oracle/2023/sql2023032901802.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_report add remark varchar2(100) -/ \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/2023/sql2023032906602.sql b/resource/sqlupgrade/Oracle/2023/sql2023032906602.sql deleted file mode 100644 index d9d154eee..000000000 --- a/resource/sqlupgrade/Oracle/2023/sql2023032906602.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_report add second_dimension varchar2(100) -/ \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/2023/sql2023032915202.sql b/resource/sqlupgrade/Oracle/2023/sql2023032915202.sql deleted file mode 100644 index eb24e58d0..000000000 --- a/resource/sqlupgrade/Oracle/2023/sql2023032915202.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_report add sort_index varchar2(100) -/ \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/2023/sql2023032916202.sql b/resource/sqlupgrade/Oracle/2023/sql2023032916202.sql deleted file mode 100644 index d63f6bb40..000000000 --- a/resource/sqlupgrade/Oracle/2023/sql2023032916202.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_report add sort_type varchar2(100) -/ \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/2023/sql2023040404902.sql b/resource/sqlupgrade/Oracle/2023/sql2023040404902.sql deleted file mode 100644 index 34a089ab4..000000000 --- a/resource/sqlupgrade/Oracle/2023/sql2023040404902.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_dim add label_id int -/ \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/报表.sql b/resource/sqlupgrade/Oracle/报表.sql deleted file mode 100644 index 620dd24cb..000000000 --- a/resource/sqlupgrade/Oracle/报表.sql +++ /dev/null @@ -1,244 +0,0 @@ -create table hrsa_sub_table -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar2(10), - sub_table_name varchar2(100) not null, - dimension varchar2(20) not null, - start_month varchar2(10), - end_month varchar2(10), - pay_org_string varchar2(500), - pay_agency_string varchar2(500), - sub_company_string varchar2(500), - depart_string varchar2(500), - grade_string varchar2(500), - position_string varchar2(500), - status_string varchar2(500), - employee_type varchar2(500), - employee_string varchar2(500), - payment_type_string varchar2(100) -) -/ - -create table hrsa_sub_table_item -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar2(10), - table_id number not null, - item_name varchar2(50) not null, - item_value varchar2(500) not null, - index_value int not null, - total_rule varchar2(500), - count_rule varchar2(500), - unit_type int default 2 -) -/ - -alter table hrsa_sub_table add table_type int -/ - -alter table hrsa_sub_table modify table_type default 0 -/ - -create table hrsa_salary_stats_dim -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar2(10), - dim_name varchar2(100), - dim_type varchar2(20), - remark varchar2(500), - setting varchar2(2000), - is_default int, - dim_code varchar2(50) -) -/ - -create table hrsa_salary_stats_report -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar2(10), - report_name varchar2(100), - dimension varchar2(1000), - tax_agent_setting varchar2(1000), - income_category_setting varchar2(20), - sub_company_setting varchar2(1000), - depart_setting varchar2(1000), - grade_setting varchar2(1000), - position_setting varchar2(1000), - status_setting varchar2(1000), - employee_setting varchar2(1000), - hiredate_setting varchar2(1000), - leavedate_setting varchar2(1000), - salary_start_month date, - salary_end_month date -) -/ - -create table hrsa_salary_statistics_item -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar2(10), - item_name varchar2(50), - item_value varchar2(1000), - count_rule varchar2(500), - sum_rule varchar2(500), - avg_rule varchar2(500), - max_rule varchar2(500), - min_rule varchar2(500), - median_rule varchar2(500), - index_value int, - unit_type int, - stat_report_id number -) -/ - -create table hrsa_charts_setting -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar2(10), - table_id number not null, - charts_type int not null, - item_values varchar2(500), - item_col_value varchar2(50) not null, - dimension_range int not null, - item_sort_value varchar2(500), - item_col_sort_value varchar2(50), - sort_type int, - sort_num int -) -/ - -create table hrsa_salary_echarts_setting -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar2(10), - report_id number not null, - charts_type int not null, - item_values varchar2(500), - item_col_value varchar2(50) not null, - dimension_range int not null, - item_sort_value varchar2(500), - item_col_sort_value varchar2(50), - sort_type int, - sort_num int -) -/ - -alter table hrsa_salary_stats_dim modify dim_type varchar2(30) -/ - -alter table hrsa_salary_stats_report modify income_category_setting varchar2(1000) -/ - -create table hrsa_statreportlogs_detail -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar2(10), - uuid varchar2(36) not null, - mainid varchar2(36) not null, - dataid varchar2(50) not null, - belongdataid varchar2(50) not null, - tablename varchar2(200) not null, - tablenamelabelid varchar2(50) default '-1' not null, - tablenamedesc varchar2(50) not null, - fieldname varchar2(200) not null, - fieldnamelabelid varchar2(50) default '-1' not null, - newvalue clob not null, - oldvalue clob not null, - newrealvalue clob not null, - oldrealvalue clob not null, - fielddesc varchar2(200) not null, - showorder int not null, - isdetail int default 0 not null -) -/ - -create table hrsa_statreportlogs -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar2(10), - uuid varchar2(36) not null, - log_date date not null, - device varchar2(500) not null, - log_operator number not null, - operatorname varchar2(100), - targetid number default '-1' not null, - targetname clob not null, - modulename varchar2(100) not null, - functionname varchar2(100) not null, - interfacename varchar2(100) not null, - requesturl varchar2(200) not null, - requesturi varchar2(200) not null, - operatetype varchar2(50) not null, - operatetypename varchar2(100) not null, - operatedesc varchar2(3000) not null, - params clob not null, - belongmainid varchar2(36) not null, - clientip varchar2(50) not null, - groupid varchar2(50) not null, - groupnamelabel varchar2(1000) not null, - redoservice varchar2(200) not null, - redocontext clob not null, - cancelservice varchar2(200) not null, - cancelcontext clob not null, - totalruntime number default '0' not null, - mainruntime number default '0' not null, - log_result varchar2(100) not null, - fromterminal varchar2(100) not null, - resultdesc clob not null, - old_content varchar2(3000) not null, - link_type varchar2(20) not null, - link_id number default '0' not null, - old_link_id number default '0' not null -) -/ - -alter table hrsa_salary_stats_report add remark varchar2(100) -/ - -alter table hrsa_salary_stats_report add second_dimension varchar2(100) -/ - -alter table hrsa_salary_stats_report add sort_index varchar2(100) -/ - -alter table hrsa_salary_stats_report add sort_type varchar2(100) -/ - -alter table hrsa_salary_stats_dim add label_id int -/ \ No newline at end of file diff --git a/resource/sqlupgrade/PG/2022/sql2022120100901.sql b/resource/sqlupgrade/PG/2022/sql2022120100901.sql deleted file mode 100644 index 82f5268ae..000000000 --- a/resource/sqlupgrade/PG/2022/sql2022120100901.sql +++ /dev/null @@ -1,27 +0,0 @@ -create table hrsa_sub_table -( - id bigint primary key , - create_time timestamp, - update_time timestamp, - creator bigint, - delete_type int default 0, - tenant_key varchar(10), - sub_table_name varchar(100) not null, - dimension varchar(20) not null, - start_month varchar(10), - end_month varchar(10), - pay_org_string varchar(500), - pay_agency_string varchar(500), - sub_company_string varchar(500), - depart_string varchar(500), - grade_string varchar(500), - position_string varchar(500), - status_string varchar(500), - employee_type varchar(500), - employee_string varchar(500), - payment_type_string varchar(100) -); -/ - -create index idx_table_tk_8413fde2 on hrsa_sub_table(tenant_key); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/PG/2022/sql2022120101001.sql b/resource/sqlupgrade/PG/2022/sql2022120101001.sql deleted file mode 100644 index 95163c1ca..000000000 --- a/resource/sqlupgrade/PG/2022/sql2022120101001.sql +++ /dev/null @@ -1,23 +0,0 @@ -create table hrsa_sub_table_item -( - id bigint primary key , - create_time timestamp, - update_time timestamp, - creator bigint, - delete_type int default 0, - tenant_key varchar(10), - table_id bigint not null, - item_name varchar(50) not null, - item_value varchar(500) not null, - index_value int not null, - total_rule varchar(500), - count_rule varchar(500), - unit_type int default 2 -); -/ - -create index idx_report_tenant_key on hrsa_sub_table_item(tenant_key); -/ - -create index idx_tk_table_dt_517df716 on hrsa_sub_table_item(tenant_key,delete_type,table_id,creator); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/PG/2022/sql2022120901602.sql b/resource/sqlupgrade/PG/2022/sql2022120901602.sql deleted file mode 100644 index 7d05fff62..000000000 --- a/resource/sqlupgrade/PG/2022/sql2022120901602.sql +++ /dev/null @@ -1,5 +0,0 @@ -alter table hrsa_sub_table add table_type int; -/ - -alter table hrsa_sub_table alter column table_type set default 0; -/ \ No newline at end of file diff --git a/resource/sqlupgrade/PG/2022/sql2022121503101.sql b/resource/sqlupgrade/PG/2022/sql2022121503101.sql deleted file mode 100644 index b5d69512b..000000000 --- a/resource/sqlupgrade/PG/2022/sql2022121503101.sql +++ /dev/null @@ -1,19 +0,0 @@ -create table hrsa_salary_stats_dim -( - id bigint primary key , - create_time timestamp, - update_time timestamp, - creator bigint, - delete_type int default 0, - tenant_key varchar(10), - dim_name varchar(100), - dim_type varchar(20), - remark varchar(500), - setting varchar(2000), - is_default int, - dim_code varchar(50) -); -/ - -create index idx_tenant_key_sal_stats_dim on hrsa_salary_stats_dim(tenant_key); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/PG/2022/sql2022121613501.sql b/resource/sqlupgrade/PG/2022/sql2022121613501.sql deleted file mode 100644 index 6e5ca8dd4..000000000 --- a/resource/sqlupgrade/PG/2022/sql2022121613501.sql +++ /dev/null @@ -1,27 +0,0 @@ -create table hrsa_salary_stats_report -( - id bigint primary key , - create_time timestamp, - update_time timestamp, - creator bigint, - delete_type int default 0, - tenant_key varchar(10), - report_name varchar(100), - dimension varchar(1000), - tax_agent_setting varchar(1000), - income_category_setting varchar(20), - sub_company_setting varchar(1000), - depart_setting varchar(1000), - grade_setting varchar(1000), - position_setting varchar(1000), - status_setting varchar(1000), - employee_setting varchar(1000), - hiredate_setting varchar(1000), - leavedate_setting varchar(1000), - salary_start_month timestamp, - salary_end_month timestamp -); -/ - -create index idx_tenant_key_sal_stats_rep on hrsa_salary_stats_report(tenant_key); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/PG/2022/sql2022122005801.sql b/resource/sqlupgrade/PG/2022/sql2022122005801.sql deleted file mode 100644 index 690c20522..000000000 --- a/resource/sqlupgrade/PG/2022/sql2022122005801.sql +++ /dev/null @@ -1,24 +0,0 @@ -create table hrsa_salary_statistics_item -( - id bigint primary key , - create_time timestamp, - update_time timestamp, - creator bigint, - delete_type int default 0, - tenant_key varchar(10), - item_name varchar(50), - item_value varchar(1000), - count_rule varchar(500), - sum_rule varchar(500), - avg_rule varchar(500), - max_rule varchar(500), - min_rule varchar(500), - median_rule varchar(500), - index_value int, - unit_type int, - stat_report_id bigint -); -/ - -create index idx_tenant_key_sal_stat_item on hrsa_salary_statistics_item(tenant_key); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/PG/2023/sql2023011206201.sql b/resource/sqlupgrade/PG/2023/sql2023011206201.sql deleted file mode 100644 index 5bffbb0c0..000000000 --- a/resource/sqlupgrade/PG/2023/sql2023011206201.sql +++ /dev/null @@ -1,22 +0,0 @@ -create table hrsa_charts_setting -( - id bigint primary key , - create_time timestamp, - update_time timestamp, - creator bigint, - delete_type int default 0, - tenant_key varchar(10), - table_id bigint not null, - charts_type int not null, - item_values varchar(500), - item_col_value varchar(50) not null, - dimension_range int not null, - item_sort_value varchar(500), - item_col_sort_value varchar(50), - sort_type int, - sort_num int -); -/ - -create index index_echarts_tk_ae4c0e13 on hrsa_charts_setting(tenant_key); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/PG/2023/sql2023013104001.sql b/resource/sqlupgrade/PG/2023/sql2023013104001.sql deleted file mode 100644 index 873f2319a..000000000 --- a/resource/sqlupgrade/PG/2023/sql2023013104001.sql +++ /dev/null @@ -1,22 +0,0 @@ -create table hrsa_salary_echarts_setting -( - id bigint primary key , - create_time timestamp, - update_time timestamp, - creator bigint, - delete_type int default 0, - tenant_key varchar(10), - report_id bigint not null, - charts_type int not null, - item_values varchar(500), - item_col_value varchar(50) not null, - dimension_range int not null, - item_sort_value varchar(500), - item_col_sort_value varchar(50), - sort_type int, - sort_num int -); -/ - -create index idx_salary_echart_set_tk on hrsa_salary_echarts_setting(tenant_key); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/PG/2023/sql2023021000102.sql b/resource/sqlupgrade/PG/2023/sql2023021000102.sql deleted file mode 100644 index 3dc980de1..000000000 --- a/resource/sqlupgrade/PG/2023/sql2023021000102.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_dim alter column dim_type type varchar(30); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/PG/2023/sql2023021604102.sql b/resource/sqlupgrade/PG/2023/sql2023021604102.sql deleted file mode 100644 index 7acd451eb..000000000 --- a/resource/sqlupgrade/PG/2023/sql2023021604102.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_report alter column income_category_setting type varchar(1000); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/PG/2023/sql2023021705001.sql b/resource/sqlupgrade/PG/2023/sql2023021705001.sql deleted file mode 100644 index 9052d725a..000000000 --- a/resource/sqlupgrade/PG/2023/sql2023021705001.sql +++ /dev/null @@ -1,82 +0,0 @@ -create table hrsa_statreportlogs_detail -( - id bigint primary key , - create_time timestamp, - update_time timestamp, - creator bigint, - delete_type int default 0, - tenant_key varchar(10), - uuid varchar(36) not null, - mainid varchar(36) not null, - dataid varchar(50) not null, - belongdataid varchar(50) not null, - tablename varchar(200) not null, - tablenamelabelid varchar(50) default '-1' not null, - tablenamedesc varchar(50) not null, - fieldname varchar(200) not null, - fieldnamelabelid varchar(50) default '-1' not null, - newvalue text not null, - oldvalue text not null, - newrealvalue text not null, - oldrealvalue text not null, - fielddesc varchar(200) not null, - showorder int not null, - isdetail int default 0 not null -); -/ - -create index idx_tenant_4fd0f4bc on hrsa_statreportlogs_detail(tenant_key); -/ - -create index idx_del_up_e798e3ef on hrsa_statreportlogs_detail(delete_type,update_time); -/ - -create table hrsa_statreportlogs -( - id bigint primary key , - create_time timestamp, - update_time timestamp, - creator bigint, - delete_type int default 0, - tenant_key varchar(10), - uuid varchar(36) not null, - log_date timestamp not null, - device varchar(500) not null, - log_operator bigint not null, - operatorname varchar(100), - targetid bigint default '-1' not null, - targetname text not null, - modulename varchar(100) not null, - functionname varchar(100) not null, - interfacename varchar(100) not null, - requesturl varchar(200) not null, - requesturi varchar(200) not null, - operatetype varchar(50) not null, - operatetypename varchar(100) not null, - operatedesc varchar(3000) not null, - params text not null, - belongmainid varchar(36) not null, - clientip varchar(50) not null, - groupid varchar(50) not null, - groupnamelabel varchar(1000) not null, - redoservice varchar(200) not null, - redocontext text not null, - cancelservice varchar(200) not null, - cancelcontext text not null, - totalruntime bigint default '0' not null, - mainruntime bigint default '0' not null, - log_result varchar(100) not null, - fromterminal varchar(100) not null, - resultdesc text not null, - old_content varchar(3000) not null, - link_type varchar(20) not null, - link_id bigint default '0' not null, - old_link_id bigint default '0' not null -); -/ - -create index idx_tenan_0ad78df3 on hrsa_statreportlogs(tenant_key); -/ - -create index idx_del_u_7c93862b on hrsa_statreportlogs(delete_type,update_time); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/PG/2023/sql2023032901802.sql b/resource/sqlupgrade/PG/2023/sql2023032901802.sql deleted file mode 100644 index 28569b30a..000000000 --- a/resource/sqlupgrade/PG/2023/sql2023032901802.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_report add remark varchar(100); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/PG/2023/sql2023032906602.sql b/resource/sqlupgrade/PG/2023/sql2023032906602.sql deleted file mode 100644 index 2904d96eb..000000000 --- a/resource/sqlupgrade/PG/2023/sql2023032906602.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_report add second_dimension varchar(100); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/PG/2023/sql2023032915202.sql b/resource/sqlupgrade/PG/2023/sql2023032915202.sql deleted file mode 100644 index 6a8164591..000000000 --- a/resource/sqlupgrade/PG/2023/sql2023032915202.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_report add sort_index varchar(100); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/PG/2023/sql2023032916202.sql b/resource/sqlupgrade/PG/2023/sql2023032916202.sql deleted file mode 100644 index a78cd0884..000000000 --- a/resource/sqlupgrade/PG/2023/sql2023032916202.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_report add sort_type varchar(100); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/PG/2023/sql2023040404902.sql b/resource/sqlupgrade/PG/2023/sql2023040404902.sql deleted file mode 100644 index c444c3992..000000000 --- a/resource/sqlupgrade/PG/2023/sql2023040404902.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_dim add label_id int; -/ \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/2022/sql2022120100901.sql b/resource/sqlupgrade/SQLServer/2022/sql2022120100901.sql deleted file mode 100644 index 62848fbf9..000000000 --- a/resource/sqlupgrade/SQLServer/2022/sql2022120100901.sql +++ /dev/null @@ -1,27 +0,0 @@ -create table hrsa_sub_table -( - id bigint primary key , - create_time datetime, - update_time datetime, - creator bigint, - delete_type int default 0, - tenant_key nvarchar(10), - sub_table_name nvarchar(100) not null, - dimension nvarchar(20) not null, - start_month nvarchar(10), - end_month nvarchar(10), - pay_org_string nvarchar(500), - pay_agency_string nvarchar(500), - sub_company_string nvarchar(500), - depart_string nvarchar(500), - grade_string nvarchar(500), - position_string nvarchar(500), - status_string nvarchar(500), - employee_type nvarchar(500), - employee_string nvarchar(500), - payment_type_string nvarchar(100) -) -GO - -create index idx_table_tk_8413fde2 on hrsa_sub_table(tenant_key) -GO \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/2022/sql2022120101001.sql b/resource/sqlupgrade/SQLServer/2022/sql2022120101001.sql deleted file mode 100644 index 7f1c82181..000000000 --- a/resource/sqlupgrade/SQLServer/2022/sql2022120101001.sql +++ /dev/null @@ -1,23 +0,0 @@ -create table hrsa_sub_table_item -( - id bigint primary key , - create_time datetime, - update_time datetime, - creator bigint, - delete_type int default 0, - tenant_key nvarchar(10), - table_id bigint not null, - item_name nvarchar(50) not null, - item_value nvarchar(500) not null, - index_value int not null, - total_rule nvarchar(500), - count_rule nvarchar(500), - unit_type int default 2 -) -GO - -create index idx_report_tenant_key on hrsa_sub_table_item(tenant_key) -GO - -create index idx_tk_table_dt_517df716 on hrsa_sub_table_item(tenant_key,delete_type,table_id,creator) -GO \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/2022/sql2022120901602.sql b/resource/sqlupgrade/SQLServer/2022/sql2022120901602.sql deleted file mode 100644 index 9850ab2d9..000000000 --- a/resource/sqlupgrade/SQLServer/2022/sql2022120901602.sql +++ /dev/null @@ -1,5 +0,0 @@ -alter table hrsa_sub_table add table_type int -GO - -alter table hrsa_sub_table add constraint df_table_type_7b1e7561 default 0 for table_type -GO \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/2022/sql2022121503101.sql b/resource/sqlupgrade/SQLServer/2022/sql2022121503101.sql deleted file mode 100644 index c90b2601d..000000000 --- a/resource/sqlupgrade/SQLServer/2022/sql2022121503101.sql +++ /dev/null @@ -1,19 +0,0 @@ -create table hrsa_salary_stats_dim -( - id bigint primary key , - create_time datetime, - update_time datetime, - creator bigint, - delete_type int default 0, - tenant_key nvarchar(10), - dim_name nvarchar(100), - dim_type nvarchar(20), - remark nvarchar(500), - setting nvarchar(2000), - is_default int, - dim_code nvarchar(50) -) -GO - -create index idx_tenant_key_sal_stats_dim on hrsa_salary_stats_dim(tenant_key) -GO \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/2022/sql2022121613501.sql b/resource/sqlupgrade/SQLServer/2022/sql2022121613501.sql deleted file mode 100644 index 478e002e5..000000000 --- a/resource/sqlupgrade/SQLServer/2022/sql2022121613501.sql +++ /dev/null @@ -1,27 +0,0 @@ -create table hrsa_salary_stats_report -( - id bigint primary key , - create_time datetime, - update_time datetime, - creator bigint, - delete_type int default 0, - tenant_key nvarchar(10), - report_name nvarchar(100), - dimension nvarchar(1000), - tax_agent_setting nvarchar(1000), - income_category_setting nvarchar(20), - sub_company_setting nvarchar(1000), - depart_setting nvarchar(1000), - grade_setting nvarchar(1000), - position_setting nvarchar(1000), - status_setting nvarchar(1000), - employee_setting nvarchar(1000), - hiredate_setting varchar(1000), - leavedate_setting varchar(1000), - salary_start_month datetime, - salary_end_month datetime -) -GO - -create index idx_tenant_key_sal_stats_rep on hrsa_salary_stats_report(tenant_key) -GO \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/2022/sql2022122005801.sql b/resource/sqlupgrade/SQLServer/2022/sql2022122005801.sql deleted file mode 100644 index 48224de5e..000000000 --- a/resource/sqlupgrade/SQLServer/2022/sql2022122005801.sql +++ /dev/null @@ -1,24 +0,0 @@ -create table hrsa_salary_statistics_item -( - id bigint primary key , - create_time datetime, - update_time datetime, - creator bigint, - delete_type int default 0, - tenant_key nvarchar(10), - item_name nvarchar(50), - item_value nvarchar(1000), - count_rule nvarchar(500), - sum_rule nvarchar(500), - avg_rule nvarchar(500), - max_rule nvarchar(500), - min_rule nvarchar(500), - median_rule nvarchar(500), - index_value int, - unit_type int, - stat_report_id bigint -) -GO - -create index idx_tenant_key_sal_stat_item on hrsa_salary_statistics_item(tenant_key) -GO \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/2023/sql2023011206201.sql b/resource/sqlupgrade/SQLServer/2023/sql2023011206201.sql deleted file mode 100644 index 6ff111bcd..000000000 --- a/resource/sqlupgrade/SQLServer/2023/sql2023011206201.sql +++ /dev/null @@ -1,22 +0,0 @@ -create table hrsa_charts_setting -( - id bigint primary key , - create_time datetime, - update_time datetime, - creator bigint, - delete_type int default 0, - tenant_key nvarchar(10), - table_id bigint not null, - charts_type int not null, - item_values nvarchar(500), - item_col_value nvarchar(50) not null, - dimension_range int not null, - item_sort_value nvarchar(500), - item_col_sort_value nvarchar(50), - sort_type int, - sort_num int -) -GO - -create index index_echarts_tk_ae4c0e13 on hrsa_charts_setting(tenant_key) -GO \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/2023/sql2023013104001.sql b/resource/sqlupgrade/SQLServer/2023/sql2023013104001.sql deleted file mode 100644 index a74523163..000000000 --- a/resource/sqlupgrade/SQLServer/2023/sql2023013104001.sql +++ /dev/null @@ -1,22 +0,0 @@ -create table hrsa_salary_echarts_setting -( - id bigint primary key , - create_time datetime, - update_time datetime, - creator bigint, - delete_type int default 0, - tenant_key nvarchar(10), - report_id bigint not null, - charts_type int not null, - item_values nvarchar(500), - item_col_value nvarchar(50) not null, - dimension_range int not null, - item_sort_value nvarchar(500), - item_col_sort_value nvarchar(50), - sort_type int, - sort_num int -) -GO - -create index idx_salary_echart_set_tk on hrsa_salary_echarts_setting(tenant_key) -GO \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/2023/sql2023021000102.sql b/resource/sqlupgrade/SQLServer/2023/sql2023021000102.sql deleted file mode 100644 index 4e68f59aa..000000000 --- a/resource/sqlupgrade/SQLServer/2023/sql2023021000102.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_dim alter column dim_type nvarchar(30) -GO \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/2023/sql2023021604102.sql b/resource/sqlupgrade/SQLServer/2023/sql2023021604102.sql deleted file mode 100644 index 14c2effdd..000000000 --- a/resource/sqlupgrade/SQLServer/2023/sql2023021604102.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_report alter column income_category_setting nvarchar(1000) -GO \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/2023/sql2023021705001.sql b/resource/sqlupgrade/SQLServer/2023/sql2023021705001.sql deleted file mode 100644 index c5525afae..000000000 --- a/resource/sqlupgrade/SQLServer/2023/sql2023021705001.sql +++ /dev/null @@ -1,82 +0,0 @@ -create table hrsa_statreportlogs_detail -( - id bigint primary key , - create_time datetime, - update_time datetime, - creator bigint, - delete_type int default 0, - tenant_key nvarchar(10), - uuid nvarchar(36) not null, - mainid nvarchar(36) not null, - dataid nvarchar(50) not null, - belongdataid nvarchar(50) not null, - tablename nvarchar(200) not null, - tablenamelabelid nvarchar(50) default '-1' not null, - tablenamedesc nvarchar(50) not null, - fieldname nvarchar(200) not null, - fieldnamelabelid nvarchar(50) default '-1' not null, - newvalue nvarchar(max) not null, - oldvalue nvarchar(max) not null, - newrealvalue nvarchar(max) not null, - oldrealvalue nvarchar(max) not null, - fielddesc nvarchar(200) not null, - showorder int not null, - isdetail int default 0 not null -) -GO - -create index idx_tenant_4fd0f4bc on hrsa_statreportlogs_detail(tenant_key) -GO - -create index idx_del_up_e798e3ef on hrsa_statreportlogs_detail(delete_type,update_time) -GO - -create table hrsa_statreportlogs -( - id bigint primary key , - create_time datetime, - update_time datetime, - creator bigint, - delete_type int default 0, - tenant_key nvarchar(10), - uuid nvarchar(36) not null, - log_date datetime not null, - device nvarchar(500) not null, - log_operator bigint not null, - operatorname nvarchar(100), - targetid bigint default '-1' not null, - targetname nvarchar(max) not null, - modulename nvarchar(100) not null, - functionname nvarchar(100) not null, - interfacename nvarchar(100) not null, - requesturl nvarchar(200) not null, - requesturi nvarchar(200) not null, - operatetype nvarchar(50) not null, - operatetypename nvarchar(100) not null, - operatedesc nvarchar(3000) not null, - params nvarchar(max) not null, - belongmainid nvarchar(36) not null, - clientip nvarchar(50) not null, - groupid nvarchar(50) not null, - groupnamelabel nvarchar(1000) not null, - redoservice nvarchar(200) not null, - redocontext nvarchar(max) not null, - cancelservice nvarchar(200) not null, - cancelcontext nvarchar(max) not null, - totalruntime bigint default '0' not null, - mainruntime bigint default '0' not null, - log_result nvarchar(100) not null, - fromterminal nvarchar(100) not null, - resultdesc nvarchar(max) not null, - old_content nvarchar(3000) not null, - link_type nvarchar(20) not null, - link_id bigint default '0' not null, - old_link_id bigint default '0' not null -) -GO - -create index idx_tenan_0ad78df3 on hrsa_statreportlogs(tenant_key) -GO - -create index idx_del_u_7c93862b on hrsa_statreportlogs(delete_type,update_time) -GO \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/2023/sql2023032901802.sql b/resource/sqlupgrade/SQLServer/2023/sql2023032901802.sql deleted file mode 100644 index fb1f9c1d6..000000000 --- a/resource/sqlupgrade/SQLServer/2023/sql2023032901802.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_report add remark nvarchar(100) -GO \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/2023/sql2023032906602.sql b/resource/sqlupgrade/SQLServer/2023/sql2023032906602.sql deleted file mode 100644 index 1c9ec574c..000000000 --- a/resource/sqlupgrade/SQLServer/2023/sql2023032906602.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_report add second_dimension nvarchar(100) -GO \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/2023/sql2023032915202.sql b/resource/sqlupgrade/SQLServer/2023/sql2023032915202.sql deleted file mode 100644 index e8703b352..000000000 --- a/resource/sqlupgrade/SQLServer/2023/sql2023032915202.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_report add sort_index nvarchar(100) -GO \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/2023/sql2023032916202.sql b/resource/sqlupgrade/SQLServer/2023/sql2023032916202.sql deleted file mode 100644 index 6416a4b37..000000000 --- a/resource/sqlupgrade/SQLServer/2023/sql2023032916202.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_report add sort_type nvarchar(100) -GO \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/2023/sql2023040404902.sql b/resource/sqlupgrade/SQLServer/2023/sql2023040404902.sql deleted file mode 100644 index 2ce9a28f2..000000000 --- a/resource/sqlupgrade/SQLServer/2023/sql2023040404902.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_dim add label_id int -GO \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/报表.sql b/resource/sqlupgrade/SQLServer/报表.sql deleted file mode 100644 index 953eadd43..000000000 --- a/resource/sqlupgrade/SQLServer/报表.sql +++ /dev/null @@ -1,244 +0,0 @@ -create table hrsa_sub_table -( - id bigint primary key , - create_time datetime, - update_time datetime, - creator bigint, - delete_type int default 0, - tenant_key nvarchar(10), - sub_table_name nvarchar(100) not null, - dimension nvarchar(20) not null, - start_month nvarchar(10), - end_month nvarchar(10), - pay_org_string nvarchar(500), - pay_agency_string nvarchar(500), - sub_company_string nvarchar(500), - depart_string nvarchar(500), - grade_string nvarchar(500), - position_string nvarchar(500), - status_string nvarchar(500), - employee_type nvarchar(500), - employee_string nvarchar(500), - payment_type_string nvarchar(100) -) -GO - -create table hrsa_sub_table_item -( - id bigint primary key , - create_time datetime, - update_time datetime, - creator bigint, - delete_type int default 0, - tenant_key nvarchar(10), - table_id bigint not null, - item_name nvarchar(50) not null, - item_value nvarchar(500) not null, - index_value int not null, - total_rule nvarchar(500), - count_rule nvarchar(500), - unit_type int default 2 -) -GO - -alter table hrsa_sub_table add table_type int -GO - -alter table hrsa_sub_table add constraint df_table_type_7b1e7561 default 0 for table_type -GO - -create table hrsa_salary_stats_dim -( - id bigint primary key , - create_time datetime, - update_time datetime, - creator bigint, - delete_type int default 0, - tenant_key nvarchar(10), - dim_name nvarchar(100), - dim_type nvarchar(20), - remark nvarchar(500), - setting nvarchar(2000), - is_default int, - dim_code nvarchar(50) -) -GO - -create table hrsa_salary_stats_report -( - id bigint primary key , - create_time datetime, - update_time datetime, - creator bigint, - delete_type int default 0, - tenant_key nvarchar(10), - report_name nvarchar(100), - dimension nvarchar(1000), - tax_agent_setting nvarchar(1000), - income_category_setting nvarchar(20), - sub_company_setting nvarchar(1000), - depart_setting nvarchar(1000), - grade_setting nvarchar(1000), - position_setting nvarchar(1000), - status_setting nvarchar(1000), - employee_setting nvarchar(1000), - hiredate_setting varchar(1000), - leavedate_setting varchar(1000), - salary_start_month datetime, - salary_end_month datetime -) -GO - -create table hrsa_salary_statistics_item -( - id bigint primary key , - create_time datetime, - update_time datetime, - creator bigint, - delete_type int default 0, - tenant_key nvarchar(10), - item_name nvarchar(50), - item_value nvarchar(1000), - count_rule nvarchar(500), - sum_rule nvarchar(500), - avg_rule nvarchar(500), - max_rule nvarchar(500), - min_rule nvarchar(500), - median_rule nvarchar(500), - index_value int, - unit_type int, - stat_report_id bigint -) -GO - -create table hrsa_charts_setting -( - id bigint primary key , - create_time datetime, - update_time datetime, - creator bigint, - delete_type int default 0, - tenant_key nvarchar(10), - table_id bigint not null, - charts_type int not null, - item_values nvarchar(500), - item_col_value nvarchar(50) not null, - dimension_range int not null, - item_sort_value nvarchar(500), - item_col_sort_value nvarchar(50), - sort_type int, - sort_num int -) -GO - -create table hrsa_salary_echarts_setting -( - id bigint primary key , - create_time datetime, - update_time datetime, - creator bigint, - delete_type int default 0, - tenant_key nvarchar(10), - report_id bigint not null, - charts_type int not null, - item_values nvarchar(500), - item_col_value nvarchar(50) not null, - dimension_range int not null, - item_sort_value nvarchar(500), - item_col_sort_value nvarchar(50), - sort_type int, - sort_num int -) -GO - -alter table hrsa_salary_stats_dim alter column dim_type nvarchar(30) -GO - -alter table hrsa_salary_stats_report alter column income_category_setting nvarchar(1000) -GO - -create table hrsa_statreportlogs_detail -( - id bigint primary key , - create_time datetime, - update_time datetime, - creator bigint, - delete_type int default 0, - tenant_key nvarchar(10), - uuid nvarchar(36) not null, - mainid nvarchar(36) not null, - dataid nvarchar(50) not null, - belongdataid nvarchar(50) not null, - tablename nvarchar(200) not null, - tablenamelabelid nvarchar(50) default '-1' not null, - tablenamedesc nvarchar(50) not null, - fieldname nvarchar(200) not null, - fieldnamelabelid nvarchar(50) default '-1' not null, - newvalue nvarchar(max) not null, - oldvalue nvarchar(max) not null, - newrealvalue nvarchar(max) not null, - oldrealvalue nvarchar(max) not null, - fielddesc nvarchar(200) not null, - showorder int not null, - isdetail int default 0 not null -) -GO - -create table hrsa_statreportlogs -( - id bigint primary key , - create_time datetime, - update_time datetime, - creator bigint, - delete_type int default 0, - tenant_key nvarchar(10), - uuid nvarchar(36) not null, - log_date datetime not null, - device nvarchar(500) not null, - log_operator bigint not null, - operatorname nvarchar(100), - targetid bigint default '-1' not null, - targetname nvarchar(max) not null, - modulename nvarchar(100) not null, - functionname nvarchar(100) not null, - interfacename nvarchar(100) not null, - requesturl nvarchar(200) not null, - requesturi nvarchar(200) not null, - operatetype nvarchar(50) not null, - operatetypename nvarchar(100) not null, - operatedesc nvarchar(3000) not null, - params nvarchar(max) not null, - belongmainid nvarchar(36) not null, - clientip nvarchar(50) not null, - groupid nvarchar(50) not null, - groupnamelabel nvarchar(1000) not null, - redoservice nvarchar(200) not null, - redocontext nvarchar(max) not null, - cancelservice nvarchar(200) not null, - cancelcontext nvarchar(max) not null, - totalruntime bigint default '0' not null, - mainruntime bigint default '0' not null, - log_result nvarchar(100) not null, - fromterminal nvarchar(100) not null, - resultdesc nvarchar(max) not null, - old_content nvarchar(3000) not null, - link_type nvarchar(20) not null, - link_id bigint default '0' not null, - old_link_id bigint default '0' not null -) -GO - -alter table hrsa_salary_stats_report add remark nvarchar(100) -GO - -alter table hrsa_salary_stats_report add second_dimension nvarchar(100) -GO - -alter table hrsa_salary_stats_report add sort_index nvarchar(100) -GO - -alter table hrsa_salary_stats_report add sort_type nvarchar(100) -GO - -alter table hrsa_salary_stats_dim add label_id int -GO \ No newline at end of file diff --git a/resource/sqlupgrade/ST/2022/sql2022120100901.sql b/resource/sqlupgrade/ST/2022/sql2022120100901.sql deleted file mode 100644 index 9b45402f5..000000000 --- a/resource/sqlupgrade/ST/2022/sql2022120100901.sql +++ /dev/null @@ -1,27 +0,0 @@ -create table hrsa_sub_table -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar(10), - sub_table_name varchar(100) not null, - dimension varchar(20) not null, - start_month varchar(10), - end_month varchar(10), - pay_org_string varchar(500), - pay_agency_string varchar(500), - sub_company_string varchar(500), - depart_string varchar(500), - grade_string varchar(500), - position_string varchar(500), - status_string varchar(500), - employee_type varchar(500), - employee_string varchar(500), - payment_type_string varchar(100) -); -/ - -create index idx_table_tk_8413fde2 on hrsa_sub_table(tenant_key); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/ST/2022/sql2022120101001.sql b/resource/sqlupgrade/ST/2022/sql2022120101001.sql deleted file mode 100644 index 8ad5b3129..000000000 --- a/resource/sqlupgrade/ST/2022/sql2022120101001.sql +++ /dev/null @@ -1,23 +0,0 @@ -create table hrsa_sub_table_item -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar(10), - table_id number not null, - item_name varchar(50) not null, - item_value varchar(500) not null, - index_value int not null, - total_rule varchar(500), - count_rule varchar(500), - unit_type int default 2 -); -/ - -create index idx_report_tenant_key on hrsa_sub_table_item(tenant_key); -/ - -create index idx_tk_table_dt_517df716 on hrsa_sub_table_item(tenant_key,delete_type,table_id,creator); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/ST/2022/sql2022120901602.sql b/resource/sqlupgrade/ST/2022/sql2022120901602.sql deleted file mode 100644 index 81a0b8693..000000000 --- a/resource/sqlupgrade/ST/2022/sql2022120901602.sql +++ /dev/null @@ -1,5 +0,0 @@ -alter table hrsa_sub_table add table_type int; -/ - -alter table hrsa_sub_table modify table_type default 0; -/ \ No newline at end of file diff --git a/resource/sqlupgrade/ST/2022/sql2022121503101.sql b/resource/sqlupgrade/ST/2022/sql2022121503101.sql deleted file mode 100644 index fb9159c03..000000000 --- a/resource/sqlupgrade/ST/2022/sql2022121503101.sql +++ /dev/null @@ -1,19 +0,0 @@ -create table hrsa_salary_stats_dim -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar(10), - dim_name varchar(100), - dim_type varchar(20), - remark varchar(500), - setting varchar(2000), - is_default int, - dim_code varchar(50) -); -/ - -create index idx_tenant_key_sal_stats_dim on hrsa_salary_stats_dim(tenant_key); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/ST/2022/sql2022121613501.sql b/resource/sqlupgrade/ST/2022/sql2022121613501.sql deleted file mode 100644 index 2cb7ab3fb..000000000 --- a/resource/sqlupgrade/ST/2022/sql2022121613501.sql +++ /dev/null @@ -1,27 +0,0 @@ -create table hrsa_salary_stats_report -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar(10), - report_name varchar(100), - dimension varchar(1000), - tax_agent_setting varchar(1000), - income_category_setting varchar(20), - sub_company_setting varchar(1000), - depart_setting varchar(1000), - grade_setting varchar(1000), - position_setting varchar(1000), - status_setting varchar(1000), - employee_setting varchar(1000), - hiredate_setting varchar(1000), - leavedate_setting varchar(1000), - salary_start_month date, - salary_end_month date -); -/ - -create index idx_tenant_key_sal_stats_rep on hrsa_salary_stats_report(tenant_key); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/ST/2022/sql2022122005801.sql b/resource/sqlupgrade/ST/2022/sql2022122005801.sql deleted file mode 100644 index 289ad7775..000000000 --- a/resource/sqlupgrade/ST/2022/sql2022122005801.sql +++ /dev/null @@ -1,24 +0,0 @@ -create table hrsa_salary_statistics_item -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar(10), - item_name varchar(50), - item_value varchar(1000), - count_rule varchar(500), - sum_rule varchar(500), - avg_rule varchar(500), - max_rule varchar(500), - min_rule varchar(500), - median_rule varchar(500), - index_value int, - unit_type int, - stat_report_id number -); -/ - -create index idx_tenant_key_sal_stat_item on hrsa_salary_statistics_item(tenant_key); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/ST/2023/sql2023011206201.sql b/resource/sqlupgrade/ST/2023/sql2023011206201.sql deleted file mode 100644 index 1bcc5602a..000000000 --- a/resource/sqlupgrade/ST/2023/sql2023011206201.sql +++ /dev/null @@ -1,22 +0,0 @@ -create table hrsa_charts_setting -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar(10), - table_id number not null, - charts_type int not null, - item_values varchar(500), - item_col_value varchar(50) not null, - dimension_range int not null, - item_sort_value varchar(500), - item_col_sort_value varchar(50), - sort_type int, - sort_num int -); -/ - -create index index_echarts_tk_ae4c0e13 on hrsa_charts_setting(tenant_key); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/ST/2023/sql2023013104001.sql b/resource/sqlupgrade/ST/2023/sql2023013104001.sql deleted file mode 100644 index bd3d42415..000000000 --- a/resource/sqlupgrade/ST/2023/sql2023013104001.sql +++ /dev/null @@ -1,22 +0,0 @@ -create table hrsa_salary_echarts_setting -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar(10), - report_id number not null, - charts_type int not null, - item_values varchar(500), - item_col_value varchar(50) not null, - dimension_range int not null, - item_sort_value varchar(500), - item_col_sort_value varchar(50), - sort_type int, - sort_num int -); -/ - -create index idx_salary_echart_set_tk on hrsa_salary_echarts_setting(tenant_key); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/ST/2023/sql2023021000102.sql b/resource/sqlupgrade/ST/2023/sql2023021000102.sql deleted file mode 100644 index a1b09bbb5..000000000 --- a/resource/sqlupgrade/ST/2023/sql2023021000102.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_dim modify dim_type varchar(30); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/ST/2023/sql2023021604102.sql b/resource/sqlupgrade/ST/2023/sql2023021604102.sql deleted file mode 100644 index a5bb145fe..000000000 --- a/resource/sqlupgrade/ST/2023/sql2023021604102.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_report modify income_category_setting varchar(1000); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/ST/2023/sql2023021705001.sql b/resource/sqlupgrade/ST/2023/sql2023021705001.sql deleted file mode 100644 index 708255326..000000000 --- a/resource/sqlupgrade/ST/2023/sql2023021705001.sql +++ /dev/null @@ -1,82 +0,0 @@ -create table hrsa_statreportlogs_detail -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar(10), - uuid varchar(36) not null, - mainid varchar(36) not null, - dataid varchar(50) not null, - belongdataid varchar(50) not null, - tablename varchar(200) not null, - tablenamelabelid varchar(50) default '-1' not null, - tablenamedesc varchar(50) not null, - fieldname varchar(200) not null, - fieldnamelabelid varchar(50) default '-1' not null, - newvalue clob not null, - oldvalue clob not null, - newrealvalue clob not null, - oldrealvalue clob not null, - fielddesc varchar(200) not null, - showorder int not null, - isdetail int default 0 not null -); -/ - -create index idx_tenant_4fd0f4bc on hrsa_statreportlogs_detail(tenant_key); -/ - -create index idx_del_up_e798e3ef on hrsa_statreportlogs_detail(delete_type,update_time); -/ - -create table hrsa_statreportlogs -( - id number primary key , - create_time date, - update_time date, - creator number, - delete_type int default 0, - tenant_key varchar(10), - uuid varchar(36) not null, - log_date date not null, - device varchar(500) not null, - log_operator number not null, - operatorname varchar(100), - targetid number default '-1' not null, - targetname clob not null, - modulename varchar(100) not null, - functionname varchar(100) not null, - interfacename varchar(100) not null, - requesturl varchar(200) not null, - requesturi varchar(200) not null, - operatetype varchar(50) not null, - operatetypename varchar(100) not null, - operatedesc varchar(3000) not null, - params clob not null, - belongmainid varchar(36) not null, - clientip varchar(50) not null, - groupid varchar(50) not null, - groupnamelabel varchar(1000) not null, - redoservice varchar(200) not null, - redocontext clob not null, - cancelservice varchar(200) not null, - cancelcontext clob not null, - totalruntime number default '0' not null, - mainruntime number default '0' not null, - log_result varchar(100) not null, - fromterminal varchar(100) not null, - resultdesc clob not null, - old_content varchar(3000) not null, - link_type varchar(20) not null, - link_id number default '0' not null, - old_link_id number default '0' not null -); -/ - -create index idx_tenan_0ad78df3 on hrsa_statreportlogs(tenant_key); -/ - -create index idx_del_u_7c93862b on hrsa_statreportlogs(delete_type,update_time); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/ST/2023/sql2023032901802.sql b/resource/sqlupgrade/ST/2023/sql2023032901802.sql deleted file mode 100644 index 28569b30a..000000000 --- a/resource/sqlupgrade/ST/2023/sql2023032901802.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_report add remark varchar(100); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/ST/2023/sql2023032906602.sql b/resource/sqlupgrade/ST/2023/sql2023032906602.sql deleted file mode 100644 index 2904d96eb..000000000 --- a/resource/sqlupgrade/ST/2023/sql2023032906602.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_report add second_dimension varchar(100); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/ST/2023/sql2023032915202.sql b/resource/sqlupgrade/ST/2023/sql2023032915202.sql deleted file mode 100644 index 6a8164591..000000000 --- a/resource/sqlupgrade/ST/2023/sql2023032915202.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_report add sort_index varchar(100); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/ST/2023/sql2023032916202.sql b/resource/sqlupgrade/ST/2023/sql2023032916202.sql deleted file mode 100644 index a78cd0884..000000000 --- a/resource/sqlupgrade/ST/2023/sql2023032916202.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_report add sort_type varchar(100); -/ \ No newline at end of file diff --git a/resource/sqlupgrade/ST/2023/sql2023040404902.sql b/resource/sqlupgrade/ST/2023/sql2023040404902.sql deleted file mode 100644 index c444c3992..000000000 --- a/resource/sqlupgrade/ST/2023/sql2023040404902.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hrsa_salary_stats_dim add label_id int; -/ \ No newline at end of file diff --git a/src/com/engine/salary/report/common/constant/DbCrudConstant.java b/src/com/engine/salary/report/common/constant/DbCrudConstant.java index 885309c4a..2ec6a8eb8 100644 --- a/src/com/engine/salary/report/common/constant/DbCrudConstant.java +++ b/src/com/engine/salary/report/common/constant/DbCrudConstant.java @@ -1,10 +1,6 @@ package com.engine.salary.report.common.constant; -/** - * @Description: 数据库操作常量 - * @Author: wangxiangzhong - * @Date: 2022/7/27 20:41 - */ + public class DbCrudConstant { /** diff --git a/src/com/engine/salary/report/common/constant/SalaryConstant.java b/src/com/engine/salary/report/common/constant/SalaryConstant.java index 69ad5ff88..b6af93d9d 100644 --- a/src/com/engine/salary/report/common/constant/SalaryConstant.java +++ b/src/com/engine/salary/report/common/constant/SalaryConstant.java @@ -1,9 +1,7 @@ package com.engine.salary.report.common.constant; /** - * @Description: 薪资常量 - * @Author: wangxiangzhong - * @Date: 2022/5/27 13:32 + * 薪资常量 */ public class SalaryConstant { diff --git a/src/com/engine/salary/report/common/constant/SalaryReportModule.java b/src/com/engine/salary/report/common/constant/SalaryReportModule.java index 8afc32b4e..655f5e2d0 100644 --- a/src/com/engine/salary/report/common/constant/SalaryReportModule.java +++ b/src/com/engine/salary/report/common/constant/SalaryReportModule.java @@ -1,11 +1,5 @@ package com.engine.salary.report.common.constant; -/** - * @Description: - * @Author: zhangheng - * @CreateDate: 2022/10/24 - * @Version: v1.0 - */ public class SalaryReportModule { public final static String BROWSER_MODULE = "salaryreport"; diff --git a/src/com/engine/salary/report/common/constant/SalaryStatisticsDimensionConstant.java b/src/com/engine/salary/report/common/constant/SalaryStatisticsDimensionConstant.java index 9be8dfd15..46d93b57e 100644 --- a/src/com/engine/salary/report/common/constant/SalaryStatisticsDimensionConstant.java +++ b/src/com/engine/salary/report/common/constant/SalaryStatisticsDimensionConstant.java @@ -1,9 +1,7 @@ package com.engine.salary.report.common.constant; /** - * @Description: 薪资报表统计维度常量 - * @Author: wangxiangzhong - * @Date: 2022/12/30 13:17 + * 薪资报表统计维度常量 */ public class SalaryStatisticsDimensionConstant { diff --git a/src/com/engine/salary/report/entity/bo/SalaryStatisticsEmployeeBO.java b/src/com/engine/salary/report/entity/bo/SalaryStatisticsEmployeeBO.java index 808c59768..0067e1cff 100644 --- a/src/com/engine/salary/report/entity/bo/SalaryStatisticsEmployeeBO.java +++ b/src/com/engine/salary/report/entity/bo/SalaryStatisticsEmployeeBO.java @@ -12,9 +12,7 @@ import java.util.Set; import java.util.stream.Collectors; /** - * @Description: 薪酬统计员工明细 - * @Author: wangxiangzhong - * @Date: 2022/12/30 14:23 + * 薪酬统计员工明细 */ public class SalaryStatisticsEmployeeBO { diff --git a/src/com/engine/salary/report/entity/bo/SalaryStatisticsReportBO.java b/src/com/engine/salary/report/entity/bo/SalaryStatisticsReportBO.java index 3f39787ed..008569ce1 100644 --- a/src/com/engine/salary/report/entity/bo/SalaryStatisticsReportBO.java +++ b/src/com/engine/salary/report/entity/bo/SalaryStatisticsReportBO.java @@ -35,9 +35,7 @@ import java.util.function.Function; import java.util.stream.Collectors; /** - * @Description: 薪酬统计报表 - * @Author: wangxiangzhong - * @Date: 2022/12/30 14:04 + * 薪酬统计报表 */ public class SalaryStatisticsReportBO { diff --git a/src/com/engine/salary/report/entity/dto/SalaryStatisticsDimensionFormDTO.java b/src/com/engine/salary/report/entity/dto/SalaryStatisticsDimensionFormDTO.java index e9ebbddf3..5e78018f6 100644 --- a/src/com/engine/salary/report/entity/dto/SalaryStatisticsDimensionFormDTO.java +++ b/src/com/engine/salary/report/entity/dto/SalaryStatisticsDimensionFormDTO.java @@ -8,9 +8,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @Description: 薪酬统计维度表单 - * @Author: wangxiangzhong - * @Date: 2022/12/15 14:25 + * 薪酬统计维度表单 */ @Data @Builder diff --git a/src/com/engine/salary/report/entity/dto/SalaryStatisticsEchartsDTO.java b/src/com/engine/salary/report/entity/dto/SalaryStatisticsEchartsDTO.java index e09871606..cc3dfff7a 100644 --- a/src/com/engine/salary/report/entity/dto/SalaryStatisticsEchartsDTO.java +++ b/src/com/engine/salary/report/entity/dto/SalaryStatisticsEchartsDTO.java @@ -10,9 +10,7 @@ import lombok.NoArgsConstructor; import java.util.List; /** - * @Description: 分析图数据展示范围设置 - * @Author: wangxiangzhong - * @Date: 2023/1/31 14:48 + * 分析图数据展示范围设置 */ @Data @Builder diff --git a/src/com/engine/salary/report/entity/dto/SalaryStatisticsEmployeeDetailResultDTO.java b/src/com/engine/salary/report/entity/dto/SalaryStatisticsEmployeeDetailResultDTO.java index 3848c31fe..f89c61d76 100644 --- a/src/com/engine/salary/report/entity/dto/SalaryStatisticsEmployeeDetailResultDTO.java +++ b/src/com/engine/salary/report/entity/dto/SalaryStatisticsEmployeeDetailResultDTO.java @@ -11,9 +11,7 @@ import lombok.NoArgsConstructor; import java.util.List; /** - * @Description: 薪酬统计员工明细核算结果 - * @Author: wangxiangzhong - * @Date: 2022/12/16 17:17 + * 薪酬统计员工明细核算结果 */ @Data @Builder diff --git a/src/com/engine/salary/report/entity/dto/SalaryStatisticsEmployeeListDTO.java b/src/com/engine/salary/report/entity/dto/SalaryStatisticsEmployeeListDTO.java index 6b87f3d6d..6c7e5ca80 100644 --- a/src/com/engine/salary/report/entity/dto/SalaryStatisticsEmployeeListDTO.java +++ b/src/com/engine/salary/report/entity/dto/SalaryStatisticsEmployeeListDTO.java @@ -8,42 +8,39 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @Description: 薪酬统计员工列表 - * @Author: wangxiangzhong - * @Date: 2022/12/16 17:17 + * 薪酬统计员工列表 */ @Data @Builder @NoArgsConstructor @AllArgsConstructor -//"薪酬统计员工列表") public class SalaryStatisticsEmployeeListDTO { - //主键id") + //主键id @JsonSerialize(using = ToStringSerializer.class) private Long id; - //姓名") + //姓名 private String name; - //分部") + //分部 private String subCompany; - //部门") + //部门 private String department; - //岗位") + //岗位 private String position; - // 员工状态") + // 员工状态 private String status; - //工号") + //工号 private String jobNum; - //证件号码") + //证件号码 private String idNo; - //人员类型") + //人员类型 private Integer employeeType; } diff --git a/src/com/engine/salary/report/entity/dto/SalaryStatisticsItemFormDTO.java b/src/com/engine/salary/report/entity/dto/SalaryStatisticsItemFormDTO.java index 41ff65310..19e601bbd 100644 --- a/src/com/engine/salary/report/entity/dto/SalaryStatisticsItemFormDTO.java +++ b/src/com/engine/salary/report/entity/dto/SalaryStatisticsItemFormDTO.java @@ -10,24 +10,21 @@ import lombok.NoArgsConstructor; import java.util.Map; /** - * @Description: 薪酬统计自定义统计项表单 - * @Author: wangxiangzhong - * @Date: 2022/12/15 14:25 + * 薪酬统计自定义统计项表单 */ @Data @Builder @NoArgsConstructor @AllArgsConstructor -//"薪酬统计自定义统计项表单") public class SalaryStatisticsItemFormDTO { - //主键id") + //主键id @JsonSerialize(using = ToStringSerializer.class) private Long id; - //基础表单") + //基础表单 private Object baseForm; - //统计规则") + //统计规则 private Map ruleData; } diff --git a/src/com/engine/salary/report/entity/dto/SalaryStatisticsItemRuleDTO.java b/src/com/engine/salary/report/entity/dto/SalaryStatisticsItemRuleDTO.java index 86923ed9d..c64881c59 100644 --- a/src/com/engine/salary/report/entity/dto/SalaryStatisticsItemRuleDTO.java +++ b/src/com/engine/salary/report/entity/dto/SalaryStatisticsItemRuleDTO.java @@ -8,9 +8,7 @@ import lombok.NoArgsConstructor; import java.math.BigDecimal; /** - * @Description: 薪酬统计报表自定义统计项目规则 - * @Author: wangxiangzhong - * @Date: 2022/12/29 16:35 + * 薪酬统计报表自定义统计项目规则 */ @Data @Builder diff --git a/src/com/engine/salary/report/entity/dto/SalaryStatisticsReportDataDTO.java b/src/com/engine/salary/report/entity/dto/SalaryStatisticsReportDataDTO.java index 646311a6c..a2f6a1b6c 100644 --- a/src/com/engine/salary/report/entity/dto/SalaryStatisticsReportDataDTO.java +++ b/src/com/engine/salary/report/entity/dto/SalaryStatisticsReportDataDTO.java @@ -12,10 +12,13 @@ import lombok.NoArgsConstructor; import java.util.List; /** - * @Description: 薪酬统计报表数据 - * @Author: wangxiangzhong - * @Date: 2022/12/15 14:25 - */ + * 薪酬统计报表自定义统计项目规则 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ @Data @Builder @NoArgsConstructor diff --git a/src/com/engine/salary/report/entity/dto/SalaryStatisticsReportFormDTO.java b/src/com/engine/salary/report/entity/dto/SalaryStatisticsReportFormDTO.java index f698810ab..95c88d855 100644 --- a/src/com/engine/salary/report/entity/dto/SalaryStatisticsReportFormDTO.java +++ b/src/com/engine/salary/report/entity/dto/SalaryStatisticsReportFormDTO.java @@ -8,10 +8,13 @@ import lombok.NoArgsConstructor; import java.util.List; /** - * @Description: 薪酬统计报表表单 - * @Author: wangxiangzhong - * @Date: 2022/12/15 14:25 - */ + * 薪酬统计报表表单 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ @Data @Builder @NoArgsConstructor diff --git a/src/com/engine/salary/report/entity/dto/SubEmployeeTableDTO.java b/src/com/engine/salary/report/entity/dto/SubEmployeeTableDTO.java index 2780664b5..981e30ac2 100644 --- a/src/com/engine/salary/report/entity/dto/SubEmployeeTableDTO.java +++ b/src/com/engine/salary/report/entity/dto/SubEmployeeTableDTO.java @@ -7,12 +7,7 @@ import lombok.experimental.Accessors; import java.io.Serializable; -/** - * @Description: - * @Author: zhangheng - * @CreateDate: 2022/11/8 - * @Version: v1.0 - */ + @Data @Accessors(chain = true) //人员信息过滤中间类") diff --git a/src/com/engine/salary/report/entity/dto/SubTableChartsDTO.java b/src/com/engine/salary/report/entity/dto/SubTableChartsDTO.java index ecb433c36..78b681b01 100644 --- a/src/com/engine/salary/report/entity/dto/SubTableChartsDTO.java +++ b/src/com/engine/salary/report/entity/dto/SubTableChartsDTO.java @@ -7,12 +7,7 @@ import lombok.NoArgsConstructor; import java.util.List; -/** - * @Description: - * @Author: zhangheng - * @CreateDate: 2023/1/12 - * @Version: v1.0 - */ + @Data @Builder @NoArgsConstructor diff --git a/src/com/engine/salary/report/entity/dto/TaxAgentViewDTO.java b/src/com/engine/salary/report/entity/dto/TaxAgentViewDTO.java index 5b9d9a7e3..bd3907290 100644 --- a/src/com/engine/salary/report/entity/dto/TaxAgentViewDTO.java +++ b/src/com/engine/salary/report/entity/dto/TaxAgentViewDTO.java @@ -8,12 +8,7 @@ import lombok.NoArgsConstructor; import java.util.List; -/** - * @Description: - * @Author: zhangheng - * @CreateDate: 2022/11/18 - * @Version: v1.0 - */ + @Data @Builder @NoArgsConstructor diff --git a/src/com/engine/salary/report/entity/param/BaseQueryParam.java b/src/com/engine/salary/report/entity/param/BaseQueryParam.java index f8bd0ccd3..99b9b4981 100644 --- a/src/com/engine/salary/report/entity/param/BaseQueryParam.java +++ b/src/com/engine/salary/report/entity/param/BaseQueryParam.java @@ -4,11 +4,6 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -/** - * @Description: 分页参数 - * @Author: zhangheng - * @Date: 2022/12/06 17:48 - */ @Data @NoArgsConstructor @AllArgsConstructor diff --git a/src/com/engine/salary/report/entity/param/ExportColumn.java b/src/com/engine/salary/report/entity/param/ExportColumn.java index edecda3e0..ef5fa5e57 100644 --- a/src/com/engine/salary/report/entity/param/ExportColumn.java +++ b/src/com/engine/salary/report/entity/param/ExportColumn.java @@ -1,18 +1,11 @@ package com.engine.salary.report.entity.param; -import io.swagger.annotations.ApiModel; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import java.util.List; -/** - * @Description: - * @Author: zhangheng - * @CreateDate: 2022/11/9 - * @Version: v1.0 - */ @Data @NoArgsConstructor @AllArgsConstructor diff --git a/src/com/engine/salary/report/entity/param/ExportCommonParam.java b/src/com/engine/salary/report/entity/param/ExportCommonParam.java index 8d8f403c3..1c441a4cf 100644 --- a/src/com/engine/salary/report/entity/param/ExportCommonParam.java +++ b/src/com/engine/salary/report/entity/param/ExportCommonParam.java @@ -7,12 +7,6 @@ import lombok.NoArgsConstructor; import java.util.List; import java.util.Map; -/** - * @Description: - * @Author: zhangheng - * @CreateDate: 2022/11/9 - * @Version: v1.0 - */ @Data @NoArgsConstructor @AllArgsConstructor diff --git a/src/com/engine/salary/report/entity/param/SalaryAcctEmployeeQueryParam.java b/src/com/engine/salary/report/entity/param/SalaryAcctEmployeeQueryParam.java index 690b31c29..e3f721b2c 100644 --- a/src/com/engine/salary/report/entity/param/SalaryAcctEmployeeQueryParam.java +++ b/src/com/engine/salary/report/entity/param/SalaryAcctEmployeeQueryParam.java @@ -9,10 +9,13 @@ import java.time.YearMonth; import java.util.List; /** - * @Description: 薪酬统计员工明细查询参数 - * @Author: wangxiangzhong - * @Date: 2022/12/16 16:44 - */ + * 薪酬统计员工明细查询参数 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ @Data @Builder @NoArgsConstructor diff --git a/src/com/engine/salary/report/entity/param/SalaryEmployeeQueryParam.java b/src/com/engine/salary/report/entity/param/SalaryEmployeeQueryParam.java index 7458a2da3..195c23d27 100644 --- a/src/com/engine/salary/report/entity/param/SalaryEmployeeQueryParam.java +++ b/src/com/engine/salary/report/entity/param/SalaryEmployeeQueryParam.java @@ -8,11 +8,7 @@ import org.apache.commons.lang3.StringUtils; import java.util.Collection; /** - * @description: 人员查询条件 - * @author: xiajun - * @modified By: xiajun - * @date: 2022/5/10 15:12 - * @version:v1.0 + * 人员查询条件 */ @Data @Accessors(chain = true) diff --git a/src/com/engine/salary/report/entity/param/SalaryStatisticsDimensionQueryParam.java b/src/com/engine/salary/report/entity/param/SalaryStatisticsDimensionQueryParam.java index b5b9efb80..fd55e7b49 100644 --- a/src/com/engine/salary/report/entity/param/SalaryStatisticsDimensionQueryParam.java +++ b/src/com/engine/salary/report/entity/param/SalaryStatisticsDimensionQueryParam.java @@ -7,10 +7,13 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @Description: 薪酬统计维度查询参数 - * @Author: wangxiangzhong - * @Date: 2022/12/15 11:45 - */ + * 薪酬统计维度查询参数 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ @Data @Builder @NoArgsConstructor diff --git a/src/com/engine/salary/report/entity/param/SalaryStatisticsDimensionSaveParam.java b/src/com/engine/salary/report/entity/param/SalaryStatisticsDimensionSaveParam.java index 450063350..3de5f955b 100644 --- a/src/com/engine/salary/report/entity/param/SalaryStatisticsDimensionSaveParam.java +++ b/src/com/engine/salary/report/entity/param/SalaryStatisticsDimensionSaveParam.java @@ -14,10 +14,13 @@ import java.util.List; import java.util.Objects; /** - * @Description: 薪酬统计维度保存参数 - * @Author: wangxiangzhong - * @Date: 2022/12/16 9:09 - */ + * 薪酬统计维度保存参数 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ @Data @Builder @NoArgsConstructor diff --git a/src/com/engine/salary/report/entity/param/SalaryStatisticsEmployeeQueryParam.java b/src/com/engine/salary/report/entity/param/SalaryStatisticsEmployeeQueryParam.java index a9dc5fc2a..ff1afbdb2 100644 --- a/src/com/engine/salary/report/entity/param/SalaryStatisticsEmployeeQueryParam.java +++ b/src/com/engine/salary/report/entity/param/SalaryStatisticsEmployeeQueryParam.java @@ -10,10 +10,13 @@ import java.time.YearMonth; import java.util.List; /** - * @Description: 薪酬统计员工明细查询参数 - * @Author: wangxiangzhong - * @Date: 2022/12/16 16:44 - */ + * 薪酬统计员工明细查询参数 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ @Data @Builder @NoArgsConstructor diff --git a/src/com/engine/salary/report/entity/param/SalaryStatisticsItemSaveParam.java b/src/com/engine/salary/report/entity/param/SalaryStatisticsItemSaveParam.java index ef6df5126..77803d374 100644 --- a/src/com/engine/salary/report/entity/param/SalaryStatisticsItemSaveParam.java +++ b/src/com/engine/salary/report/entity/param/SalaryStatisticsItemSaveParam.java @@ -9,10 +9,13 @@ import lombok.NoArgsConstructor; import java.util.List; /** - * @Description: 薪酬统计报表自定义统计项目保存参数 - * @Author: wangxiangzhong - * @Date: 2022/12/21 9:42 - */ + * 薪酬统计报表自定义统计项目保存参数 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ @Data @Builder @NoArgsConstructor diff --git a/src/com/engine/salary/report/entity/param/SalaryStatisticsReportDataQueryParam.java b/src/com/engine/salary/report/entity/param/SalaryStatisticsReportDataQueryParam.java index a8c0171b6..121d4183d 100644 --- a/src/com/engine/salary/report/entity/param/SalaryStatisticsReportDataQueryParam.java +++ b/src/com/engine/salary/report/entity/param/SalaryStatisticsReportDataQueryParam.java @@ -10,10 +10,13 @@ import java.util.Date; import java.util.List; /** - * @Description: 薪酬统计报表数据查询参数 - * @Author: wangxiangzhong - * @Date: 2022/12/16 9:09 - */ + * 薪酬统计报表数据查询参数 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ @Data @Builder @NoArgsConstructor diff --git a/src/com/engine/salary/report/entity/param/SalaryStatisticsReportQueryParam.java b/src/com/engine/salary/report/entity/param/SalaryStatisticsReportQueryParam.java index 2ad284cb5..1fa43d8f9 100644 --- a/src/com/engine/salary/report/entity/param/SalaryStatisticsReportQueryParam.java +++ b/src/com/engine/salary/report/entity/param/SalaryStatisticsReportQueryParam.java @@ -6,10 +6,13 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @Description: 薪资统计报表查询参数 - * @Author: wangxiangzhong - * @Date: 2023/1/11 9:54 - */ + * 薪资统计报表查询参数 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ @Data @Builder @NoArgsConstructor diff --git a/src/com/engine/salary/report/entity/param/SalaryStatisticsReportSaveParam.java b/src/com/engine/salary/report/entity/param/SalaryStatisticsReportSaveParam.java index 0a84fe6c3..78f582a46 100644 --- a/src/com/engine/salary/report/entity/param/SalaryStatisticsReportSaveParam.java +++ b/src/com/engine/salary/report/entity/param/SalaryStatisticsReportSaveParam.java @@ -12,10 +12,13 @@ import org.apache.commons.lang3.StringUtils; import java.util.List; /** - * @Description: 薪酬统计报表保存参数 - * @Author: wangxiangzhong - * @Date: 2022/12/16 9:09 - */ + * 薪酬统计报表保存参数 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ @Data @Builder @NoArgsConstructor diff --git a/src/com/engine/salary/report/entity/param/SubTableItemParam.java b/src/com/engine/salary/report/entity/param/SubTableItemParam.java index 6cfec3f3c..8bb433931 100644 --- a/src/com/engine/salary/report/entity/param/SubTableItemParam.java +++ b/src/com/engine/salary/report/entity/param/SubTableItemParam.java @@ -4,12 +4,6 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -/** - * @Description: - * @Author: zhangheng - * @CreateDate: 2022/10/31 - * @Version: v1.0 - */ @Data @NoArgsConstructor @AllArgsConstructor diff --git a/src/com/engine/salary/report/entity/param/SubTableParam.java b/src/com/engine/salary/report/entity/param/SubTableParam.java index 8b2d8e80d..996d3aeea 100644 --- a/src/com/engine/salary/report/entity/param/SubTableParam.java +++ b/src/com/engine/salary/report/entity/param/SubTableParam.java @@ -4,12 +4,6 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -/** - * @Description: - * @Author: zhangheng - * @CreateDate: 2022/10/31 - * @Version: v1.0 - */ @Data @NoArgsConstructor @AllArgsConstructor diff --git a/src/com/engine/salary/report/entity/param/TaxAgentQueryParam.java b/src/com/engine/salary/report/entity/param/TaxAgentQueryParam.java index d78bab65d..253e5f81a 100644 --- a/src/com/engine/salary/report/entity/param/TaxAgentQueryParam.java +++ b/src/com/engine/salary/report/entity/param/TaxAgentQueryParam.java @@ -8,10 +8,13 @@ import lombok.NoArgsConstructor; import java.util.Collection; /** - * @Description: 个税扣缴义务人查询参数 - * @Author: wangxiangzhong - * @Date: 2021/10/29 15:03 - */ + * 个税扣缴义务人查询参数 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ @Data @Builder @NoArgsConstructor diff --git a/src/com/engine/salary/report/entity/po/SalaryStatisticsDimensionPO.java b/src/com/engine/salary/report/entity/po/SalaryStatisticsDimensionPO.java index dd3d4dd03..16d7b5136 100644 --- a/src/com/engine/salary/report/entity/po/SalaryStatisticsDimensionPO.java +++ b/src/com/engine/salary/report/entity/po/SalaryStatisticsDimensionPO.java @@ -11,10 +11,13 @@ import java.util.Collection; import java.util.Date; /** - * @Description: 薪酬统计维度表 - * @Author: wangxiangzhong - * @Date: 2022/12/15 11:23 - */ + * 薪酬统计维度表 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ @Data @Builder @NoArgsConstructor diff --git a/src/com/engine/salary/report/entity/po/SalaryStatisticsEChartsSettingPO.java b/src/com/engine/salary/report/entity/po/SalaryStatisticsEChartsSettingPO.java index 0ffb3d7e8..9a39e2771 100644 --- a/src/com/engine/salary/report/entity/po/SalaryStatisticsEChartsSettingPO.java +++ b/src/com/engine/salary/report/entity/po/SalaryStatisticsEChartsSettingPO.java @@ -9,10 +9,13 @@ import java.util.Collection; import java.util.Date; /** - * @Description: 薪酬统计图表 - * @Author: wangxiangzhong - * @Date: 2023/1/31 15:25 - */ + * 薪酬统计图表 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ @Data @Builder @NoArgsConstructor diff --git a/src/com/engine/salary/report/entity/po/SalaryStatisticsItemPO.java b/src/com/engine/salary/report/entity/po/SalaryStatisticsItemPO.java index f42f74fb2..5343ae9b7 100644 --- a/src/com/engine/salary/report/entity/po/SalaryStatisticsItemPO.java +++ b/src/com/engine/salary/report/entity/po/SalaryStatisticsItemPO.java @@ -10,12 +10,6 @@ import java.io.Serializable; import java.util.Collection; import java.util.Date; -/** - * @Description: - * @Author: wangxiangzhong - * @CreateDate: 2022/12/20 - * @Version: v1.0 - */ @Data @Builder @NoArgsConstructor diff --git a/src/com/engine/salary/report/entity/po/SalaryStatisticsReportPO.java b/src/com/engine/salary/report/entity/po/SalaryStatisticsReportPO.java index 8d371dc68..a465e7add 100644 --- a/src/com/engine/salary/report/entity/po/SalaryStatisticsReportPO.java +++ b/src/com/engine/salary/report/entity/po/SalaryStatisticsReportPO.java @@ -10,10 +10,13 @@ import java.util.Collection; import java.util.Date; /** - * @Description: 薪酬统计报表 - * @Author: wangxiangzhong - * @Date: 2022/12/15 11:23 - */ + * 薪酬统计报表 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ @Data @Builder @NoArgsConstructor diff --git a/src/com/engine/salary/report/entity/po/SubTableItemPO.java b/src/com/engine/salary/report/entity/po/SubTableItemPO.java index 26a5c309f..481816049 100644 --- a/src/com/engine/salary/report/entity/po/SubTableItemPO.java +++ b/src/com/engine/salary/report/entity/po/SubTableItemPO.java @@ -7,12 +7,6 @@ import lombok.NoArgsConstructor; import java.time.LocalDateTime; -/** - * @Description: - * @Author: zhangheng - * @CreateDate: 2022/10/31 - * @Version: v1.0 - */ @Data @Builder @NoArgsConstructor diff --git a/src/com/engine/salary/report/enums/DataTypeEnum.java b/src/com/engine/salary/report/enums/DataTypeEnum.java index 47dd42272..f3b90c113 100644 --- a/src/com/engine/salary/report/enums/DataTypeEnum.java +++ b/src/com/engine/salary/report/enums/DataTypeEnum.java @@ -1,11 +1,5 @@ package com.engine.salary.report.enums; -/** - * @Description: - * @Author: zhangheng - * @CreateDate: 2021/11/19 14:18 - * @Version: v1.0 - */ public enum DataTypeEnum { CUSTOM(0, "自定义"), diff --git a/src/com/engine/salary/report/enums/ExtEmployeeTypeEnum.java b/src/com/engine/salary/report/enums/ExtEmployeeTypeEnum.java index 355b9fde4..f19091be2 100644 --- a/src/com/engine/salary/report/enums/ExtEmployeeTypeEnum.java +++ b/src/com/engine/salary/report/enums/ExtEmployeeTypeEnum.java @@ -1,11 +1,5 @@ package com.engine.salary.report.enums; -/** - * @Description: - * @Author: zhangheng - * @CreateDate: 2022/4/14 17:28 - * @Version: v1.0 - */ public enum ExtEmployeeTypeEnum { NO(1, "不是挂靠人员"), YES(2, "是挂靠人员"); diff --git a/src/com/engine/salary/report/enums/IncomeCategoryEnum.java b/src/com/engine/salary/report/enums/IncomeCategoryEnum.java index 981f4aa78..8e47229eb 100644 --- a/src/com/engine/salary/report/enums/IncomeCategoryEnum.java +++ b/src/com/engine/salary/report/enums/IncomeCategoryEnum.java @@ -9,13 +9,15 @@ import java.util.Collections; import java.util.List; import java.util.Objects; + /** - * @description: 应税项目 - * @author: xiajun - * @modified By: xiajun - * @date: Created in 12/18/21 3:20 PM - * @version:v1.0 - */ + * 应税项目 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ public enum IncomeCategoryEnum implements BaseEnum { WAGES_AND_SALARIES(1, "正常工资薪金", 160487), diff --git a/src/com/engine/salary/report/enums/OperateTypeEnum.java b/src/com/engine/salary/report/enums/OperateTypeEnum.java index 6026dd861..d8e14b304 100644 --- a/src/com/engine/salary/report/enums/OperateTypeEnum.java +++ b/src/com/engine/salary/report/enums/OperateTypeEnum.java @@ -1,9 +1,7 @@ package com.engine.salary.report.enums; /** - * @Description: 操作类型 - * @Author: wangxiangzhong - * @Date: 2021/11/1 13:17 + * 操作类型 */ public enum OperateTypeEnum { diff --git a/src/com/engine/salary/report/enums/PaymentScopeEnum.java b/src/com/engine/salary/report/enums/PaymentScopeEnum.java index ee129ba95..1b86fc337 100644 --- a/src/com/engine/salary/report/enums/PaymentScopeEnum.java +++ b/src/com/engine/salary/report/enums/PaymentScopeEnum.java @@ -1,11 +1,5 @@ package com.engine.salary.report.enums; -/** - * @Description: - * @Author: zhangheng - * @CreateDate: 2021/11/15 14:54 - * @Version: v1.0 - */ public enum PaymentScopeEnum { SCOPE_COMPANY(1, "公司", 87158), SCOPE_PERSON(2, "个人", 87159); diff --git a/src/com/engine/salary/report/enums/PaymentStatusEnum.java b/src/com/engine/salary/report/enums/PaymentStatusEnum.java index b701bb642..75975a150 100644 --- a/src/com/engine/salary/report/enums/PaymentStatusEnum.java +++ b/src/com/engine/salary/report/enums/PaymentStatusEnum.java @@ -1,12 +1,6 @@ package com.engine.salary.report.enums; -/** - * @Description: - * @Author: zhangheng - * @CreateDate: 2021/12/6 9:32 - * @Version: v1.0 - */ public enum PaymentStatusEnum { COMMON(0, "正常缴纳", 92265), diff --git a/src/com/engine/salary/report/enums/SalaryDataTypeEnum.java b/src/com/engine/salary/report/enums/SalaryDataTypeEnum.java index c7e41af81..db655d970 100644 --- a/src/com/engine/salary/report/enums/SalaryDataTypeEnum.java +++ b/src/com/engine/salary/report/enums/SalaryDataTypeEnum.java @@ -5,12 +5,13 @@ import com.engine.salary.enums.BaseEnum; import java.util.Objects; /** - * @description: 薪资项目的字段类型 - * @author: xiajun - * @modified By: xiajun - * @date: 2022/3/10 17:16 - * @version:v1.0 - */ + * 薪资项目的字段类型 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ public enum SalaryDataTypeEnum implements BaseEnum { STRING("string", "字符", 105093), NUMBER("number", "数值", 87625), diff --git a/src/com/engine/salary/report/enums/SalaryStatisticsDimensionTypeEnum.java b/src/com/engine/salary/report/enums/SalaryStatisticsDimensionTypeEnum.java index 5eaf9d942..93a6a0aba 100644 --- a/src/com/engine/salary/report/enums/SalaryStatisticsDimensionTypeEnum.java +++ b/src/com/engine/salary/report/enums/SalaryStatisticsDimensionTypeEnum.java @@ -7,10 +7,13 @@ import java.util.Arrays; import java.util.Optional; /** - * @Description: 薪酬统计维度类型 - * @Author: wangxiangzhong - * @Date: 2022/12/15 11:28 - */ + * 薪酬统计维度类型 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ public enum SalaryStatisticsDimensionTypeEnum implements BaseEnum { QUALITATIVE("QUALITATIVE", "定性", 161086), RATION_GROUP_SPACING("RATION_GROUP_SPACING", "定量-组距式分组", 161087), diff --git a/src/com/engine/salary/report/enums/SalarySystemTypeEnum.java b/src/com/engine/salary/report/enums/SalarySystemTypeEnum.java index a9e25eb7a..7ebb9c1a0 100644 --- a/src/com/engine/salary/report/enums/SalarySystemTypeEnum.java +++ b/src/com/engine/salary/report/enums/SalarySystemTypeEnum.java @@ -6,12 +6,13 @@ import com.engine.salary.enums.BaseEnum; import java.util.Objects; /** - * @description: 税率表表单类型 - * @author: xiajun - * @modified By: xiajun - * @date: Created in 10/19/21 4:05 PM - * @version:v1.0 - */ + * 税率表表单类型 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ public enum SalarySystemTypeEnum implements BaseEnum { CUSTOM(0, "自定义表单", 83993), diff --git a/src/com/engine/salary/report/enums/TaxAgentPermissionConstant.java b/src/com/engine/salary/report/enums/TaxAgentPermissionConstant.java index 7699272b3..e997b63dc 100644 --- a/src/com/engine/salary/report/enums/TaxAgentPermissionConstant.java +++ b/src/com/engine/salary/report/enums/TaxAgentPermissionConstant.java @@ -1,9 +1,7 @@ package com.engine.salary.report.enums; /** - * @Description: 个税扣缴义务人分权 - * @Author: wangxiangzhong - * @Date: 2022/5/2 10:09 + * 个税扣缴义务人分权 */ public class TaxAgentPermissionConstant { diff --git a/src/com/engine/salary/report/enums/TaxAgentRoleTypeEnum.java b/src/com/engine/salary/report/enums/TaxAgentRoleTypeEnum.java index 8c08f5f99..db585ebc6 100644 --- a/src/com/engine/salary/report/enums/TaxAgentRoleTypeEnum.java +++ b/src/com/engine/salary/report/enums/TaxAgentRoleTypeEnum.java @@ -1,10 +1,13 @@ package com.engine.salary.report.enums; /** - * @Description: 个税扣缴义务人角色类型 - * @Author: wangxiangzhong - * @Date: 2022-04-22 14:37 - */ + * 个税扣缴义务人角色类型 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ public enum TaxAgentRoleTypeEnum { CHIEF(0, "总管理员"), diff --git a/src/com/engine/salary/report/service/SalaryStatisticsDimensionService.java b/src/com/engine/salary/report/service/SalaryStatisticsDimensionService.java index 1e8a83e64..eb1619b08 100644 --- a/src/com/engine/salary/report/service/SalaryStatisticsDimensionService.java +++ b/src/com/engine/salary/report/service/SalaryStatisticsDimensionService.java @@ -9,11 +9,15 @@ import java.util.Collection; import java.util.List; import java.util.Map; + /** - * @Description: 薪酬统计维度 - * @Author: wangxiangzhong - * @Date: 2022/12/15 14:09 - */ + * 薪酬统计维度 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ public interface SalaryStatisticsDimensionService { /** diff --git a/src/com/engine/salary/report/service/SalaryStatisticsItemService.java b/src/com/engine/salary/report/service/SalaryStatisticsItemService.java index c50786ee6..a576a75c7 100644 --- a/src/com/engine/salary/report/service/SalaryStatisticsItemService.java +++ b/src/com/engine/salary/report/service/SalaryStatisticsItemService.java @@ -7,10 +7,13 @@ import java.util.Collection; import java.util.List; /** - * @Description: 薪酬报表自定义统计项目 - * @Author: wangxiangzhong - * @Date: 2022/12/19 10:09 - */ + * 薪酬报表自定义统计项目 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ public interface SalaryStatisticsItemService { /** diff --git a/src/com/engine/salary/report/service/SalaryStatisticsReportService.java b/src/com/engine/salary/report/service/SalaryStatisticsReportService.java index 5e73b95e6..5b1e7a146 100644 --- a/src/com/engine/salary/report/service/SalaryStatisticsReportService.java +++ b/src/com/engine/salary/report/service/SalaryStatisticsReportService.java @@ -13,10 +13,13 @@ import java.util.List; import java.util.Map; /** - * @Description: 薪酬统计报表 - * @Author: wangxiangzhong - * @Date: 2022/12/15 14:09 - */ + * 薪酬报表自定义统计项目 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ public interface SalaryStatisticsReportService { /** diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsDimensionServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsDimensionServiceImpl.java index 63dd95d1d..10008f0b1 100644 --- a/src/com/engine/salary/report/service/impl/SalaryStatisticsDimensionServiceImpl.java +++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsDimensionServiceImpl.java @@ -29,10 +29,13 @@ import java.util.*; import java.util.stream.Collectors; /** - * @Description: 薪酬统计维度 - * @Author: wangxiangzhong - * @Date: 2022/12/15 14:09 - */ + * 薪酬统计维度 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ public class SalaryStatisticsDimensionServiceImpl extends Service implements SalaryStatisticsDimensionService { private SalaryStatisticsDimensionMapper getSalaryStatisticsDimensionMapper() { diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsItemServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsItemServiceImpl.java index fb4077258..711d62428 100644 --- a/src/com/engine/salary/report/service/impl/SalaryStatisticsItemServiceImpl.java +++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsItemServiceImpl.java @@ -21,10 +21,13 @@ import java.util.*; import java.util.stream.Collectors; /** - * @Description: 薪酬报表自定义统计项目 - * @Author: wangxiangzhong - * @Date: 2022/12/19 10:10 - */ + * 薪酬报表自定义统计项目 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ public class SalaryStatisticsItemServiceImpl extends Service implements SalaryStatisticsItemService { diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java index 813b57ef7..302885e35 100644 --- a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java +++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java @@ -51,10 +51,13 @@ import java.util.*; import java.util.stream.Collectors; /** - * @Description: 薪酬统计报表 - * @Author: wangxiangzhong - * @Date: 2022/12/15 14:09 - */ + * 薪酬统计报表 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ public class SalaryStatisticsReportServiceImpl extends Service implements SalaryStatisticsReportService { private static final Logger log = LoggerFactory.getLogger(SalaryStatisticsReportServiceImpl.class); diff --git a/src/com/engine/salary/report/service/impl/SubTableExportServiceImpl.java b/src/com/engine/salary/report/service/impl/SubTableExportServiceImpl.java index 446881b88..d3505a5ba 100644 --- a/src/com/engine/salary/report/service/impl/SubTableExportServiceImpl.java +++ b/src/com/engine/salary/report/service/impl/SubTableExportServiceImpl.java @@ -3,12 +3,7 @@ package com.engine.salary.report.service.impl; import com.engine.core.impl.Service; import com.engine.salary.report.service.SubTableExportService; -/** - * @Description: - * @Author: zhangheng - * @CreateDate: 2022/11/9 - * @Version: v1.0 - */ + public class SubTableExportServiceImpl extends Service implements SubTableExportService { // private Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/src/com/engine/salary/report/util/ReportDataUtil.java b/src/com/engine/salary/report/util/ReportDataUtil.java index 55a9bb769..16c8f56f4 100644 --- a/src/com/engine/salary/report/util/ReportDataUtil.java +++ b/src/com/engine/salary/report/util/ReportDataUtil.java @@ -6,12 +6,6 @@ import java.math.BigDecimal; import java.text.DecimalFormat; import java.util.regex.Pattern; -/** - * @Description: - * @Author: zhangheng - * @CreateDate: 2022/11/9 - * @Version: v1.0 - */ public class ReportDataUtil { private static final DecimalFormat decimalFormat = new DecimalFormat("#,##0.00"); diff --git a/src/com/engine/salary/report/util/ReportTimeUtil.java b/src/com/engine/salary/report/util/ReportTimeUtil.java index 21351ee87..7a3229f77 100644 --- a/src/com/engine/salary/report/util/ReportTimeUtil.java +++ b/src/com/engine/salary/report/util/ReportTimeUtil.java @@ -12,12 +12,6 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; -/** - * @Description: - * @Author: zhangheng - * @CreateDate: 2022/11/8 - * @Version: v1.0 - */ @Slf4j public class ReportTimeUtil { private static final DateTimeFormatter YEAR_MONTH = DateTimeFormatter.ofPattern("yyyy-MM"); diff --git a/src/com/engine/salary/report/web/SalaryStatisticsDimensionController.java b/src/com/engine/salary/report/web/SalaryStatisticsDimensionController.java index df2d61b3e..e0f26bb8d 100644 --- a/src/com/engine/salary/report/web/SalaryStatisticsDimensionController.java +++ b/src/com/engine/salary/report/web/SalaryStatisticsDimensionController.java @@ -22,10 +22,13 @@ import java.util.List; import java.util.Map; /** - * @Description: 薪酬统计维度 - * @Author: wangxiangzhong - * @Date: 2022/12/15 11:40 - */ + * 薪酬统计维度 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ public class SalaryStatisticsDimensionController { private SalaryStatisticsDimensionWrapper getSalaryStatisticsDimensionWrapper(User user) { diff --git a/src/com/engine/salary/report/web/SalaryStatisticsItemController.java b/src/com/engine/salary/report/web/SalaryStatisticsItemController.java index 81384cffe..0c8b1ee95 100644 --- a/src/com/engine/salary/report/web/SalaryStatisticsItemController.java +++ b/src/com/engine/salary/report/web/SalaryStatisticsItemController.java @@ -19,10 +19,13 @@ import java.util.List; import java.util.Map; /** - * @Description: 薪酬报表统计项目 - * @Author: wangxiangzhong - * @Date: 2022/12/15 11:40 - */ + * 薪酬报表统计项目 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ public class SalaryStatisticsItemController { private SalaryStatisticsItemWrapper getSalaryStatisticsItemWrapper(User user) { diff --git a/src/com/engine/salary/report/wrapper/SalaryStatisticsDimensionWrapper.java b/src/com/engine/salary/report/wrapper/SalaryStatisticsDimensionWrapper.java index fe1ad13ec..38046076e 100644 --- a/src/com/engine/salary/report/wrapper/SalaryStatisticsDimensionWrapper.java +++ b/src/com/engine/salary/report/wrapper/SalaryStatisticsDimensionWrapper.java @@ -23,18 +23,19 @@ import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.SalaryPageUtil; import com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; -import org.springframework.stereotype.Component; import weaver.hrm.User; import java.util.*; import java.util.stream.Collectors; /** - * @Description: 薪酬统计维度 - * @Author: wangxiangzhong - * @Date: 2022/12/15 13:46 - */ -@Component + * 薪酬统计维度 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ public class SalaryStatisticsDimensionWrapper extends Service { diff --git a/src/com/engine/salary/report/wrapper/SalaryStatisticsItemWrapper.java b/src/com/engine/salary/report/wrapper/SalaryStatisticsItemWrapper.java index 10fb01cff..b424cc43e 100644 --- a/src/com/engine/salary/report/wrapper/SalaryStatisticsItemWrapper.java +++ b/src/com/engine/salary/report/wrapper/SalaryStatisticsItemWrapper.java @@ -17,18 +17,19 @@ import com.engine.salary.util.SalaryAssert; import com.engine.salary.util.SalaryEntityUtil; import com.engine.salary.util.SalaryI18nUtil; import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Component; import weaver.hrm.User; import java.util.*; import java.util.stream.Collectors; /** - * @Description: 薪酬报表统计项目 - * @Author: wangxiangzhong - * @Date: 2022/12/19 10:49 - */ -@Component + * 薪酬报表统计项目 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ public class SalaryStatisticsItemWrapper extends Service { private SalaryStatisticsItemService getSalaryStatisticsItemService(User user) { diff --git a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java index bd1d032e5..de401e667 100644 --- a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java +++ b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java @@ -31,18 +31,19 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.springframework.stereotype.Component; import weaver.hrm.User; import java.util.*; import java.util.stream.Collectors; /** - * @Description: 薪酬统计维度 - * @Author: wangxiangzhong - * @Date: 2022/12/15 13:46 - */ -@Component + * 薪酬统计维度 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ public class SalaryStatisticsReportWrapper extends Service { private static final String conditionId = "salaryStatisticsReportSearchCondition";