From e81937c4ddd2735ed599d8a2c6cb34e0a99713b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 7 Mar 2024 11:45:26 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E5=8E=9F=E5=85=88=E7=9A=84=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/sqlupgrade/DM/sql202304270203.sql | 74 +------------------ resource/sqlupgrade/GS/sql202304270203.sql | 74 +------------------ resource/sqlupgrade/JC/sql202304270203.sql | 74 +------------------ resource/sqlupgrade/Mysql/sql202304270203.sql | 70 ------------------ .../sqlupgrade/Oracle/sql202304270203.sql | 70 ------------------ resource/sqlupgrade/PG/sql202304270203.sql | 71 ------------------ .../sqlupgrade/SQLServer/sql202304270203.sql | 71 ------------------ resource/sqlupgrade/ST/sql202304270203.sql | 71 ------------------ resource/wiki/薪酬还原脚本.sql | 6 -- 9 files changed, 6 insertions(+), 575 deletions(-) diff --git a/resource/sqlupgrade/DM/sql202304270203.sql b/resource/sqlupgrade/DM/sql202304270203.sql index 6508455fd..65af1f28f 100644 --- a/resource/sqlupgrade/DM/sql202304270203.sql +++ b/resource/sqlupgrade/DM/sql202304270203.sql @@ -157,77 +157,6 @@ 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); / @@ -241,4 +170,5 @@ 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/GS/sql202304270203.sql b/resource/sqlupgrade/GS/sql202304270203.sql index 6508455fd..65af1f28f 100644 --- a/resource/sqlupgrade/GS/sql202304270203.sql +++ b/resource/sqlupgrade/GS/sql202304270203.sql @@ -157,77 +157,6 @@ 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); / @@ -241,4 +170,5 @@ 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/JC/sql202304270203.sql b/resource/sqlupgrade/JC/sql202304270203.sql index 6508455fd..65af1f28f 100644 --- a/resource/sqlupgrade/JC/sql202304270203.sql +++ b/resource/sqlupgrade/JC/sql202304270203.sql @@ -157,77 +157,6 @@ 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); / @@ -241,4 +170,5 @@ 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/Mysql/sql202304270203.sql b/resource/sqlupgrade/Mysql/sql202304270203.sql index 2aab0b67f..a8f239335 100644 --- a/resource/sqlupgrade/Mysql/sql202304270203.sql +++ b/resource/sqlupgrade/Mysql/sql202304270203.sql @@ -157,76 +157,6 @@ 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) ; diff --git a/resource/sqlupgrade/Oracle/sql202304270203.sql b/resource/sqlupgrade/Oracle/sql202304270203.sql index 620dd24cb..f15ad91a6 100644 --- a/resource/sqlupgrade/Oracle/sql202304270203.sql +++ b/resource/sqlupgrade/Oracle/sql202304270203.sql @@ -157,76 +157,6 @@ 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) / diff --git a/resource/sqlupgrade/PG/sql202304270203.sql b/resource/sqlupgrade/PG/sql202304270203.sql index 7cbcc5a56..e610687b7 100644 --- a/resource/sqlupgrade/PG/sql202304270203.sql +++ b/resource/sqlupgrade/PG/sql202304270203.sql @@ -162,77 +162,6 @@ alter table hrsa_salary_stats_dim alter dim_type TYPE varchar(30) alter table hrsa_salary_stats_report alter income_category_setting TYPE varchar(1000) ; -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 NOT NULL DEFAULT 0 -) -; - -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 NOT NULL DEFAULT -1 , - 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 NOT NULL DEFAULT 0 , - mainruntime bigint NOT NULL DEFAULT 0 , - 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 NOT NULL DEFAULT 0 , - old_link_id bigint NOT NULL DEFAULT 0 -) -; - alter table hrsa_salary_stats_report add remark varchar(100) ; diff --git a/resource/sqlupgrade/SQLServer/sql202304270203.sql b/resource/sqlupgrade/SQLServer/sql202304270203.sql index 953eadd43..52954de04 100644 --- a/resource/sqlupgrade/SQLServer/sql202304270203.sql +++ b/resource/sqlupgrade/SQLServer/sql202304270203.sql @@ -157,77 +157,6 @@ 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 diff --git a/resource/sqlupgrade/ST/sql202304270203.sql b/resource/sqlupgrade/ST/sql202304270203.sql index 21b752ab7..65af1f28f 100644 --- a/resource/sqlupgrade/ST/sql202304270203.sql +++ b/resource/sqlupgrade/ST/sql202304270203.sql @@ -157,77 +157,6 @@ 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); / diff --git a/resource/wiki/薪酬还原脚本.sql b/resource/wiki/薪酬还原脚本.sql index 4ad486304..cf29ff247 100644 --- a/resource/wiki/薪酬还原脚本.sql +++ b/resource/wiki/薪酬还原脚本.sql @@ -167,12 +167,6 @@ delete from hrsa_charts_setting where 1=1 delete from hrsa_salary_echarts_setting where 1=1 ; -delete from hrsa_statreportlogs_detail where 1=1 -; - -delete from hrsa_statreportlogs where 1=1 -; - delete from hrsa_salary_bill_watermark where 1=1 ; From 729c6c7d3aeffcda1b8e291c14a612dd91b3fe8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 7 Mar 2024 14:12:16 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A4=84=E7=90=86=E7=A9=BA=E6=8C=87?= =?UTF-8?q?=E9=92=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/taxdeclaration/bo/TaxDeclarationDetailBO.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationDetailBO.java b/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationDetailBO.java index 81010fb7b..0fe5a0815 100644 --- a/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationDetailBO.java +++ b/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationDetailBO.java @@ -13,6 +13,7 @@ import com.engine.salary.util.SalaryI18nUtil; import com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import weaver.general.Util; import java.util.*; @@ -166,9 +167,9 @@ public class TaxDeclarationDetailBO { .setAnnualTaxSavings(fieldCodeKeyFieldValueMap.get(TaxDeclarationDataIndexConstant.ANNUAL_TAX_SAVINGS)) .setAnnualRemark(fieldCodeKeyFieldValueMap.get(TaxDeclarationDataIndexConstant.ANNUAL_REMARK)); if (dto.getEmployeeType() == null || Objects.equals(dto.getEmployeeType(), EmployeeTypeEnum.ORGANIZATION.getValue())) { - DataCollectionEmployee simpleEmployee = simpleEmployeeMap.get(dto.getEmployeeId()); - taxDeclarationLaborListDTO.setJobNum(simpleEmployee.getWorkcode()) - .setUsername(simpleEmployee.getUsername()) + DataCollectionEmployee simpleEmployee = simpleEmployeeMap.getOrDefault(dto.getEmployeeId(),new DataCollectionEmployee()); + taxDeclarationLaborListDTO.setJobNum(Util.null2String(simpleEmployee.getWorkcode())) + .setUsername(Util.null2String(simpleEmployee.getUsername())) .setCardNum(Optional.ofNullable(simpleEmployee).map(DataCollectionEmployee::getIdNo).orElse(StringUtils.EMPTY)); } else { From 17428c621e748afcb4be055d6ebce3eb1189c4eb Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Thu, 7 Mar 2024 14:23:12 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=9D=9E=E7=B3=BB=E7=BB=9F=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E8=8C=83=E5=9B=B4=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/TaxAgentManageRangeServiceImpl.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java index 202686434..a3c7fbbaf 100644 --- a/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java @@ -464,6 +464,15 @@ public class TaxAgentManageRangeServiceImpl extends Service implements TaxAgentM .build(); getTaxAgentExtRangeMapper().insertIgnoreNull(po); + // 记录日志 + String name = taxAgent.getName() + "_" + saveParam.getTaxAgentId(); + SalaryLoggerUtil.recordAddSingleLog(SalaryElogConfig.taxAgentLoggerTemplate, + taxAgent.getId(), + name, + SalaryI18nUtil.getI18nLabel(0, "新增非系统人员范围"), + SalaryI18nUtil.getI18nLabel(0, "新增非系统人员范围") + name, + po, + user); }); List oldEmpList = getExtEmpService(user).getEmployeeByIds(oldIds); employees.addAll(oldEmpList); @@ -481,6 +490,7 @@ public class TaxAgentManageRangeServiceImpl extends Service implements TaxAgentM syncLocalExtEmp(taxAgentId, finalEmployees); }); } + } private List listAllExtBytaxAgentId(Long taxAgentId) { @@ -510,6 +520,14 @@ public class TaxAgentManageRangeServiceImpl extends Service implements TaxAgentM } // 删除管理范围 getTaxAgentExtRangeMapper().deleteByIds(ids); + // 记录日志 + SalaryLoggerUtil.recordDeleteSingleLog(SalaryElogConfig.taxAgentLoggerTemplate, + taxAgentManageRanges.get(0).getTaxAgentId(), + ids.toString(), + SalaryI18nUtil.getI18nLabel(0, "删除非系统人员范围"), + SalaryI18nUtil.getI18nLabel(0, "删除非系统人员范围") + ids.toString(), + null, + user); } private void syncLocalExtEmp(Long taxAgentId, List allSalaryEmployees) { From 8516a23bba2f5ba9c517c11643dcac1560f48b07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 7 Mar 2024 21:12:09 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E6=8A=A5=E9=80=81=E5=88=B7=E6=96=B0=E9=80=BB=E8=BE=91=20?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E4=BA=BA=E5=91=98=E4=BC=9A=E9=9B=86=E6=88=90?= =?UTF-8?q?=E4=B8=8A=E6=9C=88=E6=89=80=E6=9C=89=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../employeedeclare/bo/EmployeeDeclareRefresh.java | 6 +++--- .../param/EmployeeDeclareAddListQueryParam.java | 2 ++ .../service/impl/EmployeeDeclareServiceImpl.java | 13 +++++++------ .../impl/SpecialAddDeductionServiceImpl.java | 9 ++++++--- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/com/engine/salary/entity/employeedeclare/bo/EmployeeDeclareRefresh.java b/src/com/engine/salary/entity/employeedeclare/bo/EmployeeDeclareRefresh.java index 3b195d0d0..cccd8520e 100644 --- a/src/com/engine/salary/entity/employeedeclare/bo/EmployeeDeclareRefresh.java +++ b/src/com/engine/salary/entity/employeedeclare/bo/EmployeeDeclareRefresh.java @@ -40,9 +40,9 @@ public class EmployeeDeclareRefresh { // 对已有人员处理「人员状态」、「离职日期」、「任职受雇从业类型」 for (EmployeeDeclarePO employeeDeclare : dto.getEmployeeDeclares()) { SalaryArchivePO salaryArchive = salaryArchiveMap.get(employeeDeclare.getEmployeeId()); - if (salaryArchive != null && - (Objects.equals(salaryArchive.getRunStatus(), SalaryArchiveStatusEnum.STOP_FROM_PENDING.getValue()) - || Objects.equals(salaryArchive.getRunStatus(), SalaryArchiveStatusEnum.STOP_FROM_SUSPEND.getValue()))) { + if (salaryArchive != null + && (Objects.equals(salaryArchive.getRunStatus(), SalaryArchiveStatusEnum.STOP_FROM_PENDING.getValue()) + || Objects.equals(salaryArchive.getRunStatus(), SalaryArchiveStatusEnum.STOP_FROM_SUSPEND.getValue()))) { if (Objects.equals(employeeDeclare.getEmploymentStatus(), EmploymentStatusEnum.ABNORMAL.getValue()) || Objects.equals(Util.null2String(employeeDeclare.getDismissDate()), Util.null2String(salaryArchive.getPayEndDate()))) { employeeDeclare.setEmploymentStatus(EmploymentStatusEnum.ABNORMAL.getValue()); diff --git a/src/com/engine/salary/entity/employeedeclare/param/EmployeeDeclareAddListQueryParam.java b/src/com/engine/salary/entity/employeedeclare/param/EmployeeDeclareAddListQueryParam.java index 116623339..7847ea4f5 100644 --- a/src/com/engine/salary/entity/employeedeclare/param/EmployeeDeclareAddListQueryParam.java +++ b/src/com/engine/salary/entity/employeedeclare/param/EmployeeDeclareAddListQueryParam.java @@ -55,6 +55,8 @@ public class EmployeeDeclareAddListQueryParam extends BaseQueryParam { // 员工姓名/编号 private String keyword; + private Long employeeId; + // 部门 private Collection departmentIds; diff --git a/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java b/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java index 82410a3c4..953ea3cbf 100644 --- a/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java +++ b/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java @@ -439,12 +439,13 @@ public class EmployeeDeclareServiceImpl extends Service implements EmployeeDecla public void refresh(EmployeeDeclareRefreshParam refreshParam, Long employeeId) { // 查询本月已有的需要报送的人员 List employeeDeclares = listByTaxCycleAndTaxAgentId(refreshParam.getTaxCycle(), refreshParam.getTaxAgentId()); - // 查询上月已有的需要报送的人员(只需要正常的) - List preTaxCycleEmployeeDeclares = listByTaxCycleAndTaxAgentId(SalaryDateUtil.plusMonths(refreshParam.getTaxCycle(), -1), refreshParam.getTaxAgentId()) - .stream() - .filter(e -> Objects.equals(e.getEmploymentStatus(), EmploymentStatusEnum.NORMAL.getValue()) - && Objects.equals(e.getDeclareStatus(), DeclareStatusEnum.DECLARE_SUCCESS.getValue())) - .collect(Collectors.toList()); + // 查询上月已有报送的人员 + List preTaxCycleEmployeeDeclares = listByTaxCycleAndTaxAgentId(SalaryDateUtil.plusMonths(refreshParam.getTaxCycle(), -1), refreshParam.getTaxAgentId()); + //只需要正常的 +// .stream() +// .filter(e -> Objects.equals(e.getEmploymentStatus(), EmploymentStatusEnum.NORMAL.getValue()) +// && Objects.equals(e.getDeclareStatus(), DeclareStatusEnum.DECLARE_SUCCESS.getValue())) +// .collect(Collectors.toList()); // 查询个税扣缴义务人 TaxAgentPO taxAgent = getTaxAgentService(user).getById(refreshParam.getTaxAgentId()); // 根据税款所属期计算出薪资周期 diff --git a/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java b/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java index 149d31fb3..9268317a8 100644 --- a/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java @@ -1,5 +1,6 @@ package com.engine.salary.service.impl; +import cn.hutool.core.collection.CollUtil; import com.api.formmode.mybatis.util.SqlProxyHandle; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; @@ -692,9 +693,11 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd @Override public SpecialAddDeductionRecordDTO getRecordById(Long id) { - return getSpecialAddDeductionBiz() - .listDTOByParam(SpecialAddDeductionQueryParam.builder().specialAddDeductionId(id).build()) - .stream().findFirst().orElse(null); + List specialAddDeductionRecordDTOList = getSpecialAddDeductionBiz().listDTOByParam(SpecialAddDeductionQueryParam.builder().specialAddDeductionId(id).build()); + if(CollUtil.isNotEmpty(specialAddDeductionRecordDTOList)){ + return specialAddDeductionRecordDTOList.get(0); + } + return null; } private List> queryInfoForExcel(SpecialAddDeductionQueryParam param, List> rowList) {