qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/3.0.0.2403.01' into release/个税版本 

# Conflicts:
#	src/com/engine/salary/entity/datacollection/AddUpSituation.java
#	src/com/engine/salary/entity/salarysob/po/SalarySobPO.java
#	src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
#	src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
#	src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
#	src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
This commit is contained in:
钱涛 2024-03-12 18:56:12 +08:00
parent a7b3b7578f bef1835c39
commit 452d7bc57c
94 changed files with 1263 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

451
resource/WEB-INF/config/mapper/hrmelog/ElogTableCheckerMapper.xml Normal file
View File

@ -0,0 +1,451 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.engine.hrmelog.mapper.ElogTableCheckerMapper">
<insert id="recordVersion">
insert into hrsa_elog_version (id, maintable, version) values (#{id},#{mainTable},#{version})
</insert>
<select id="getVersion" resultType="java.lang.Long">
select version from hrsa_elog_version where maintable = #{mainTable}
</select>
<update id="createMainTable">
create table ${mainTable}
(
id bigint comment 'ID',
create_time datetime default current_timestamp ,
update_time datetime default current_timestamp ,
creator bigint,
delete_type int,
tenant_key varchar(10),
uuid char(36),
log_date datetime default current_timestamp ,
log_operator varchar(50),
operatorName varchar(50),
targetId varchar(50),
targetName text,
modulename varchar(100),
functionname varchar(100),
interfaceName varchar(100),
requesturl varchar(200),
requesturi varchar(200),
operateType varchar(50),
operatetypename varchar(100),
operatedesc varchar(1000),
params longtext,
belongmainid varchar(36),
clientIp varchar(50),
groupid varchar(50),
device varchar(200),
groupNameLabel varchar(500),
redoService varchar(200),
redoContext longtext,
cancelService varchar(200),
cancelContext longtext,
totalruntime bigint,
mainruntime bigint,
log_result varchar(100),
fromterminal varchar(100),
resultdesc text,
old_content varchar(1000),
link_type varchar(20),
link_id bigint,
old_link_id bigint,
PRIMARY KEY (id)
)
</update>
<update id="createMainTable" databaseId="oracle">
create table ${mainTable}
(
id number(*,0) not null primary key,
create_time date default sysdate,
update_time date default sysdate,
creator number(*,0),
delete_type number(*,0),
tenant_key varchar2(10),
uuid varchar2(36),
log_date date default sysdate,
log_operator varchar2(50),
operatorName varchar2(50),
targetId varchar2(50),
targetName varchar2(4000),
modulename varchar2(100),
functionname varchar2(100),
interfaceName varchar2(100),
requesturl varchar2(200),
requesturi varchar2(200),
operateType varchar2(50),
operatetypename varchar2(100),
operatedesc varchar2(1000),
params clob,
belongmainid varchar2(36),
clientIp varchar2(200),
groupid varchar2(50),
device varchar2(200),
groupNameLabel varchar2(500),
redoService varchar2(200),
redoContext varchar2(4000),
cancelService varchar2(200),
cancelContext varchar2(4000),
totalruntime number(*,0),
mainruntime number(*,0),
log_result varchar2(4000),
fromterminal varchar2(100),
resultdesc varchar2(4000),
old_content varchar2(1000),
link_type varchar2(20),
link_id number(*,0),
old_link_id number(*,0)
)
</update>
<update id="createMainTable" databaseId="sqlserver">
create table ${mainTable}
(
id bigint not null primary key,
create_time datetime default getdate(),
update_time datetime default getdate(),
creator bigint default '-1',
delete_type bigint default 0,
tenant_key nvarchar(10),
uuid nvarchar(36),
log_date datetime default getdate(),
device nvarchar(500),
log_operator bigint default '-1',
operatorname nvarchar(100),
targetid bigint default '-1',
targetname nvarchar(3000),
modulename nvarchar(100),
functionname nvarchar(100),
interfacename nvarchar(100),
requesturl nvarchar(200),
requesturi nvarchar(200),
operatetype nvarchar(50),
operatetypename nvarchar(100),
operatedesc nvarchar(3000),
params nvarchar(max),
belongmainid nvarchar(36),
clientip nvarchar(200),
groupid nvarchar(50),
groupnamelabel nvarchar(1000),
redoservice nvarchar(200),
redocontext nvarchar(3000),
cancelservice nvarchar(200),
cancelcontext nvarchar(3000),
totalruntime bigint default 0,
mainruntime bigint default 0,
log_result nvarchar(100),
fromterminal nvarchar(100),
resultdesc nvarchar(3000),
old_content nvarchar(3000),
link_type nvarchar(20),
link_id bigint default 0,
old_link_id bigint default 0
)
</update>
<update id="createMainTable" databaseId="postgresql">
create table ${mainTable}
(
id int8 not null primary key,
create_time timestamp default current_timestamp,
update_time timestamp default current_timestamp,
creator int8,
delete_type int,
tenant_key varchar(10),
uuid varchar(36),
log_date timestamp default current_timestamp,
log_operator varchar(50),
operatorName varchar(50),
targetId varchar(50),
targetName text,
modulename varchar(100),
functionname varchar(100),
interfaceName varchar(100),
requesturl varchar(200),
requesturi varchar(200),
operateType varchar(50),
operatetypename varchar(100),
operatedesc varchar(1000),
params text,
belongmainid varchar(36),
clientIp varchar(200),
groupid varchar(50),
device varchar(200),
groupNameLabel varchar(500),
redoService varchar(200),
redoContext text,
cancelService varchar(200),
cancelContext text,
totalruntime int4,
mainruntime int4,
log_result varchar(100),
fromterminal varchar(100),
resultdesc text,
old_content varchar(1000),
link_type varchar(20),
link_id int4,
old_link_id int4
)
</update>
<update id="createDetailTable">
create table ${detailTable}
(
id bigint not null primary key,
create_time datetime default current_timestamp ,
update_time datetime default current_timestamp ,
creator bigint,
delete_type int,
tenant_key varchar(10),
uuid varchar(36),
mainid varchar(36),
dataid varchar(50),
belongdataid varchar(50),
tableName varchar(200),
tablenamelabelid varchar(50),
tablenamedesc varchar(50),
fieldName varchar(200),
fieldnamelabelid varchar(200),
newValue longtext,
oldValue longtext,
newrealvalue longtext,
oldrealvalue longtext,
fieldDesc varchar(200),
showorder int default 0,
isdetail int default 0
)
</update>
<update id="createDetailTable" databaseId="postgresql">
create table ${detailTable}
(
id int8 not null primary key,
create_time timestamp default current_timestamp ,
update_time timestamp default current_timestamp ,
creator int8,
delete_type int8,
tenant_key varchar(10),
uuid varchar(36),
mainid varchar(36),
dataid varchar(50),
belongdataid varchar(50),
tableName varchar(200),
tablenamelabelid varchar(50),
tablenamedesc varchar(50),
fieldName varchar(200),
fieldnamelabelid varchar(200),
newValue text,
oldValue text,
newrealvalue text,
oldrealvalue text,
fieldDesc varchar(200),
showorder int8 default 0,
isdetail int8 default 0
)
</update>
<update id="createDetailTable" databaseId="oracle">
create table ${detailTable}
(
id number(*,0) not null primary key,
create_time date default sysdate,
update_time date default sysdate,
creator number(*,0),
delete_type number(*,0),
tenant_key varchar2(10),
uuid varchar2(36),
mainid varchar2(36),
dataid varchar2(50),
belongdataid varchar2(50),
tableName varchar2(200),
tablenamelabelid varchar2(50),
tablenamedesc varchar2(50),
fieldName varchar2(200),
fieldnamelabelid varchar2(200),
newValue CLOB,
oldValue CLOB,
newrealvalue CLOB,
oldrealvalue CLOB,
fieldDesc varchar2(200),
showorder number(*,0) default 0,
isdetail number(*,0) default 0
)
</update>
<update id="createDetailTable" databaseId="sqlserver">
create table ${detailTable}
(
id bigint not null primary key,
create_time datetime default getdate(),
update_time datetime default getdate(),
creator bigint,
delete_type bigint,
tenant_key nvarchar(10),
uuid nvarchar(36),
mainid nvarchar(36),
dataid nvarchar(50),
belongdataid nvarchar(50),
tableName nvarchar(200),
tablenamelabelid nvarchar(50),
tablenamedesc nvarchar(50),
fieldName nvarchar(200),
fieldnamelabelid nvarchar(200),
newValue nvarchar(max),
oldValue nvarchar(max),
newrealvalue nvarchar(max),
oldrealvalue nvarchar(max),
fieldDesc varchar(200),
showorder bigint default 0,
isdetail bigint default 0
)
</update>
<!-- 获取表结构 -->
<select id="getTableStructure" resultType="com.engine.hrmelog.entity.dto.TableColumnBean" >
SELECT
COLUMN_NAME columnName,
DATA_TYPE dataTypeStr,
COLUMN_TYPE columnType,
CHARACTER_MAXIMUM_LENGTH fieldLength,
IS_NULLABLE isNullableStr,
COLUMN_DEFAULT columnDefault,
COLUMN_COMMENT columnComment
FROM
INFORMATION_SCHEMA.COLUMNS
where
table_name = #{tableName}
and TABLE_SCHEMA = (select database())
</select>
<select id="getTableStructure" resultType="com.engine.hrmelog.entity.dto.TableColumnBean" databaseId="postgresql">
select *
from pg_tables
where tableowner = (select current_user)
and tablename = #{tableName}
</select>
<select id="getTableStructure" resultType="com.engine.hrmelog.entity.dto.TableColumnBean" databaseId="oracle">
SELECT
COLUMN_NAME columnName
FROM
user_tab_columns
where
TABLE_NAME=UPPER(#{tableName})
</select>
<select id="getTableStructure" resultType="com.engine.hrmelog.entity.dto.TableColumnBean" databaseId="sqlserver">
SELECT
COLUMN_NAME columnName
FROM
INFORMATION_SCHEMA.COLUMNS
where
table_name = #{tableName}
and TABLE_catalog = (select DB_NAME())
</select>
<update id="createElogTable">
${createElogSql}
</update>
<!--查询表索引信息-->
<select id="getTableIndex" resultType="java.util.Map">
SELECT COLUMN_KEY
FROM INFORMATION_SCHEMA.COLUMNS
WHERE TABLE_NAME = #{tableName}
AND COLUMN_NAME = #{columnName}
AND TABLE_SCHEMA = (SELECT DATABASE()) LIMIT 1
</select>
<select id="getTableIndex" resultType="java.util.Map" databaseId="postgresql">
SELECT COLUMN_KEY
FROM INFORMATION_SCHEMA.COLUMNS
WHERE TABLE_NAME = #{tableName}
AND COLUMN_NAME = #{columnName}
AND TABLE_SCHEMA = (SELECT current_database()) limit 1 offset 0
</select>
<select id="getTableIndex" resultType="java.util.Map" databaseId="oracle">
SELECT *
FROM user_ind_columns
WHERE TABLE_NAME = UPPER(#{tableName})
AND COLUMN_NAME = UPPER(#{columnName})
</select>
<select id="getTableIndex" resultType="java.util.Map" databaseId="sqlserver">
SELECT a.name,
c.name,
d.name
FROM sysindexes a
JOIN sysindexkeys b ON
a.id = b.id
AND a.indid = b.indid
JOIN sysobjects c ON
b.id = c.id
JOIN syscolumns d ON
b.id = d.id
AND b.colid = d.colid
WHERE a.indid NOT IN (0,
255)
AND c.name = #{tableName}
and d.name = #{columnName}
</select>
<!--查询表索引信息-->
<select id="getDataBase" resultType="java.util.Map">
SELECT DATABASE() as databasename
</select>
<select id="getDataBase" resultType="java.util.Map" databaseId="postgresql">
SELECT current_database() as databasename
</select>
<select id="getDataBase" resultType="java.util.Map" databaseId="oracle">
SELECT user as databasename
</select>
<select id="getDataBase" resultType="java.util.Map" databaseId="sqlserver">
SELECT db_name() as databasename
</select>
<update id="createTableIndex">
create index idx${id} on ${tableName} (${columnName})
</update>
<update id="createTableIndex" databaseId="oracle">
create index idx${id} on ${tableName} (${columnName})
</update>
<update id="createTableIndex" databaseId="sqlserver">
create index idx${id} on ${tableName} (${columnName})
</update>
<select id="getAllExistTables" resultType="java.lang.String">
SELECT TABLE_NAME
FROM INFORMATION_SCHEMA.TABLES
WHERE TABLE_SCHEMA = (SELECT DATABASE())
AND TABLE_NAME IN
<foreach collection="tableNames" item="tableName" open="(" separator="," close=")">
#{tableName}
</foreach>
</select>
<select id="getAllExistTables" resultType="java.lang.String" databaseId="oracle">
SELECT
TABLE_NAME
FROM
USER_TABLES
WHERE TABLE_NAME IN
<foreach collection="tableNames" item="tableName" open="(" separator="," close=")">
UPPER(#{tableName})
</foreach>
</select>
<select id="getAllExistTables" resultType="java.lang.String" databaseId="sqlserver">
SELECT table_name
FROM INFORMATION_SCHEMA.TABLES
WHERE TABLE_catalog = (select DB_NAME())
AND table_name IN
<foreach collection="tableNames" item="tableName" open="(" separator="," close=")">
#{tableName}
</foreach>
</select>
<select id="getAllExistTables" resultType="java.lang.String" databaseId="postgresql">
SELECT tablename
FROM pg_tables
WHERE tableowner = (select current_user)
AND tablename IN
<foreach collection="tableNames" item="tableName" open="(" separator="," close=")">
#{tableName}
</foreach>
</select>
</mapper>

170
resource/WEB-INF/config/mapper/hrmelog/LocalElogAopDaoMapper.xml Normal file
View File

@ -0,0 +1,170 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.engine.hrmelog.mapper.LocalElogAopDaoMapper">
<insert id="insertElogContext">
insert into ${tableName} (id, uuid, log_date, tenant_key, modulename, functionName, operatetypename,
log_operator, operatorname, targetid, targetname, interfacename, operatetype,
operatedesc,
params, clientIp, groupnamelabel, redoservice, redocontext, cancelservice,
cancelcontext, device, groupid,
belongMainId, requestUrl, requestUri, totalRunTime, mainRunTime, log_result,
fromTerminal, resultDesc, old_content,
link_type, link_id, old_link_id, create_time, update_time, delete_type, creator
${cusColumns})
values (#{logContent.id}, #{logContent.uuid}, #{logContent.date},
#{logContent.tenant_key}, #{logContent.moduleName}, #{logContent.functionName},
#{logContent.operateTypeName}, #{logContent.logOperator}, #{logContent.operatorName},
#{logContent.logTargetid}
, #{logContent.targetName}, #{logContent.interfaceName}, #{logContent.operateType},
#{logContent.operatedesc},
#{logContent.paramsStr}, #{logContent.clientIp}, #{logContent.groupNameLabel},
#{logContent.redoService},
#{logContent.redoContextStr}, #{logContent.cancelService}, #{logContent.cancelContextStr},
#{logContent.device}, #{logContent.groupId},
#{logContent.belongMainId}, #{logContent.requestUrl}, #{logContent.requestUri},
#{logContent.totalRunTime}, #{logContent.mainRunTime}
, #{logContent.result}, #{logContent.fromTerminal}, #{logContent.resultDesc},
#{logContent.old_content}, #{logContent.link_type}
, #{logContent.link_id}, #{logContent.old_link_id}, #{logContent.create_time},
#{logContent.update_time}, #{logContent.delete_type}, #{logContent.logOperator}
${cusValus})
</insert>
<insert id="insertElogDetail">
insert into ${detailTableName} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue,
fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key, creator,
newRealValue, oldRealValue, tableNameDesc,
tableNameLabelId, fieldNameLabelId, create_time, update_time
${cusColumns})
values (#{detailContext.id}, #{mainid}, #{detailContext.uuid}, #{detailContext.tableName},
#{detailContext.fieldName}, #{detailContext.newValue},
#{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder},
#{detailContext.dataid},
#{detailContext.belongDataid}, #{detailContext.isDetail}, #{detailContext.tenant_key},
#{detailContext.creator}, #{detailContext.newRealValue}
, #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId},
#{detailContext.fieldNameLabelId}, #{detailContext.create_time}, #{detailContext.update_time}
${cusValus})
</insert>
<insert id="batchInsertDetail">
${sql}
</insert>
<select id="queryElogContextById" resultType="java.lang.Integer">
select 1
from ${tableName}
where id = #{id}
</select>
<insert id="insertElogDetailPrepared">
insert into ${tablename} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue,
fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key,creator, newRealValue,
oldRealValue,tableNameDesc,
tableNameLabelId,fieldNameLabelId, create_time, update_time,delete_type)
values
<foreach collection="list" item="detailContext" separator=",">
( #{detailContext.id},#{mainid}, #{detailContext.uuid}, #{detailContext.tableName},
#{detailContext.fieldName}, #{detailContext.newValue},
#{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder}, #{detailContext.dataid},
#{detailContext.belongDataid}, #{detailContext.isDetail},
#{detailContext.tenant_key},#{detailContext.creator}, #{detailContext.newRealValue}
, #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId},
#{detailContext.fieldNameLabelId}
, #{detailContext.create_time}, #{detailContext.update_time}, #{detailContext.delete_type})
</foreach>
</insert>
<insert id="insertElogDetailPrepared" databaseId="sqlserver">
<foreach collection="list" item="detailContext" separator=";">
insert into ${tablename} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue,
fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key,creator, newRealValue,
oldRealValue,tableNameDesc,
tableNameLabelId,fieldNameLabelId, create_time, update_time,delete_type)
VALUES
(
#{detailContext.id},#{mainid}, #{detailContext.uuid}, #{detailContext.tableName},
#{detailContext.fieldName}, #{detailContext.newValue},
#{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder}, #{detailContext.dataid},
#{detailContext.belongDataid}, #{detailContext.isDetail},
#{detailContext.tenant_key},#{detailContext.creator}, #{detailContext.newRealValue}
, #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId},
#{detailContext.fieldNameLabelId}
, #{detailContext.create_time}, #{detailContext.update_time}, #{detailContext.delete_type}
)
</foreach>
</insert>
<insert id="insertElogDetailPreparedHasCustonInfo">
insert into ${tablename} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue,
fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key,creator, newRealValue,
oldRealValue,tableNameDesc,
tableNameLabelId,fieldNameLabelId, create_time, update_time
${cusColumns})
values
<foreach collection="list" item="detailContext" separator=",">
( #{detailContext.id},#{mainid}, #{detailContext.uuid}, #{detailContext.tableName},
#{detailContext.fieldName}, #{detailContext.newValue},
#{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder}, #{detailContext.dataid},
#{detailContext.belongDataid}, #{detailContext.isDetail},
#{detailContext.tenant_key},#{detailContext.creator}, #{detailContext.newRealValue}
, #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId},
#{detailContext.fieldNameLabelId}
, #{detailContext.create_time}, #{detailContext.update_time}
${detailContext.cusValus})
</foreach>
</insert>
<update id="rollBackElogById">
update ${tableName}
set delete_type = 3
where id = #{id}
</update>
<update id="rollBackDetailElogByUUID">
update ${tableName}
set delete_type = 3
where mainid = #{mainid}
</update>
<insert id="insertElogDetailPrepared" databaseId="oracle">
insert into ${tablename} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue,
fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key,creator, newRealValue,
oldRealValue,tableNameDesc,
tableNameLabelId,fieldNameLabelId, create_time, update_time,delete_type)
<foreach collection="list" item="detailContext" separator=" union all ">
SELECT #{detailContext.id},#{mainid}, #{detailContext.uuid}, #{detailContext.tableName},
#{detailContext.fieldName}, #{detailContext.newValue},
#{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder}, #{detailContext.dataid},
#{detailContext.belongDataid}, #{detailContext.isDetail},
#{detailContext.tenant_key},#{detailContext.creator}, #{detailContext.newRealValue}
, #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId},
#{detailContext.fieldNameLabelId}
, #{detailContext.create_time}, #{detailContext.update_time}, #{detailContext.delete_type}
FROM DUAL
</foreach>
</insert>
<insert id="insertElogDetailPreparedHasCustonInfo" databaseId="oracle">
insert into ${tablename} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue,
fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key,creator, newRealValue,
oldRealValue,tableNameDesc,
tableNameLabelId,fieldNameLabelId, create_time, update_time
${cusColumns})
<foreach collection="list" item="detailContext" separator=" union all ">
SELECT #{detailContext.id},#{mainid}, #{detailContext.uuid}, #{detailContext.tableName},
#{detailContext.fieldName}, #{detailContext.newValue},
#{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder}, #{detailContext.dataid},
#{detailContext.belongDataid}, #{detailContext.isDetail},
#{detailContext.tenant_key},#{detailContext.creator}, #{detailContext.newRealValue}
, #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId},
#{detailContext.fieldNameLabelId}
, #{detailContext.create_time}, #{detailContext.update_time}
${detailContext.cusValus}
FROM DUAL
</foreach>
</insert>
</mapper>

412
resource/WEB-INF/config/mapper/hrmelog/LocalElogDaoMapper.xml Normal file
View File

@ -0,0 +1,412 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.engine.hrmelog.mapper.LocalElogDaoMapper">
<select id="queryElogList" resultType="java.util.Map">
select ${columns},DATE_FORMAT(log_date,"%Y-%m-%d %H:%i:%S") createdate from ${tableName}
where modulename = #{logContent.moduleName} and functionname = #{logContent.functionName}
and delete_type = 0
<if test="conditionSql != null">${conditionSql}</if>
order by log_date desc ,id desc
</select>
<select id="queryElogList" resultType="java.util.Map" databaseId="postgresql">
select ${columns},to_char(log_date::timestamp,'YYYY-MM-DD HH24:MI:SS') createdate from ${tableName}
where modulename = #{logContent.moduleName} and functionname = #{logContent.functionName}
<if test="conditionSql != null">${conditionSql}</if>
order by log_date desc ,id desc
</select>
<select id="queryElogList" resultType="java.util.Map" databaseId="oracle">
select d.*,to_char(d.log_date,'yyyy-mm-dd HH24:mi:ss') createdate from ${tableName} d
where modulename = #{logContent.moduleName} and functionname = #{logContent.functionName}
<if test="conditionSql != null">${conditionSql}</if>
order by d.log_date desc ,id desc
</select>
<select id="queryElogList" resultType="java.util.Map" databaseId="sqlserver">
select ${columns},convert(nvarchar(19),log_date,120) createdate from ${tableName}
where modulename = #{logContent.moduleName} and functionname = #{logContent.functionName}
<if test="conditionSql != null">${conditionSql}</if>
order by log_date desc ,id desc
</select>
<select id="queryElogListPapi" resultType="java.util.Map">
select ${columns},DATE_FORMAT(log_date,"%Y-%m-%d %H:%i:%S") createdate from ${tableName}
where modulename = #{logContent.moduleName} and functionname = #{logContent.functionName}
and delete_type = 0
<if test="conditionSql != null">${conditionSql}</if>
order by log_date desc ,id desc
</select>
<select id="queryElogListPapi" resultType="java.util.Map" databaseId="postgresql">
select ${columns},to_char(log_date::timestamp,'YYYY-MM-DD HH24:MI:SS') createdate from ${tableName}
where modulename = #{logContent.moduleName} and functionname = #{logContent.functionName}
<if test="conditionSql != null">${conditionSql}</if>
order by log_date desc ,id desc
</select>
<select id="queryElogListPapi" resultType="java.util.Map" databaseId="oracle">
select d.*,to_char(d.log_date,'yyyy-mm-dd HH24:mi:ss') createdate from ${tableName} d
where modulename = #{logContent.moduleName} and functionname = #{logContent.functionName}
<if test="conditionSql != null">${conditionSql}</if>
order by d.log_date desc ,id desc
</select>
<select id="queryElogListPapi" resultType="java.util.Map" databaseId="sqlserver">
select ${columns},convert(nvarchar(19),log_date,120) createdate from ${tableName}
where modulename = #{logContent.moduleName} and functionname = #{logContent.functionName}
<if test="conditionSql != null">${conditionSql}</if>
order by log_date desc ,id desc
</select>
<select id="queryCardElogList" resultType="java.util.Map">
select ${columns}, DATE_FORMAT(log_date,"%Y-%m-%d %H:%i:%S") createdate,
uuid from ${tableName}
where modulename = #{logContent.moduleName} and functionname = #{logContent.functionName}
<if test="conditionSql != null">#{conditionSql}</if>
order by log_date desc ,id desc
</select>
<select id="queryCardElogList" resultType="java.util.Map" databaseId="postgresql">
select ${columns}, to_char(log_date::timestamp,'YYYY-MM-DD HH24:MI:SS') createdate,
uuid from ${tableName}
where modulename = #{logContent.moduleName} and functionname = #{logContent.functionName}
<if test="conditionSql != null">#{conditionSql}</if>
order by log_date desc ,id desc
</select>
<select id="queryCardElogList" resultType="java.util.Map" databaseId="oracle">
select ${columns}, to_char(log_date,'yyyy-mm-dd HH24:mi:ss') createdate,
uuid from ${tableName}
where modulename = #{logContent.moduleName} and functionname = #{logContent.functionName}
<if test="conditionSql != null">#{conditionSql}</if>
order by log_date desc ,id desc
</select>
<select id="queryCardElogList" resultType="java.util.Map" databaseId="sqlserver">
select ${columns}, convert(nvarchar(19),log_date,120) createdate,
uuid from ${tableName}
where modulename = #{logContent.moduleName} and functionname = #{logContent.functionName}
<if test="conditionSql != null">#{conditionSql}</if>
order by log_date desc ,id desc
</select>
<select id="elogCountByMorePermission" resultType="java.util.Map">
select count(1) counts from ${tableName}
where modulename = #{logContent.moduleName} and functionname = #{logContent.functionName}
<if test="conditionSql != null">${conditionSql}</if>
</select>
<select id="elogCount" resultType="java.util.Map">
select count(1) counts from ${tableName}
where modulename = #{logContent.moduleName} and functionname = #{logContent.functionName}
<if test="logContent.operator != null and logContent.operator !=''">
and log_operator = #{logContent.operator}
</if>
<if test="conditionSql != null">${conditionSql}</if>
</select>
<select id="elogCountPapi" resultType="java.util.Map">
select count(1) counts from ${tableName}
where modulename = #{logContent.moduleName} and functionname = #{logContent.functionName}
and delete_type = 0
<if test="logContent.operator != null and logContent.operator !=''">
and log_operator = #{logContent.operator}
</if>
<if test="conditionSql != null">${conditionSql}</if>
</select>
<select id="queryDetailElogList" resultType="java.util.Map">
select *,DATE_FORMAT(create_time,"%Y-%m-%d %H:%i:%S") createdate from ${tableName}
where mainid = #{logContent.uuid}
<if test="conditionSql != null">#{conditionSql}</if>
order by log_date desc ,id desc
</select>
<select id="queryDetailElogList" resultType="java.util.Map" databaseId="postgresql">
select *,to_char(create_time::timestamp,'YYYY-MM-DD HH24:MI:SS') createdate from ${tableName}
where mainid = #{logContent.uuid}
<if test="conditionSql != null">#{conditionSql}</if>
order by log_date desc ,id desc
</select>
<select id="queryDetailElogList" resultType="java.util.Map" databaseId="oracle">
select *,to_char(create_time,'yyyy-mm-dd HH24:mi:ss') createdate from ${tableName}
where mainid = #{logContent.uuid}
<if test="conditionSql != null">#{conditionSql}</if>
order by log_date desc ,id desc
</select>
<select id="queryDetailElogList" resultType="java.util.Map" databaseId="sqlserver">
select *,convert(nvarchar(19),create_time,120) createdate from ${tableName}
where mainid = #{logContent.uuid}
<if test="conditionSql != null">#{conditionSql}</if>
order by log_date desc ,id desc
</select>
<select id="queryAllChanges" resultType="java.util.Map">
select *
from ${tableName}
where mainid = #{mainid}
</select>
<select id="queryAllMainData" resultType="java.util.Map">
select *
from ${tableName}
where uuid = #{uuid}
</select>
<select id="queryAllMainChanges" resultType="java.util.Map">
select *
from ${tableName}
where mainid = #{mainid}
and isdetail = '0'
</select>
<select id="queryAllDetailChanges" resultType="java.util.Map">
select *
from ${tableName}
where mainid = #{mainid}
and isdetail = '1'
</select>
<select id="elogDetailCount" resultType="java.util.Map">
select count(1) counts from ${tableName}
where mainid = #{logContent.uuid}
<if test="conditionSql != null">#{conditionSql}</if>
</select>
<!-- <select id="queryOperators" resultType="com.weaver.teams.domain.user.SimpleEmployee">-->
<!-- select log_operator id, max(log_date) updateTime-->
<!-- from ${tableName}-->
<!-- where targetid = #{targetId}-->
<!-- and operatetype = #{operateType}-->
<!-- group by log_operator-->
<!-- order by updateTime desc-->
<!-- </select>-->
<select id="queryReadInfoOperators" resultType="com.engine.hrmelog.entity.dto.ReadInfoEntity">
select log_operator employeeId, max(log_date) date
from ${tableName}
where targetid = #{targetId}
and operatetype = #{operateType}
group by log_operator
order by log_date desc
</select>
<select id="queryReadInfoOperators" resultType="com.engine.hrmelog.entity.dto.ReadInfoEntity" databaseId="postgresql">
select log_operator employeeId, max(log_date) date
from ${tableName}
where targetid = #{targetId}
and operatetype = #{operateType}
group by log_operator
order by date desc
</select>
<select id="queryReadInfoOperators" resultType="com.engine.hrmelog.entity.dto.ReadInfoEntity" databaseId="oracle">
select log_operator employeeId, max(log_date) "date"
from ${tableName}
where targetid = #{targetId}
and operatetype = #{operateType}
group by log_operator
order by "date" desc
</select>
<select id="queryReadInfoOperators" resultType="com.engine.hrmelog.entity.dto.ReadInfoEntity" databaseId="sqlserver">
select log_operator employeeId, max(log_date) "date"
from ${tableName}
where targetid = #{targetId}
and operatetype = #{operateType}
group by log_operator
order by "date" desc
</select>
<select id="queryReadInfoDateOperators" resultType="com.engine.hrmelog.entity.dto.ReadInfoEntity">
select log_operator employeeId, max(log_date) date from ${tableName} where targetid = #{targetId} and
operatetype = #{operateType}
<if test="startDate != null">
AND log_date <![CDATA[ >= ]]> #{startDate}
</if>
<if test="endDate != null">
AND log_date <![CDATA[ <= ]]> #{endDate}
</if>
group by log_operator order by log_date desc
</select>
<select id="queryReadInfoDateOperators" resultType="com.engine.hrmelog.entity.dto.ReadInfoEntity"
databaseId="postgresql">
select log_operator employeeId, max(log_date) date from ${tableName} where targetid = #{targetId} and
operatetype = #{operateType}
<if test="startDate != null">
AND log_date <![CDATA[ >= ]]> #{startDate}
</if>
<if test="endDate != null">
AND log_date <![CDATA[ <= ]]> #{endDate}
</if>
group by log_operator order by date desc
</select>
<select id="queryReadInfoDateOperators" resultType="com.engine.hrmelog.entity.dto.ReadInfoEntity" databaseId="oracle">
select log_operator employeeId, max(log_date) "date" from ${tableName} where targetid = #{targetId} and
operatetype = #{operateType}
<if test="startDate != null">
AND log_date <![CDATA[ >= ]]> TO_DATE(#{startDate}, 'SYYYY-MM-DD HH24:MI:SS')
</if>
<if test="endDate != null">
AND log_date <![CDATA[ <= ]]> TO_DATE(#{endDate}, 'SYYYY-MM-DD HH24:MI:SS')
</if>
group by log_operator order by "date" desc
</select>
<select id="queryReadInfoDateOperators" resultType="com.engine.hrmelog.entity.dto.ReadInfoEntity"
databaseId="sqlserver">
select log_operator employeeId, max(log_date) "date" from ${tableName} where targetid = #{targetId} and
operatetype = #{operateType}
<if test="startDate != null">
AND log_date <![CDATA[ >= ]]> #{startDate}
</if>
<if test="endDate != null">
AND log_date <![CDATA[ <= ]]> #{endDate}
</if>
group by log_operator order by "date" desc
</select>
<select id="queryElogContextById" resultType="java.lang.Integer">
select 1
from ${tableName}
where id = #{id}
</select>
<select id="queryElogTraceInfo" resultType="java.util.Map">
select operatorname,
targetname,
modulename,
operatetypename,
DATE_FORMAT(log_date, "%Y-%m-%d %H:%i:%S") createdate
from ${tableName}
where belongmainid = #{traceId}
order by log_date desc, id desc LIMIT #{offset}, #{pageSize}
</select>
<select id="queryElogTraceInfo" resultType="java.util.Map" databaseId="postgresql">
select operatorname,
targetname,
modulename,
operatetypename,
to_char(log_date::timestamp, 'YYYY-MM-DD HH24:MI:SS') createdate
from ${tableName}
where belongmainid = #{traceId}
order by log_date desc, id desc limit #{pageSize}
offset #{offset}
</select>
<select id="queryElogTraceInfo" resultType="java.util.Map" databaseId="oracle">
SELECT operatorname, targetname, modulename, operatetypename
FROM (SELECT TMP.*, ROWNUM ROW_ID
FROM (select t.*, to_char(log_date, 'yyyy-mm-dd HH24:mi:ss') createdate
from ${tableName} t
where belongmainid = #{traceId}
order by log_date desc, id desc) TMP
WHERE ROWNUM &lt;= (#{pageSize} + #{offset}))
WHERE ROW_ID &gt; #{offset}
</select>
<select id="queryElogTraceInfo" resultType="java.util.Map" databaseId="sqlserver">
select atmp.operatorname, atmp.targetname, atmp.modulename, atmp.operatetypename
from (select atmp.*, row_number() over(order by log_date desc ,id desc ) as rownumber
from (select top(#{pageSize}) atmp.*
from (select *, convert(nvarchar(19), log_date, 120) createdate
from ${tableName}
where belongmainid = #{traceId}) atmp
order by log_date desc, id desc) atmp) atmp
where rownumber &gt; #{offset}
order by log_date desc, id desc
</select>
<select id="queryElogTraceInfoCount" resultType="java.lang.Integer">
select count(id) id
from ${tableName}
where belongmainid = #{traceId}
</select>
<select id="queryLogInfoByCustom" resultType="java.util.Map">
select * from ${tableName}
<where>${sql}</where>
</select>
<select id="queryAllChangesData" resultType="java.util.Map">
select *
from ${tableName}
where mainid = #{mainid}
order by showorder asc, id asc
</select>
<select id="queryTenantKeyOperators" resultType="com.engine.hrmelog.entity.dto.ReadInfoEntity">
select log_operator employeeId, max(log_date) date
from ${tableName}
where tenant_key = #{tenantKey}
and targetid = #{targetId}
and operatetype = #{operateType}
group by log_operator
order by date desc
</select>
<select id="queryTenantKeyOperators" resultType="com.engine.hrmelog.entity.dto.ReadInfoEntity" databaseId="postgresql">
select log_operator employeeId, max(log_date) date
from ${tableName}
where tenant_key = #{tenantKey}
and targetid = #{targetId}
and operatetype = #{operateType}
group by log_operator
order by date desc
</select>
<select id="queryTenantKeyOperators" resultType="com.engine.hrmelog.entity.dto.ReadInfoEntity" databaseId="oracle">
select log_operator employeeId, max(log_date) "date"
from ${tableName}
where tenant_key = #{tenantKey}
and targetid = #{targetId}
and operatetype = #{operateType}
group by log_operator
order by "date" desc
</select>
<select id="queryTenantKeyOperators" resultType="com.engine.hrmelog.entity.dto.ReadInfoEntity" databaseId="sqlserver">
select log_operator employeeId, max(log_date) "date"
from ${tableName}
where tenant_key = #{tenantKey}
and targetid = #{targetId}
and operatetype = #{operateType}
group by log_operator
order by "date" desc
</select>
<select id="queryAllChangesDataPages" resultType="java.util.Map">
select *
from ${tableName}
where mainid = #{mainid}
order by showorder asc, id asc
</select>
<select id="queryAllChangesPageCounts" resultType="java.lang.Integer">
select count(*)
from ${tableName}
where mainid = #{mainid}
</select>
<select id="elogCountOnlyNum" resultType="java.lang.Long">
select count(*) from ${tableName}
where modulename = #{logContent.moduleName} and functionname = #{logContent.functionName}
and delete_type = 0
<if test="logContent.operator != null and logContent.operator !=''">
and log_operator = #{logContent.operator}
</if>
<if test="conditionSql != null">${conditionSql}</if>
</select>
</mapper>

9
resource/WEB-INF/config/mapper/hrmelog/QueryCurretValusMapper.xml Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.engine.hrmelog.mapper.QueryCurretValusMapper">
<select id="queryValues" resultType="java.util.Map">
${querySql} limit 1
</select>
</mapper>

BIN
resource/WEB-INF/lib/hrmelog.jar
View File

Binary file not shown.

0
resource/WEB-INF/prop/hrmSalaryBillToken.properties → resource/wiki/扩展功能/hrmSalaryBillToken.properties
View File

0
resource/WEB-INF/prop/hrmSalaryCustom.properties → resource/wiki/扩展功能/hrmSalaryCustom.properties
View File

0
resource/WEB-INF/prop/hrmSalaryPayroll.properties → resource/wiki/扩展功能/hrmSalaryPayroll.properties
View File

20
src/com/engine/salary/annotation/I18n.java Normal file
View File

@ -0,0 +1,20 @@
package com.engine.salary.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* 国际化标识
* <p>Copyright: Copyright (c) 2024</p>
* <p>Company: 泛微软件</p>
*
* @author qiantao
* @version 1.0
**/
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)
public @interface I18n {
}

2
src/com/engine/salary/biz/OtherDeductionBiz.java
View File

@ -1,7 +1,7 @@
package com.engine.salary.biz;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.encrypt.EncryptUtil;
import com.engine.salary.entity.datacollection.dto.OtherDeductionRecordDTO;
import com.engine.salary.entity.datacollection.param.OtherDeductionQueryParam;

2
src/com/engine/salary/biz/SpecialAddDeductionBiz.java
View File

@ -1,7 +1,7 @@
package com.engine.salary.biz;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.encrypt.EncryptUtil;
import com.engine.salary.entity.datacollection.dto.SpecialAddDeductionListDTO;
import com.engine.salary.entity.datacollection.dto.SpecialAddDeductionRecordDTO;

4
src/com/engine/salary/config/SalaryElogConfig.java
View File

@ -1,7 +1,7 @@
package com.engine.salary.config;
import com.engine.salary.elog.util.LoggerTemplate;
import com.engine.salary.elog.util.LoggerTemplateBuilder;
import com.engine.hrmelog.util.LoggerTemplate;
import com.engine.hrmelog.util.LoggerTemplateBuilder;
/**
* elog日志

2
src/com/engine/salary/entity/datacollection/AddUpDeduction.java
View File

@ -2,7 +2,7 @@ package com.engine.salary.entity.datacollection;
import com.engine.salary.annotation.Encrypt;
import com.engine.salary.annotation.SalaryFormulaVar;
import com.engine.salary.elog.annotation.ElogTransform;
import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;

2
src/com/engine/salary/entity/datacollection/AddUpSituation.java
View File

@ -4,7 +4,7 @@ import com.engine.salary.annotation.Encrypt;
import com.engine.salary.annotation.SalaryFormulaVar;
import com.engine.salary.annotation.SalaryTable;
import com.engine.salary.annotation.SalaryTableOperate;
import com.engine.salary.elog.annotation.ElogTransform;
import com.engine.hrmelog.annotation.ElogTransform;
import com.engine.salary.enums.datacollection.DataCollectionEmployeeTypeEnum;
import lombok.AllArgsConstructor;
import lombok.Builder;

5
src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java
View File

@ -1,5 +1,6 @@
package com.engine.salary.entity.datacollection;
import com.engine.salary.annotation.I18n;
import com.engine.salary.annotation.SalaryFormulaVar;
import lombok.AllArgsConstructor;
import lombok.Builder;
@ -33,16 +34,19 @@ public class DataCollectionEmployee {
//姓名
@SalaryFormulaVar(defaultLabel = "姓名", labelId = 85429, dataType = "string")
@I18n
private String username;
//部门
@SalaryFormulaVar(defaultLabel = "部门", labelId = 86185, dataType = "string")
@I18n
private String departmentName;
@SalaryFormulaVar(defaultLabel = "部门ID", labelId = 86185, dataType = "string")
private Long departmentId;
//分部名
@SalaryFormulaVar(defaultLabel = "分部", labelId = 82465, dataType = "string")
@I18n
private String subcompanyName;
@SalaryFormulaVar(defaultLabel = "分部ID", labelId = 82465, dataType = "string")
private Long subcompanyid;
@ -55,6 +59,7 @@ public class DataCollectionEmployee {
//岗位
@SalaryFormulaVar(defaultLabel = "岗位", labelId = 90633, dataType = "string")
@I18n
private String jobtitleName;
@SalaryFormulaVar(defaultLabel = "岗位ID", labelId = 90633, dataType = "string")
private Long jobtitleId;

2
src/com/engine/salary/entity/datacollection/po/AttendQuoteFieldPO.java
View File

@ -1,6 +1,6 @@
package com.engine.salary.entity.datacollection.po;
import com.engine.salary.elog.annotation.ElogTransform;
import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;

2
src/com/engine/salary/entity/datacollection/po/AttendQuotePO.java
View File

@ -1,6 +1,6 @@
package com.engine.salary.entity.datacollection.po;
import com.engine.salary.elog.annotation.ElogTransform;
import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;

2
src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java
View File

@ -2,7 +2,7 @@ package com.engine.salary.entity.datacollection.po;
import com.engine.salary.annotation.Encrypt;
import com.engine.salary.annotation.SalaryFormulaVar;
import com.engine.salary.elog.annotation.ElogTransform;
import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;

2
src/com/engine/salary/entity/datacollection/po/SpecialAddDeductionPO.java
View File

@ -1,7 +1,7 @@
package com.engine.salary.entity.datacollection.po;
import com.engine.salary.annotation.Encrypt;
import com.engine.salary.elog.annotation.ElogTransform;
import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;

2
src/com/engine/salary/entity/extemp/po/ExtEmpPO.java
View File

@ -2,7 +2,7 @@ package com.engine.salary.entity.extemp.po;
import com.engine.salary.annotation.TableTitle;
import com.engine.salary.elog.annotation.ElogTransform;
import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;

2
src/com/engine/salary/entity/hrm/PositionInfo.java
View File

@ -1,5 +1,6 @@
package com.engine.salary.entity.hrm;
import com.engine.salary.annotation.I18n;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -24,6 +25,7 @@ public class PositionInfo {
/**
* 名称
*/
@I18n
private String name;

2
src/com/engine/salary/entity/hrm/SubCompanyInfo.java
View File

@ -1,5 +1,6 @@
package com.engine.salary.entity.hrm;
import com.engine.salary.annotation.I18n;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -24,5 +25,6 @@ public class SubCompanyInfo {
/**
* 名称
*/
@I18n
private String name;
}

2
src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateListDTO.java
View File

@ -4,7 +4,7 @@ import com.engine.salary.annotation.SalaryTable;
import com.engine.salary.annotation.SalaryTableColumn;
import com.engine.salary.annotation.SalaryTableOperate;
import com.engine.salary.annotation.TableTitle;
import com.engine.salary.elog.annotation.ElogTransform;
import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;

2
src/com/engine/salary/entity/salaryBill/po/SalarySendPO.java
View File

@ -1,6 +1,6 @@
package com.engine.salary.entity.salaryBill.po;
import com.engine.salary.elog.annotation.ElogTransform;
import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;

2
src/com/engine/salary/entity/salaryBill/po/SalaryTemplatePO.java
View File

@ -1,6 +1,6 @@
package com.engine.salary.entity.salaryBill.po;
import com.engine.salary.elog.annotation.ElogTransform;
import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;

2
src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java
View File

@ -1,7 +1,7 @@
package com.engine.salary.entity.salaryacct.po;
import com.engine.salary.annotation.SalaryFormulaVar;
import com.engine.salary.elog.annotation.ElogTransform;
import com.engine.hrmelog.annotation.ElogTransform;
import com.engine.salary.enums.datacollection.DataCollectionEmployeeTypeEnum;
import lombok.AllArgsConstructor;
import lombok.Builder;

2
src/com/engine/salary/entity/salaryacct/po/SalaryAcctRecordPO.java
View File

@ -1,7 +1,7 @@
package com.engine.salary.entity.salaryacct.po;
import com.engine.salary.common.LocalDateRange;
import com.engine.salary.elog.annotation.ElogTransform;
import com.engine.hrmelog.annotation.ElogTransform;
import com.engine.salary.enums.salaryaccounting.SalaryAcctRecordStatusEnum;
import lombok.AllArgsConstructor;
import lombok.Builder;

2
src/com/engine/salary/entity/salaryacct/po/SalaryAcctResultPO.java
View File

@ -1,7 +1,7 @@
package com.engine.salary.entity.salaryacct.po;
import com.engine.salary.annotation.Encrypt;
import com.engine.salary.elog.annotation.ElogTransform;
import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;

4
src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveListDTO.java
View File

@ -1,6 +1,7 @@
package com.engine.salary.entity.salaryarchive.dto;
import com.cloudstore.eccom.pc.table.WeaTableType;
import com.engine.salary.annotation.I18n;
import com.engine.salary.annotation.SalaryTable;
import com.engine.salary.annotation.SalaryTableOperate;
import com.engine.salary.annotation.TableTitle;
@ -42,6 +43,7 @@ public class SalaryArchiveListDTO {
* 姓名
*/
@TableTitle(title = "姓名", dataIndex = "username", key = "username")
@I18n
private String username;
/**
@ -55,12 +57,14 @@ public class SalaryArchiveListDTO {
* 分部
*/
@TableTitle(title = "分部", dataIndex = "subcompanyName", key = "subcompanyName")
@I18n
private String subcompanyName;
/**
* 部门
*/
@TableTitle(title = "部门", dataIndex = "departmentName", key = "departmentName")
@I18n
private String departmentName;
/**

2
src/com/engine/salary/entity/salaryarchive/po/SalaryArchiveItemPO.java
View File

@ -1,7 +1,7 @@
package com.engine.salary.entity.salaryarchive.po;
import com.engine.salary.annotation.Encrypt;
import com.engine.salary.elog.annotation.ElogTransform;
import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;

2
src/com/engine/salary/entity/salaryarchive/po/SalaryArchivePO.java
View File

@ -1,6 +1,6 @@
package com.engine.salary.entity.salaryarchive.po;
import com.engine.salary.elog.annotation.ElogTransform;
import com.engine.hrmelog.annotation.ElogTransform;
import com.engine.salary.enums.datacollection.DataCollectionEmployeeTypeEnum;
import com.engine.salary.enums.salaryarchive.SalaryArchiveStatusEnum;
import com.engine.salary.enums.salaryarchive.SalaryArchiveAddTypeEnum;

2
src/com/engine/salary/entity/salaryitem/po/SalaryItemPO.java
View File

@ -1,6 +1,6 @@
package com.engine.salary.entity.salaryitem.po;
import com.engine.salary.elog.annotation.ElogTransform;
import com.engine.hrmelog.annotation.ElogTransform;
import com.engine.salary.enums.SalaryRoundingModeEnum;
import com.engine.salary.enums.SalarySystemTypeEnum;
import com.engine.salary.enums.SalaryValueTypeEnum;

2
src/com/engine/salary/entity/salarysob/param/SalarySobRangeSaveParam.java
View File

@ -1,6 +1,6 @@
package com.engine.salary.entity.salarysob.param;
import com.engine.salary.elog.annotation.ElogTransform;
import com.engine.hrmelog.annotation.ElogTransform;
import com.engine.salary.enums.salarysob.SalaryEmployeeStatusEnum;
import com.engine.salary.enums.salarysob.TargetTypeEnum;
import com.engine.salary.util.valid.DataCheck;

2
src/com/engine/salary/entity/salarysob/po/SalarySobItemPO.java
View File

@ -1,6 +1,6 @@
package com.engine.salary.entity.salarysob.po;
import com.engine.salary.elog.annotation.ElogTransform;
import com.engine.hrmelog.annotation.ElogTransform;
import com.engine.salary.enums.SalaryRoundingModeEnum;
import com.engine.salary.enums.SalaryValueTypeEnum;
import lombok.AllArgsConstructor;

2
src/com/engine/salary/entity/salarysob/po/SalarySobPO.java
View File

@ -1,7 +1,7 @@
package com.engine.salary.entity.salarysob.po;
import com.engine.salary.elog.annotation.ElogTransform;
import com.engine.salary.enums.salarysob.IncomeCategoryEnum;
import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;

2
src/com/engine/salary/entity/salarysob/po/SalarySobRangePO.java
View File

@ -1,6 +1,6 @@
package com.engine.salary.entity.salarysob.po;
import com.engine.salary.elog.annotation.ElogTransform;
import com.engine.hrmelog.annotation.ElogTransform;
import com.engine.salary.enums.salarysob.SalaryEmployeeStatusEnum;
import com.engine.salary.enums.salarysob.TargetTypeEnum;
import lombok.AllArgsConstructor;

2
src/com/engine/salary/entity/siaccount/po/InsuranceAccountBatchPO.java
View File

@ -1,7 +1,7 @@
package com.engine.salary.entity.siaccount.po;
import com.engine.salary.annotation.Encrypt;
import com.engine.salary.elog.annotation.ElogTransform;
import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;

2
src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailPO.java
View File

@ -3,7 +3,7 @@ package com.engine.salary.entity.siaccount.po;
import com.cloudstore.eccom.pc.table.WeaTableType;
import com.engine.salary.annotation.Encrypt;
import com.engine.salary.annotation.SalaryTable;
import com.engine.salary.elog.annotation.ElogTransform;
import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;

2
src/com/engine/salary/entity/siaccount/po/InsuranceCompensationPO.java
View File

@ -1,6 +1,6 @@
package com.engine.salary.entity.siaccount.po;
import com.engine.salary.elog.annotation.ElogTransform;
import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;

2
src/com/engine/salary/entity/siarchives/po/InsuranceArchivesBaseInfoPO.java
View File

@ -1,6 +1,6 @@
package com.engine.salary.entity.siarchives.po;
import com.engine.salary.elog.annotation.ElogTransform;
import com.engine.hrmelog.annotation.ElogTransform;
import com.engine.salary.enums.datacollection.DataCollectionEmployeeTypeEnum;
import lombok.AllArgsConstructor;
import lombok.Builder;

2
src/com/engine/salary/entity/siarchives/po/InsuranceArchivesFundSchemePO.java
View File

@ -1,7 +1,7 @@
package com.engine.salary.entity.siarchives.po;
import com.engine.salary.annotation.Encrypt;
import com.engine.salary.elog.annotation.ElogTransform;
import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;

2
src/com/engine/salary/entity/siarchives/po/InsuranceArchivesOtherSchemePO.java
View File

@ -1,7 +1,7 @@
package com.engine.salary.entity.siarchives.po;
import com.engine.salary.annotation.Encrypt;
import com.engine.salary.elog.annotation.ElogTransform;
import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;

2
src/com/engine/salary/entity/siarchives/po/InsuranceArchivesSocialSchemePO.java
View File

@ -1,7 +1,7 @@
package com.engine.salary.entity.siarchives.po;
import com.engine.salary.annotation.Encrypt;
import com.engine.salary.elog.annotation.ElogTransform;
import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;

2
src/com/engine/salary/entity/sischeme/po/InsuranceSchemeDetailPO.java
View File

@ -1,7 +1,7 @@
package com.engine.salary.entity.sischeme.po;
import com.engine.salary.annotation.Encrypt;
import com.engine.salary.elog.annotation.ElogTransform;
import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;

2
src/com/engine/salary/entity/sischeme/po/InsuranceSchemePO.java
View File

@ -1,6 +1,6 @@
package com.engine.salary.entity.sischeme.po;
import com.engine.salary.elog.annotation.ElogTransform;
import com.engine.hrmelog.annotation.ElogTransform;
import com.engine.salary.enums.sicategory.SharedTypeEnum;
import lombok.AllArgsConstructor;
import lombok.Builder;

2
src/com/engine/salary/entity/taxagent/po/TaxAgentManageRangePO.java
View File

@ -1,6 +1,6 @@
package com.engine.salary.entity.taxagent.po;
import com.engine.salary.elog.annotation.ElogTransform;
import com.engine.hrmelog.annotation.ElogTransform;
import com.engine.salary.enums.salarysob.TargetTypeEnum;
import com.engine.salary.enums.taxagent.TaxAgentRangeTypeEnum;
import lombok.AllArgsConstructor;

2
src/com/engine/salary/entity/taxagent/po/TaxAgentPO.java
View File

@ -1,6 +1,6 @@
package com.engine.salary.entity.taxagent.po;
import com.engine.salary.elog.annotation.ElogTransform;
import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;

6
src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
View File

@ -430,7 +430,8 @@
t.fund_per_sum,t.fund_com_sum,t.other_per_sum,
t.other_com_sum,t.per_sum,t.com_sum,t.payment_organization,
t.social_payment_base_string, t.fund_payment_base_string, t.other_payment_base_string,
t.social_payment_com_base_string, t.fund_payment_com_base_string, t.other_payment_com_base_string
t.social_payment_com_base_string, t.fund_payment_com_base_string, t.other_payment_com_base_string,
t.payment_status
FROM
hrsa_bill_detail t
WHERE t.delete_type = 0
@ -445,7 +446,8 @@
t.fund_per_json,t.fund_com_json,t.other_per_json,
t.other_com_json,t.social_per_sum,t.social_com_sum,
t.fund_per_sum,t.fund_com_sum,t.other_per_sum,
t.other_com_sum,t.per_sum,t.com_sum,t.payment_organization
t.other_com_sum,t.per_sum,t.com_sum,t.payment_organization,
t.payment_status
FROM
hrsa_bill_detail t
WHERE t.delete_type = 0

2
src/com/engine/salary/report/entity/po/SalaryStatisticsItemPO.java
View File

@ -1,6 +1,6 @@
package com.engine.salary.report.entity.po;
import com.engine.salary.elog.annotation.ElogTransform;
import com.engine.hrmelog.annotation.ElogTransform;
import com.engine.salary.report.enums.UnitTypeEnum;
import lombok.*;

2
src/com/engine/salary/report/entity/po/SalaryStatisticsReportPO.java
View File

@ -1,6 +1,6 @@
package com.engine.salary.report.entity.po;
import com.engine.salary.elog.annotation.ElogTransform;
import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;

2
src/com/engine/salary/report/service/impl/SalaryStatisticsItemServiceImpl.java
View File

@ -3,7 +3,7 @@ package com.engine.salary.report.service.impl;
import com.engine.core.impl.Service;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.enums.OperateTypeEnum;
import com.engine.salary.enums.sicategory.DeleteTypeEnum;
import com.engine.salary.exception.SalaryRunTimeException;

2
src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
View File

@ -6,7 +6,7 @@ import com.engine.core.impl.Service;
import com.engine.salary.cache.SalaryCacheKey;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.hrm.dto.EmployeeInfoExpandDTO;
import com.engine.salary.entity.hrm.dto.FieldSetting;

2
src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
View File

@ -11,7 +11,7 @@ import com.engine.salary.cache.SalaryCacheKey;
import com.engine.salary.component.WeaFormOption;
import com.engine.salary.component.WeaTableColumnGroup;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.salaryitem.po.SalaryItemPO;
import com.engine.salary.enums.OperateTypeEnum;
import com.engine.salary.exception.SalaryRunTimeException;

2
src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
View File

@ -13,7 +13,7 @@ import com.engine.core.impl.Service;
import com.engine.salary.biz.AddUpDeductionBiz;
import com.engine.salary.common.LocalDateRange;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.constant.SzyhApiConstant;
import com.engine.salary.encrypt.EncryptUtil;
import com.engine.salary.entity.datacollection.AddUpDeduction;

2
src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
View File

@ -11,7 +11,7 @@ import com.engine.core.impl.Service;
import com.engine.salary.biz.AddUpSituationBiz;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SzyhApiConstant;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.encrypt.EncryptUtil;
import com.engine.salary.entity.datacollection.AddUpSituation;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;

2
src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
View File

@ -15,7 +15,7 @@ import com.engine.salary.biz.AttendQuoteFieldBiz;
import com.engine.salary.common.LocalDateRange;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.datacollection.bo.AttendQuoteDataBO;
import com.engine.salary.entity.datacollection.dto.*;

2
src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java
View File

@ -6,7 +6,7 @@ import com.engine.core.impl.Service;
import com.engine.salary.biz.AttendQuoteFieldBiz;
import com.engine.salary.component.SalaryWeaTable;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.datacollection.dto.AttendQuoteFieldListDTO;
import com.engine.salary.entity.datacollection.param.AttendQuoteFieldQueryParam;
import com.engine.salary.entity.datacollection.param.AttendQuoteFieldSaveParam;

2
src/com/engine/salary/service/impl/ExtEmpServiceImpl.java
View File

@ -3,7 +3,7 @@ package com.engine.salary.service.impl;
import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.extemp.param.ExtEmpImportParam;
import com.engine.salary.entity.extemp.param.ExtEmpQueryParam;

2
src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
View File

@ -7,7 +7,7 @@ import com.engine.core.impl.Service;
import com.engine.salary.biz.OtherDeductionBiz;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.encrypt.EncryptUtil;
import com.engine.salary.entity.datacollection.AddUpDeduction;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;

2
src/com/engine/salary/service/impl/SIAccountServiceImpl.java
View File

@ -16,7 +16,7 @@ import com.engine.salary.cache.SalaryCacheKey;
import com.engine.salary.component.SalaryWeaTable;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.constant.SalaryItemConstant;
import com.engine.salary.encrypt.EncryptUtil;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;

2
src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
View File

@ -20,7 +20,7 @@ import com.engine.salary.cmd.siarchives.SIArchivesTipsCmd;
import com.engine.salary.common.SalaryContext;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.encrypt.EncryptUtil;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.siarchives.bo.InsuranceArchivesBO;

2
src/com/engine/salary/service/impl/SIBalanceServiceImpl.java
View File

@ -6,7 +6,7 @@ import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.encrypt.EncryptUtil;
import com.engine.salary.entity.siaccount.param.BalanceAccountBaseParam;
import com.engine.salary.entity.siaccount.param.EditAccountDetailParam;

2
src/com/engine/salary/service/impl/SICategoryServiceImpl.java
View File

@ -7,7 +7,7 @@ import com.api.browser.util.ConditionType;
import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.encrypt.EncryptUtil;
import com.engine.salary.entity.siaccount.po.InsuranceAccountDetailPO;
import com.engine.salary.entity.sicategory.bo.ICategoryBO;

2
src/com/engine/salary/service/impl/SICompensationServiceImpl.java
View File

@ -8,7 +8,7 @@ import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.encrypt.EncryptUtil;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.hrm.dto.HrmInfoDTO;

2
src/com/engine/salary/service/impl/SIExportServiceImpl.java
View File

@ -6,7 +6,7 @@ import com.cloudstore.eccom.pc.table.WeaTableColumn;
import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.encrypt.EncryptUtil;
import com.engine.salary.entity.siaccount.dto.InsuranceAccountViewListDTO;
import com.engine.salary.entity.siaccount.param.InsuranceAccountDetailParam;

2
src/com/engine/salary/service/impl/SIRecessionServiceImpl.java
View File

@ -5,7 +5,7 @@ import com.api.formmode.mybatis.util.SqlProxyHandle;
import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.encrypt.EncryptUtil;
import com.engine.salary.entity.hrm.dto.HrmInfoDTO;
import com.engine.salary.entity.hrm.param.HrmQueryParam;

2
src/com/engine/salary/service/impl/SISchemeServiceImpl.java
View File

@ -10,7 +10,7 @@ import com.engine.core.impl.Service;
import com.engine.salary.component.SalaryWeaTable;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.encrypt.EncryptUtil;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.siarchives.param.InsuranceArchivesListParam;

2
src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
View File

@ -7,7 +7,7 @@ import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.salaryacct.bo.SalaryAcctEmployeeBO;
import com.engine.salary.entity.salaryacct.dto.SalaryAcctEmployeeCountDTO;

6
src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
View File

@ -8,7 +8,7 @@ import com.engine.salary.component.WeaTableColumnGroup;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
import com.engine.salary.constant.SalaryItemConstant;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.report.po.SalaryAcctResultReportPO;
import com.engine.salary.entity.salaryacct.bo.SalaryAcctEmployeeBO;
@ -1225,7 +1225,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
if (StringUtils.equals("importExcelAcctResult", importType)
&& (employeeId != null && employeeId > 0)
&& (taxAgentId != null && taxAgentId > 0)
&& i == data.size() - 1
&& j == headers.size() - 1
&& !salaryAcctEmployeeMap.containsKey(employeeId + "-" + taxAgentId)) {
isError = true;
Map<String, String> errorMessageMap = Maps.newHashMap();
@ -1238,7 +1238,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
if (StringUtils.equals("importSalaryAcctResult", importType)
&& (employeeId != null && employeeId > 0)
&& (taxAgentId != null && taxAgentId > 0)
&& i == data.size() - 1
&& j == headers.size() - 1
&& !salaryAcctEmployeeMap.containsKey(employeeId + "-" + taxAgentId)) {
isError = true;
Map<String, String> errorMessageMap = Maps.newHashMap();

2
src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
View File

@ -9,7 +9,7 @@ import com.engine.salary.constant.SalaryDefaultTenantConstant;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.report.po.SalaryAcctResultReportPO;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.salaryBill.po.SalarySendPO;
import com.engine.salary.entity.salaryacct.bo.SalaryAcctRecordBO;
import com.engine.salary.entity.salaryacct.param.SalaryAcctRecordQueryParam;

4
src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
View File

@ -6,8 +6,8 @@ import com.engine.salary.cache.SalaryCacheKey;
import com.engine.salary.common.LocalDateRange;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.salary.elog.util.LoggerTemplate;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.hrmelog.util.LoggerTemplate;
import com.engine.salary.encrypt.EncryptUtil;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.datacollection.dto.AttendQuoteFieldListDTO;

27
src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
View File

@ -2,7 +2,8 @@ package com.engine.salary.service.impl;
import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.biz.*;
import com.engine.salary.biz.SalaryArchiveBiz;
import com.engine.salary.biz.SalaryArchiveItemBiz;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
import com.engine.salary.constant.SalaryItemConstant;
@ -24,7 +25,6 @@ import com.engine.salary.enums.datacollection.UseEmployeeTypeEnum;
import com.engine.salary.enums.salaryarchive.SalaryArchiveImportTypeEnum;
import com.engine.salary.enums.salaryarchive.SalaryArchiveListTypeEnum;
import com.engine.salary.enums.salaryarchive.SalaryArchiveStatusEnum;
import com.engine.salary.mapper.archive.SalaryArchiveMapper;
import com.engine.salary.service.*;
import com.engine.salary.sys.entity.po.SalarySysConfPO;
import com.engine.salary.sys.service.SalarySysConfService;
@ -32,7 +32,6 @@ import com.engine.salary.sys.service.impl.SalarySysConfServiceImpl;
import com.engine.salary.util.SalaryEntityUtil;
import com.engine.salary.util.SalaryI18nUtil;
import com.engine.salary.util.SalaryLoggerUtil;
import com.engine.salary.util.db.MapperProxyFactory;
import com.engine.salary.util.excel.ExcelComment;
import com.engine.salary.util.excel.ExcelParseHelper;
import com.engine.salary.util.excel.ExcelSupport;
@ -43,8 +42,6 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.util.IOUtils;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import weaver.file.ImageFileManager;
import weaver.general.Util;
import weaver.hrm.User;
@ -62,12 +59,6 @@ import static com.engine.salary.util.excel.ExcelSupport.EXCEL_TYPE_XLSX;
*/
public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArchiveExcelService {
private static final Logger log = LoggerFactory.getLogger(SalaryArchiveExcelServiceImpl.class);
private SalaryArchiveMapper getSalaryArchiveMapper() {
return MapperProxyFactory.getProxy(SalaryArchiveMapper.class);
}
private SalaryArchiveItemService salaryArchiveItemService(User user) {
return ServiceUtil.getService(SalaryArchiveItemServiceImpl.class, user);
}
@ -100,9 +91,6 @@ public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArch
private SalaryArchiveBiz salaryArchiveMapper = new SalaryArchiveBiz();
private SalaryArchiveItemBiz salaryArchiveItemMapper = new SalaryArchiveItemBiz();
private SalaryArchiveTaxAgentBiz salaryArchiveTaxAgentMapper = new SalaryArchiveTaxAgentBiz();
private SalaryArchiveDimissionBiz salaryArchiveDimissionMapper = new SalaryArchiveDimissionBiz();
private SalaryItemBiz salaryItemMapper = new SalaryItemBiz();
// private SalaryArchiveSobService salaryArchiveSobService;
//
@ -322,14 +310,7 @@ public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArch
rows.add(header);
// 获取所有个税扣缴义务人
Collection<TaxAgentPO> taxAgentList = getTaxAgentService(user).listAll();
Collection<SalaryArchiveListDTO> salaryArchives = new ArrayList<>();
if (queryParam.isExtSalaryArchiveList()) {
//非系统人员档案
salaryArchives = getSalaryArchiveMapper().listExtSalaryArchive(queryParam);
} else {
salaryArchives = getSalaryArchiveMapper().list(queryParam);
}
Collection<SalaryArchiveListDTO> salaryArchives = salaryArchiveService(user).getSalaryArchiveList(queryParam);
long employeeId = user.getUID();
if (getTaxAgentService(user).isNeedAuth(employeeId)) {
@ -841,7 +822,7 @@ public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArch
// 修改薪资档案
if (CollectionUtils.isNotEmpty(salaryArchiveUpdates)) {
// 查询更新前档案信息
List<SalaryArchivePO> oldArchive = getSalaryArchiveMapper().listSome(SalaryArchivePO.builder().ids(salaryArchiveUpdates.stream().map(SalaryArchivePO::getId).collect(Collectors.toList())).build());
List<SalaryArchivePO> oldArchive = salaryArchiveService(user).listSome(SalaryArchivePO.builder().ids(salaryArchiveUpdates.stream().map(SalaryArchivePO::getId).collect(Collectors.toList())).build());
Map<Long, SalaryArchivePO> oldArchiveMap = SalaryEntityUtil.convert2Map(oldArchive, SalaryArchivePO::getId);
// 薪资档案
salaryArchiveMapper.batchUpdate(salaryArchiveUpdates);

6
src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
View File

@ -8,7 +8,7 @@ import com.engine.salary.common.LocalDateRange;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
import com.engine.salary.constant.SalaryItemConstant;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.datacollection.AddUpSituation;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.salaryarchive.bo.SalaryArchiveBO;
@ -180,7 +180,9 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
if (Objects.nonNull(queryParam.getPayEndDateEndDateStr())) {
queryParam.setPayEndDateEndDate(SalaryDateUtil.stringToDate(queryParam.getPayEndDateEndDateStr()));
}
return getSalaryArchiveMapper().list(queryParam);
List<SalaryArchiveListDTO> list = getSalaryArchiveMapper().list(queryParam);
return SalaryI18nUtil.i18nList(list);
}
@Override

2
src/com/engine/salary/service/impl/SalaryBillServiceImpl.java
View File

@ -10,7 +10,7 @@ import com.engine.salary.biz.SalarySendInfoBiz;
import com.engine.salary.cache.SalaryCacheKey;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.HrmSalaryPayrollConf;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.progress.ProgressDTO;
import com.engine.salary.entity.salaryBill.bo.SalaryBillBO;

33
src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
View File

@ -28,6 +28,7 @@ import com.engine.salary.service.SalarySobExtRangeService;
import com.engine.salary.service.SalarySobRangeService;
import com.engine.salary.sys.entity.po.SalarySysConfPO;
import com.engine.salary.util.SalaryEntityUtil;
import com.engine.salary.util.SalaryI18nUtil;
import com.engine.salary.util.db.IdGenerator;
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
@ -96,6 +97,7 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee
result.addAll(employBiz.listAll());
result.addAll(getExtEmpService(user).listEmployee());
}
SalaryI18nUtil.i18nList(result);
return result;
}
@ -105,6 +107,7 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee
if (openExtEmp) {
result.addAll(getExtEmpService(user).listAllForReport());
}
SalaryI18nUtil.i18nList(result);
return result;
}
@ -150,7 +153,7 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee
includeSalaryEmployees.addAll(extEmps);
}
SalaryI18nUtil.i18nList(includeSalaryEmployees);
return includeSalaryEmployees;
}
@ -163,6 +166,7 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee
if (openExtEmp) {
employeeList.addAll(getExtEmpService(user).getEmployeeByIds(ids));
}
SalaryI18nUtil.i18nList(employeeList);
return employeeList;
}
@ -176,18 +180,20 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee
result.addAll(getExtEmpService(user).getEmployeeByIds(ids));
}
result.addAll(employBiz.getEmployeeByIdsAll(ids));
SalaryI18nUtil.i18nList(result);
return result;
}
@Override
public DataCollectionEmployee getEmployeeById(Long employeeId) {
if (openExtEmp) {
DataCollectionEmployee employeeById = getExtEmpService(user).getEmployeeById(employeeId);
if (Objects.nonNull(employeeById)) {
return employeeById;
DataCollectionEmployee employee = getExtEmpService(user).getEmployeeById(employeeId);
if (Objects.nonNull(employee)) {
return SalaryI18nUtil.i18n(employee);
}
}
return employBiz.getEmployeeById(employeeId);
DataCollectionEmployee employee = employBiz.getEmployeeById(employeeId);
return SalaryI18nUtil.i18n(employee);
}
@Override
@ -203,8 +209,7 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee
employeeList.addAll(getExtEmpService(user).getEmployeeByIds(longs));
}
}
return employeeList;
return SalaryI18nUtil.i18nList(employeeList);
}
@ -219,7 +224,7 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee
.filter(e -> UserStatusEnum.getNormalStatus().contains(e.getStatus()))
.collect(Collectors.toList());
return employeeSameIds;
return SalaryI18nUtil.i18nList(employeeSameIds);
}
@Override
@ -242,7 +247,7 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee
.collect(Collectors.toList());
}
return employees;
return SalaryI18nUtil.i18nList(employees);
}
@ -265,12 +270,12 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee
@Override
public List<SubCompanyInfo> getSubCompanyInfoList(List<Long> subDepartmentIds) {
return employBiz.getSubCompanyInfoList(subDepartmentIds);
return SalaryI18nUtil.i18nList(employBiz.getSubCompanyInfoList(subDepartmentIds));
}
@Override
public List<PositionInfo> listPositionInfo(List<Long> positionIds) {
return employBiz.listPositionInfo(positionIds);
return SalaryI18nUtil.i18nList(employBiz.listPositionInfo(positionIds));
}
@Override
@ -279,7 +284,7 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee
if (openExtEmp) {
result.addAll(getExtEmpService(user).listEmployee());
}
return result;
return SalaryI18nUtil.i18nList(result);
}
@Override
@ -288,7 +293,7 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee
if (openExtEmp) {
result.addAll(getExtEmpService(user).listByParams(includeQueryParams));
}
return result;
return SalaryI18nUtil.i18nList(result);
}
/**
@ -332,7 +337,7 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee
.forEach(e -> e.setExtendData(extendData));
}
}
return employees;
return SalaryI18nUtil.i18nList(employees);
}
@Override

2
src/com/engine/salary/service/impl/SalaryItemServiceImpl.java
View File

@ -6,7 +6,7 @@ import com.engine.core.impl.Service;
import com.engine.salary.biz.SalaryItemBiz;
import com.engine.salary.biz.SysSalaryItemBiz;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.salaryformula.po.FormulaPO;
import com.engine.salary.entity.salaryformula.po.FormulaVar;
import com.engine.salary.entity.salaryitem.bo.SalaryItemBO;

2
src/com/engine/salary/service/impl/SalarySendServiceImpl.java
View File

@ -15,7 +15,7 @@ import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryArchiveConstant;
import com.engine.salary.constant.SalaryItemConstant;
import com.engine.salary.constant.SalaryTemplateSalaryItemSetGroupConstant;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.encrypt.EncryptUtil;
import com.engine.salary.entity.datacollection.AddUpSituation;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;

2
src/com/engine/salary/service/impl/SalarySobAdjustRuleServiceImpl.java
View File

@ -3,7 +3,7 @@ package com.engine.salary.service.impl;
import com.engine.core.impl.Service;
import com.engine.salary.biz.SalarySobAdjustRuleBiz;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.salarysob.bo.SalarySobAdjustRuleBO;
import com.engine.salary.entity.salarysob.param.SalarySobAdjustRuleSaveParam;
import com.engine.salary.entity.salarysob.po.SalarySobAdjustRulePO;

2
src/com/engine/salary/service/impl/SalarySobCheckRuleServiceImpl.java
View File

@ -4,7 +4,7 @@ import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.biz.SalarySobCheckRuleBiz;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.salarysob.bo.SalarySobCheckRuleBO;
import com.engine.salary.entity.salarysob.param.SalarySobCheckRuleQueryParam;
import com.engine.salary.entity.salarysob.param.SalarySobCheckRuleSaveParam;

2
src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
View File

@ -8,9 +8,9 @@ import com.engine.salary.biz.SalarySobItemGroupBiz;
import com.engine.salary.biz.SalarySobItemHideBiz;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.salary.entity.salaryacct.bo.SalaryAcctCalculatePriorityBO;
import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.salaryformula.ExpressFormula;
import com.engine.salary.entity.salaryformula.po.FormulaVar;
import com.engine.salary.entity.salaryitem.po.SalaryItemPO;

2
src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java
View File

@ -7,7 +7,7 @@ import com.engine.hrm.biz.OrganizationShowSetBiz;
import com.engine.salary.biz.SalarySobRangeBiz;
import com.engine.salary.biz.SpecialAddDeductionBiz;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.hrm.DeptInfo;
import com.engine.salary.entity.hrm.PositionInfo;

2
src/com/engine/salary/service/impl/SalarySobServiceImpl.java
View File

@ -5,7 +5,7 @@ import com.engine.core.impl.Service;
import com.engine.salary.biz.*;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.salaryBill.po.SalaryTemplatePO;
import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO;
import com.engine.salary.entity.salaryitem.bo.SysSalaryItemBO;

2
src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java
View File

@ -9,7 +9,7 @@ import com.engine.core.impl.Service;
import com.engine.salary.biz.SalarySobBiz;
import com.engine.salary.biz.SalaryTemplateBiz;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.salaryBill.bo.SalaryTemplateBO;
import com.engine.salary.entity.salaryBill.dto.SalaryTemplateListDTO;
import com.engine.salary.entity.salaryBill.dto.SalaryTemplateSalaryItemListDTO;

2
src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java
View File

@ -6,7 +6,7 @@ import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.biz.SpecialAddDeductionBiz;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.encrypt.EncryptUtil;
import com.engine.salary.entity.datacollection.AddUpDeduction;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;

2
src/com/engine/salary/service/impl/SysSalaryItemServiceImpl.java
View File

@ -4,7 +4,7 @@ import com.engine.core.impl.Service;
import com.engine.salary.biz.SalaryItemBiz;
import com.engine.salary.biz.SysSalaryItemBiz;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.salaryitem.bo.SysSalaryItemBO;
import com.engine.salary.entity.salaryitem.po.SalaryItemPO;
import com.engine.salary.entity.salaryitem.po.SysSalaryItemPO;

2
src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
View File

@ -6,7 +6,7 @@ import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryAuthConstant;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.datacollection.AddUpDeduction;
import com.engine.salary.entity.datacollection.AddUpSituation;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;

1
src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
View File

@ -7,6 +7,7 @@ import com.engine.core.impl.Service;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.taxagent.po.TaxAgentPO;
import com.engine.salary.entity.taxdeclaration.dto.AbnormalEmployeeListDTO;
import com.engine.salary.entity.taxdeclaration.dto.FailEmployeeListDTO;

2
src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
View File

@ -6,7 +6,7 @@ import com.engine.salary.common.LocalDateRange;
import com.engine.salary.common.YearMonthRange;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO;
import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO;
import com.engine.salary.entity.salaryitem.po.SalaryItemPO;

75
src/com/engine/salary/util/SalaryI18nUtil.java
View File

@ -1,5 +1,18 @@
package com.engine.salary.util;
import com.engine.salary.annotation.I18n;
import com.engine.salary.exception.SalaryRunTimeException;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.jetbrains.annotations.NotNull;
import weaver.general.Util;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
/**
* 多语言工具类
* <p>Copyright: Copyright (c) 2022</p>
@ -10,6 +23,68 @@ package com.engine.salary.util;
**/
public class SalaryI18nUtil {
public static <T> T i18n(T data) {
if (data == null ) {
return data;
}
try {
List<Field> fieldList = getFields(data.getClass());
if (CollectionUtils.isNotEmpty(fieldList)) {
for (Field field : fieldList) {
field.setAccessible(true);
String fieldValue = (String) field.get(data);
if (StringUtils.isNotBlank(fieldValue)) {
String encryptValue = Util.formatMultiLang(fieldValue);
field.set(data, encryptValue);
}
}
}
return data;
} catch (Exception e) {
throw new SalaryRunTimeException("国际化解析异常");
}
}
public static <T> List<T> i18nList(List<T> dataList) {
if (CollectionUtils.isEmpty(dataList) ) {
return dataList;
}
try {
List<Field> fieldList = getFields(dataList.get(0).getClass());
if (CollectionUtils.isNotEmpty(fieldList)) {
for (T data : dataList) {
for (Field field : fieldList) {
field.setAccessible(true);
String fieldValue = (String) field.get(data);
if (StringUtils.isNotBlank(fieldValue)) {
String encryptValue = Util.formatMultiLang(fieldValue);
field.set(data, encryptValue);
}
}
}
}
return dataList;
} catch (Exception e) {
throw new SalaryRunTimeException("国际化批量解析异常");
}
}
@NotNull
private static <T> List<Field> getFields(Class<T> clazz) {
List<Class<?>> allClasses = new ArrayList<Class<?>>();
for (Class<?> superClass = clazz; superClass != null; superClass = superClass.getSuperclass()) {
if (superClass != Object.class) {
allClasses.add(superClass);
}
}
return allClasses.stream()
.map(Class::getDeclaredFields)
.flatMap(Arrays::stream)
.filter(field -> field.isAnnotationPresent(I18n.class)).collect(Collectors.toList());
}
/**
* 获取多语言信息
*

4
src/com/engine/salary/util/SalaryLoggerUtil.java
View File

@ -1,8 +1,8 @@
package com.engine.salary.util;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.salary.elog.util.LoggerTemplate;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.hrmelog.util.LoggerTemplate;
import com.engine.salary.enums.OperateTypeEnum;
import weaver.hrm.User;

2
src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java
View File

@ -3,7 +3,7 @@ package com.engine.salary.wrapper;
import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveItemFormDTO;
import com.engine.salary.entity.salaryarchive.dto.SalaryItemAdjustRecordListDTO;

4
src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
View File

@ -6,7 +6,7 @@ import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.component.SalaryWeaTable;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.salaryarchive.bo.SalaryArchiveBO;
import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveBaseInfoFormDTO;
@ -459,7 +459,7 @@ public class SalaryArchiveWrapper extends Service {
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(109712, "列表类型必传"));
} else {
// 定薪列表导入有调薪导入和初始化导入
if (queryParam.getListType().equals(SalaryArchiveListTypeEnum.FIXED.getValue())) {
if (queryParam.getListType().equals(SalaryArchiveListTypeEnum.FIXED)) {
Optional<SalaryArchiveImportTypeEnum> optional = Arrays.stream(SalaryArchiveImportTypeEnum.values())
.filter(e -> StringUtils.isNotEmpty(queryParam.getImportType()) && e.getValue().equals(queryParam.getImportType())).findFirst();
if (!optional.isPresent()) {

2
src/com/engine/salary/wrapper/SalaryFieldWrapper.java
View File

@ -3,7 +3,7 @@ package com.engine.salary.wrapper;
import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.salaryformula.ExpressFormula;
import com.engine.salary.entity.salaryitem.bo.SalaryItemBO;
import com.engine.salary.entity.salaryitem.dto.SalaryFieldListDTO;

2
src/com/engine/salary/wrapper/SalaryItemWrapper.java
View File

@ -4,7 +4,7 @@ import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.component.WeaFormOption;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.elog.entity.dto.LoggerContext;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.salaryformula.ExpressFormula;
import com.engine.salary.entity.salaryitem.bo.SalaryItemBO;
import com.engine.salary.entity.salaryitem.bo.SysSalaryItemBO;