diff --git a/resource/WEB-INF/config/mapper/hrmelog/ElogTableCheckerMapper.xml b/resource/WEB-INF/config/mapper/hrmelog/ElogTableCheckerMapper.xml
new file mode 100644
index 000000000..cbf1e900d
--- /dev/null
+++ b/resource/WEB-INF/config/mapper/hrmelog/ElogTableCheckerMapper.xml
@@ -0,0 +1,451 @@
+
+
+
+
+ insert into hrsa_elog_version (id, maintable, version) values (#{id},#{mainTable},#{version})
+
+
+
+ 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)
+ )
+
+
+
+ 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)
+ )
+
+
+ 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
+ )
+
+
+ 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
+ )
+
+
+ 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
+ )
+
+
+ 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
+ )
+
+
+ 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
+ )
+
+
+ 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
+ )
+
+
+
+
+
+
+
+
+
+
+ ${createElogSql}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ create index idx${id} on ${tableName} (${columnName})
+
+
+
+ create index idx${id} on ${tableName} (${columnName})
+
+
+
+ create index idx${id} on ${tableName} (${columnName})
+
+
+
+
+
+
+
+
+
+
diff --git a/resource/WEB-INF/config/mapper/hrmelog/LocalElogAopDaoMapper.xml b/resource/WEB-INF/config/mapper/hrmelog/LocalElogAopDaoMapper.xml
new file mode 100644
index 000000000..8fcc1b9c1
--- /dev/null
+++ b/resource/WEB-INF/config/mapper/hrmelog/LocalElogAopDaoMapper.xml
@@ -0,0 +1,170 @@
+
+
+
+
+
+ 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 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})
+
+
+ ${sql}
+
+
+
+
+
+
+
+ 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})
+
+
+
+
+
+ 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}
+ )
+
+
+
+
+ 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
+
+ ( #{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})
+
+
+
+
+ update ${tableName}
+ set delete_type = 3
+ where id = #{id}
+
+
+ update ${tableName}
+ set delete_type = 3
+ where mainid = #{mainid}
+
+
+
+ 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)
+
+ 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
+
+
+
+
+ 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})
+
+ 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
+
+
+
+
diff --git a/resource/WEB-INF/config/mapper/hrmelog/LocalElogDaoMapper.xml b/resource/WEB-INF/config/mapper/hrmelog/LocalElogDaoMapper.xml
new file mode 100644
index 000000000..2c1f0f427
--- /dev/null
+++ b/resource/WEB-INF/config/mapper/hrmelog/LocalElogDaoMapper.xml
@@ -0,0 +1,412 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resource/WEB-INF/config/mapper/hrmelog/QueryCurretValusMapper.xml b/resource/WEB-INF/config/mapper/hrmelog/QueryCurretValusMapper.xml
new file mode 100644
index 000000000..b88e3cfee
--- /dev/null
+++ b/resource/WEB-INF/config/mapper/hrmelog/QueryCurretValusMapper.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resource/WEB-INF/lib/hrmelog.jar b/resource/WEB-INF/lib/hrmelog.jar
index 633076bbe..b1ce56c11 100644
Binary files a/resource/WEB-INF/lib/hrmelog.jar and b/resource/WEB-INF/lib/hrmelog.jar differ
diff --git a/resource/WEB-INF/prop/hrmSalaryBillToken.properties b/resource/wiki/扩展功能/hrmSalaryBillToken.properties
similarity index 100%
rename from resource/WEB-INF/prop/hrmSalaryBillToken.properties
rename to resource/wiki/扩展功能/hrmSalaryBillToken.properties
diff --git a/resource/WEB-INF/prop/hrmSalaryCustom.properties b/resource/wiki/扩展功能/hrmSalaryCustom.properties
similarity index 100%
rename from resource/WEB-INF/prop/hrmSalaryCustom.properties
rename to resource/wiki/扩展功能/hrmSalaryCustom.properties
diff --git a/resource/WEB-INF/prop/hrmSalaryPayroll.properties b/resource/wiki/扩展功能/hrmSalaryPayroll.properties
similarity index 100%
rename from resource/WEB-INF/prop/hrmSalaryPayroll.properties
rename to resource/wiki/扩展功能/hrmSalaryPayroll.properties
diff --git a/src/com/engine/salary/annotation/I18n.java b/src/com/engine/salary/annotation/I18n.java
new file mode 100644
index 000000000..ca9b71fd8
--- /dev/null
+++ b/src/com/engine/salary/annotation/I18n.java
@@ -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;
+
+/**
+ * 国际化标识
+ * Copyright: Copyright (c) 2024
+ * Company: 泛微软件
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface I18n {
+
+}
diff --git a/src/com/engine/salary/biz/OtherDeductionBiz.java b/src/com/engine/salary/biz/OtherDeductionBiz.java
index b56e4f57c..175a65c40 100644
--- a/src/com/engine/salary/biz/OtherDeductionBiz.java
+++ b/src/com/engine/salary/biz/OtherDeductionBiz.java
@@ -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;
diff --git a/src/com/engine/salary/biz/SpecialAddDeductionBiz.java b/src/com/engine/salary/biz/SpecialAddDeductionBiz.java
index bf6f87f0a..a2203e89f 100644
--- a/src/com/engine/salary/biz/SpecialAddDeductionBiz.java
+++ b/src/com/engine/salary/biz/SpecialAddDeductionBiz.java
@@ -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;
diff --git a/src/com/engine/salary/config/SalaryElogConfig.java b/src/com/engine/salary/config/SalaryElogConfig.java
index 6d41b6af8..7d9f79321 100644
--- a/src/com/engine/salary/config/SalaryElogConfig.java
+++ b/src/com/engine/salary/config/SalaryElogConfig.java
@@ -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日志
diff --git a/src/com/engine/salary/entity/datacollection/AddUpDeduction.java b/src/com/engine/salary/entity/datacollection/AddUpDeduction.java
index 36d769602..9a2213a0e 100644
--- a/src/com/engine/salary/entity/datacollection/AddUpDeduction.java
+++ b/src/com/engine/salary/entity/datacollection/AddUpDeduction.java
@@ -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;
diff --git a/src/com/engine/salary/entity/datacollection/AddUpSituation.java b/src/com/engine/salary/entity/datacollection/AddUpSituation.java
index e2daff6ab..96c6b8945 100644
--- a/src/com/engine/salary/entity/datacollection/AddUpSituation.java
+++ b/src/com/engine/salary/entity/datacollection/AddUpSituation.java
@@ -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;
diff --git a/src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java b/src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java
index 7d83f0348..66e581915 100644
--- a/src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java
+++ b/src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java
@@ -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;
diff --git a/src/com/engine/salary/entity/datacollection/po/AttendQuoteFieldPO.java b/src/com/engine/salary/entity/datacollection/po/AttendQuoteFieldPO.java
index dd14545f8..a237aa48f 100644
--- a/src/com/engine/salary/entity/datacollection/po/AttendQuoteFieldPO.java
+++ b/src/com/engine/salary/entity/datacollection/po/AttendQuoteFieldPO.java
@@ -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;
diff --git a/src/com/engine/salary/entity/datacollection/po/AttendQuotePO.java b/src/com/engine/salary/entity/datacollection/po/AttendQuotePO.java
index 5dd26b136..133e3f788 100644
--- a/src/com/engine/salary/entity/datacollection/po/AttendQuotePO.java
+++ b/src/com/engine/salary/entity/datacollection/po/AttendQuotePO.java
@@ -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;
diff --git a/src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java b/src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java
index 4a0b5d443..83f1ec932 100644
--- a/src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java
+++ b/src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java
@@ -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;
diff --git a/src/com/engine/salary/entity/datacollection/po/SpecialAddDeductionPO.java b/src/com/engine/salary/entity/datacollection/po/SpecialAddDeductionPO.java
index c6922d229..1fbc59823 100644
--- a/src/com/engine/salary/entity/datacollection/po/SpecialAddDeductionPO.java
+++ b/src/com/engine/salary/entity/datacollection/po/SpecialAddDeductionPO.java
@@ -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;
diff --git a/src/com/engine/salary/entity/extemp/po/ExtEmpPO.java b/src/com/engine/salary/entity/extemp/po/ExtEmpPO.java
index e936ccf79..e7b73d457 100644
--- a/src/com/engine/salary/entity/extemp/po/ExtEmpPO.java
+++ b/src/com/engine/salary/entity/extemp/po/ExtEmpPO.java
@@ -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;
diff --git a/src/com/engine/salary/entity/hrm/PositionInfo.java b/src/com/engine/salary/entity/hrm/PositionInfo.java
index b88828139..2eb787624 100644
--- a/src/com/engine/salary/entity/hrm/PositionInfo.java
+++ b/src/com/engine/salary/entity/hrm/PositionInfo.java
@@ -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;
diff --git a/src/com/engine/salary/entity/hrm/SubCompanyInfo.java b/src/com/engine/salary/entity/hrm/SubCompanyInfo.java
index 84fb417f9..e9e2637d3 100644
--- a/src/com/engine/salary/entity/hrm/SubCompanyInfo.java
+++ b/src/com/engine/salary/entity/hrm/SubCompanyInfo.java
@@ -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;
}
diff --git a/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateListDTO.java b/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateListDTO.java
index 751fef2ac..3538a3387 100644
--- a/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateListDTO.java
+++ b/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateListDTO.java
@@ -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;
diff --git a/src/com/engine/salary/entity/salaryBill/po/SalarySendPO.java b/src/com/engine/salary/entity/salaryBill/po/SalarySendPO.java
index 755241ea3..7249346b6 100644
--- a/src/com/engine/salary/entity/salaryBill/po/SalarySendPO.java
+++ b/src/com/engine/salary/entity/salaryBill/po/SalarySendPO.java
@@ -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;
diff --git a/src/com/engine/salary/entity/salaryBill/po/SalaryTemplatePO.java b/src/com/engine/salary/entity/salaryBill/po/SalaryTemplatePO.java
index c13e72c76..825f82759 100644
--- a/src/com/engine/salary/entity/salaryBill/po/SalaryTemplatePO.java
+++ b/src/com/engine/salary/entity/salaryBill/po/SalaryTemplatePO.java
@@ -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;
diff --git a/src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java b/src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java
index 95ff5e52a..f46c43f34 100644
--- a/src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java
+++ b/src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java
@@ -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;
diff --git a/src/com/engine/salary/entity/salaryacct/po/SalaryAcctRecordPO.java b/src/com/engine/salary/entity/salaryacct/po/SalaryAcctRecordPO.java
index e1a3f060e..adf69f57b 100644
--- a/src/com/engine/salary/entity/salaryacct/po/SalaryAcctRecordPO.java
+++ b/src/com/engine/salary/entity/salaryacct/po/SalaryAcctRecordPO.java
@@ -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;
diff --git a/src/com/engine/salary/entity/salaryacct/po/SalaryAcctResultPO.java b/src/com/engine/salary/entity/salaryacct/po/SalaryAcctResultPO.java
index 316a78944..4df634452 100644
--- a/src/com/engine/salary/entity/salaryacct/po/SalaryAcctResultPO.java
+++ b/src/com/engine/salary/entity/salaryacct/po/SalaryAcctResultPO.java
@@ -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;
diff --git a/src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveListDTO.java b/src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveListDTO.java
index 107b71b50..82b97bf05 100644
--- a/src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveListDTO.java
+++ b/src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveListDTO.java
@@ -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;
/**
diff --git a/src/com/engine/salary/entity/salaryarchive/po/SalaryArchiveItemPO.java b/src/com/engine/salary/entity/salaryarchive/po/SalaryArchiveItemPO.java
index c4b689e7d..782d34348 100644
--- a/src/com/engine/salary/entity/salaryarchive/po/SalaryArchiveItemPO.java
+++ b/src/com/engine/salary/entity/salaryarchive/po/SalaryArchiveItemPO.java
@@ -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;
diff --git a/src/com/engine/salary/entity/salaryarchive/po/SalaryArchivePO.java b/src/com/engine/salary/entity/salaryarchive/po/SalaryArchivePO.java
index 25d4dbdd6..a1762c54b 100644
--- a/src/com/engine/salary/entity/salaryarchive/po/SalaryArchivePO.java
+++ b/src/com/engine/salary/entity/salaryarchive/po/SalaryArchivePO.java
@@ -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;
diff --git a/src/com/engine/salary/entity/salaryitem/po/SalaryItemPO.java b/src/com/engine/salary/entity/salaryitem/po/SalaryItemPO.java
index ea0844eb5..8db3c3c89 100644
--- a/src/com/engine/salary/entity/salaryitem/po/SalaryItemPO.java
+++ b/src/com/engine/salary/entity/salaryitem/po/SalaryItemPO.java
@@ -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;
diff --git a/src/com/engine/salary/entity/salarysob/param/SalarySobRangeSaveParam.java b/src/com/engine/salary/entity/salarysob/param/SalarySobRangeSaveParam.java
index 41acf67cf..ff2cdd876 100644
--- a/src/com/engine/salary/entity/salarysob/param/SalarySobRangeSaveParam.java
+++ b/src/com/engine/salary/entity/salarysob/param/SalarySobRangeSaveParam.java
@@ -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;
diff --git a/src/com/engine/salary/entity/salarysob/po/SalarySobItemPO.java b/src/com/engine/salary/entity/salarysob/po/SalarySobItemPO.java
index ac2ee0112..c13df6343 100644
--- a/src/com/engine/salary/entity/salarysob/po/SalarySobItemPO.java
+++ b/src/com/engine/salary/entity/salarysob/po/SalarySobItemPO.java
@@ -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;
diff --git a/src/com/engine/salary/entity/salarysob/po/SalarySobPO.java b/src/com/engine/salary/entity/salarysob/po/SalarySobPO.java
index b5ed46b31..c7c2f8141 100644
--- a/src/com/engine/salary/entity/salarysob/po/SalarySobPO.java
+++ b/src/com/engine/salary/entity/salarysob/po/SalarySobPO.java
@@ -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;
diff --git a/src/com/engine/salary/entity/salarysob/po/SalarySobRangePO.java b/src/com/engine/salary/entity/salarysob/po/SalarySobRangePO.java
index 08dee470f..08a1df20f 100644
--- a/src/com/engine/salary/entity/salarysob/po/SalarySobRangePO.java
+++ b/src/com/engine/salary/entity/salarysob/po/SalarySobRangePO.java
@@ -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;
diff --git a/src/com/engine/salary/entity/siaccount/po/InsuranceAccountBatchPO.java b/src/com/engine/salary/entity/siaccount/po/InsuranceAccountBatchPO.java
index 45de6f2ab..362815eef 100644
--- a/src/com/engine/salary/entity/siaccount/po/InsuranceAccountBatchPO.java
+++ b/src/com/engine/salary/entity/siaccount/po/InsuranceAccountBatchPO.java
@@ -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;
diff --git a/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailPO.java b/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailPO.java
index 9b7c33cef..aadf8b4bb 100644
--- a/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailPO.java
+++ b/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailPO.java
@@ -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;
diff --git a/src/com/engine/salary/entity/siaccount/po/InsuranceCompensationPO.java b/src/com/engine/salary/entity/siaccount/po/InsuranceCompensationPO.java
index ff9ece22b..c4e8b1fe7 100644
--- a/src/com/engine/salary/entity/siaccount/po/InsuranceCompensationPO.java
+++ b/src/com/engine/salary/entity/siaccount/po/InsuranceCompensationPO.java
@@ -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;
diff --git a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesBaseInfoPO.java b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesBaseInfoPO.java
index 1ed65489f..0a5dd7b01 100644
--- a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesBaseInfoPO.java
+++ b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesBaseInfoPO.java
@@ -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;
diff --git a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesFundSchemePO.java b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesFundSchemePO.java
index 15e37cfb0..e4e9573c4 100644
--- a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesFundSchemePO.java
+++ b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesFundSchemePO.java
@@ -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;
diff --git a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesOtherSchemePO.java b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesOtherSchemePO.java
index 71836e143..c8086a1e1 100644
--- a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesOtherSchemePO.java
+++ b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesOtherSchemePO.java
@@ -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;
diff --git a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesSocialSchemePO.java b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesSocialSchemePO.java
index 5e5c3cf9e..a0b4a8b87 100644
--- a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesSocialSchemePO.java
+++ b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesSocialSchemePO.java
@@ -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;
diff --git a/src/com/engine/salary/entity/sischeme/po/InsuranceSchemeDetailPO.java b/src/com/engine/salary/entity/sischeme/po/InsuranceSchemeDetailPO.java
index 3d4200f65..e7ce260f1 100644
--- a/src/com/engine/salary/entity/sischeme/po/InsuranceSchemeDetailPO.java
+++ b/src/com/engine/salary/entity/sischeme/po/InsuranceSchemeDetailPO.java
@@ -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;
diff --git a/src/com/engine/salary/entity/sischeme/po/InsuranceSchemePO.java b/src/com/engine/salary/entity/sischeme/po/InsuranceSchemePO.java
index 8cdcc7f6c..e832d801d 100644
--- a/src/com/engine/salary/entity/sischeme/po/InsuranceSchemePO.java
+++ b/src/com/engine/salary/entity/sischeme/po/InsuranceSchemePO.java
@@ -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;
diff --git a/src/com/engine/salary/entity/taxagent/po/TaxAgentManageRangePO.java b/src/com/engine/salary/entity/taxagent/po/TaxAgentManageRangePO.java
index c22ef32df..ae4c8b9b7 100644
--- a/src/com/engine/salary/entity/taxagent/po/TaxAgentManageRangePO.java
+++ b/src/com/engine/salary/entity/taxagent/po/TaxAgentManageRangePO.java
@@ -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;
diff --git a/src/com/engine/salary/entity/taxagent/po/TaxAgentPO.java b/src/com/engine/salary/entity/taxagent/po/TaxAgentPO.java
index c6444f697..819bf3aaf 100644
--- a/src/com/engine/salary/entity/taxagent/po/TaxAgentPO.java
+++ b/src/com/engine/salary/entity/taxagent/po/TaxAgentPO.java
@@ -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;
diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
index 925718b0b..f99f6ef0c 100644
--- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
+++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
@@ -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
diff --git a/src/com/engine/salary/report/entity/po/SalaryStatisticsItemPO.java b/src/com/engine/salary/report/entity/po/SalaryStatisticsItemPO.java
index aa359b7e6..5c1b3bb52 100644
--- a/src/com/engine/salary/report/entity/po/SalaryStatisticsItemPO.java
+++ b/src/com/engine/salary/report/entity/po/SalaryStatisticsItemPO.java
@@ -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.*;
diff --git a/src/com/engine/salary/report/entity/po/SalaryStatisticsReportPO.java b/src/com/engine/salary/report/entity/po/SalaryStatisticsReportPO.java
index b1d96f726..08061bddd 100644
--- a/src/com/engine/salary/report/entity/po/SalaryStatisticsReportPO.java
+++ b/src/com/engine/salary/report/entity/po/SalaryStatisticsReportPO.java
@@ -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;
diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsItemServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsItemServiceImpl.java
index 176192125..e7eb0bcc5 100644
--- a/src/com/engine/salary/report/service/impl/SalaryStatisticsItemServiceImpl.java
+++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsItemServiceImpl.java
@@ -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;
diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
index b0fe69d71..db2f739c0 100644
--- a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
+++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
@@ -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;
diff --git a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
index 440c4a419..0ccb7df05 100644
--- a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
+++ b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
@@ -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;
diff --git a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
index ea0af4823..a99504d46 100644
--- a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
@@ -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;
diff --git a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
index 6e57a095e..7122f98be 100644
--- a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
@@ -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;
diff --git a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
index 9a03ab6f3..9216e7841 100644
--- a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
@@ -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.*;
diff --git a/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java b/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java
index 37d3ff3f6..2448254f9 100644
--- a/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java
@@ -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;
diff --git a/src/com/engine/salary/service/impl/ExtEmpServiceImpl.java b/src/com/engine/salary/service/impl/ExtEmpServiceImpl.java
index 6f166e687..85c7e612e 100644
--- a/src/com/engine/salary/service/impl/ExtEmpServiceImpl.java
+++ b/src/com/engine/salary/service/impl/ExtEmpServiceImpl.java
@@ -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;
diff --git a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
index 57f2d20a6..837427adb 100644
--- a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
+++ b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
@@ -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;
diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
index 7843063e2..f10d679f7 100644
--- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
@@ -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;
diff --git a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
index d0d76bd4d..9dd1e070f 100644
--- a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
@@ -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;
diff --git a/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java b/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java
index 6e746c358..6714938a3 100644
--- a/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java
@@ -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;
diff --git a/src/com/engine/salary/service/impl/SICategoryServiceImpl.java b/src/com/engine/salary/service/impl/SICategoryServiceImpl.java
index 7e127f570..875947741 100644
--- a/src/com/engine/salary/service/impl/SICategoryServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SICategoryServiceImpl.java
@@ -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;
diff --git a/src/com/engine/salary/service/impl/SICompensationServiceImpl.java b/src/com/engine/salary/service/impl/SICompensationServiceImpl.java
index b83448c67..25bf127a0 100644
--- a/src/com/engine/salary/service/impl/SICompensationServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SICompensationServiceImpl.java
@@ -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;
diff --git a/src/com/engine/salary/service/impl/SIExportServiceImpl.java b/src/com/engine/salary/service/impl/SIExportServiceImpl.java
index 3ec48edbb..3c2ab86c4 100644
--- a/src/com/engine/salary/service/impl/SIExportServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIExportServiceImpl.java
@@ -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;
diff --git a/src/com/engine/salary/service/impl/SIRecessionServiceImpl.java b/src/com/engine/salary/service/impl/SIRecessionServiceImpl.java
index 494838d25..6766dae2b 100644
--- a/src/com/engine/salary/service/impl/SIRecessionServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIRecessionServiceImpl.java
@@ -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;
diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java
index 74147039a..66945d79b 100644
--- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java
@@ -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;
diff --git a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
index 7fe7863dd..fc820d38c 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
@@ -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;
diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
index a0acbb9d9..ec0529b81 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
@@ -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 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 errorMessageMap = Maps.newHashMap();
diff --git a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
index 7ced912a2..546cbf3c9 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
@@ -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;
diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
index 8592db9e4..ff4630e49 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
@@ -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;
diff --git a/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
index e4cecc326..8e0986007 100644
--- a/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
@@ -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 taxAgentList = getTaxAgentService(user).listAll();
- Collection salaryArchives = new ArrayList<>();
-
- if (queryParam.isExtSalaryArchiveList()) {
- //非系统人员档案
- salaryArchives = getSalaryArchiveMapper().listExtSalaryArchive(queryParam);
- } else {
- salaryArchives = getSalaryArchiveMapper().list(queryParam);
- }
+ Collection 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 oldArchive = getSalaryArchiveMapper().listSome(SalaryArchivePO.builder().ids(salaryArchiveUpdates.stream().map(SalaryArchivePO::getId).collect(Collectors.toList())).build());
+ List oldArchive = salaryArchiveService(user).listSome(SalaryArchivePO.builder().ids(salaryArchiveUpdates.stream().map(SalaryArchivePO::getId).collect(Collectors.toList())).build());
Map oldArchiveMap = SalaryEntityUtil.convert2Map(oldArchive, SalaryArchivePO::getId);
// 薪资档案
salaryArchiveMapper.batchUpdate(salaryArchiveUpdates);
diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
index c4e16f8ef..6c4fed20a 100644
--- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
@@ -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 list = getSalaryArchiveMapper().list(queryParam);
+ return SalaryI18nUtil.i18nList(list);
}
@Override
diff --git a/src/com/engine/salary/service/impl/SalaryBillServiceImpl.java b/src/com/engine/salary/service/impl/SalaryBillServiceImpl.java
index 4789efd76..c2af2d6e1 100644
--- a/src/com/engine/salary/service/impl/SalaryBillServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryBillServiceImpl.java
@@ -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;
diff --git a/src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
index cb4684c69..7ace61ede 100644
--- a/src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
@@ -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 getSubCompanyInfoList(List subDepartmentIds) {
- return employBiz.getSubCompanyInfoList(subDepartmentIds);
+ return SalaryI18nUtil.i18nList(employBiz.getSubCompanyInfoList(subDepartmentIds));
}
@Override
public List listPositionInfo(List 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
diff --git a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java
index cd9cc7e9f..df3e8f37c 100644
--- a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java
@@ -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;
diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java
index 048890ff4..fe6db243b 100644
--- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java
@@ -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;
diff --git a/src/com/engine/salary/service/impl/SalarySobAdjustRuleServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobAdjustRuleServiceImpl.java
index 160151c16..4da850226 100644
--- a/src/com/engine/salary/service/impl/SalarySobAdjustRuleServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalarySobAdjustRuleServiceImpl.java
@@ -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;
diff --git a/src/com/engine/salary/service/impl/SalarySobCheckRuleServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobCheckRuleServiceImpl.java
index 103b62de8..0489b8ab9 100644
--- a/src/com/engine/salary/service/impl/SalarySobCheckRuleServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalarySobCheckRuleServiceImpl.java
@@ -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;
diff --git a/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
index 584a8425f..100e35ad6 100644
--- a/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
@@ -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;
diff --git a/src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java
index 37275ce6f..cebcefa63 100644
--- a/src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java
@@ -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;
diff --git a/src/com/engine/salary/service/impl/SalarySobServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobServiceImpl.java
index fd818815e..280afdcc0 100644
--- a/src/com/engine/salary/service/impl/SalarySobServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalarySobServiceImpl.java
@@ -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;
diff --git a/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java b/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java
index c32877e01..2bf76796f 100644
--- a/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java
@@ -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;
diff --git a/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java b/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java
index 9268317a8..fb61eab55 100644
--- a/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java
@@ -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;
diff --git a/src/com/engine/salary/service/impl/SysSalaryItemServiceImpl.java b/src/com/engine/salary/service/impl/SysSalaryItemServiceImpl.java
index 883c886dd..e5c894fe9 100644
--- a/src/com/engine/salary/service/impl/SysSalaryItemServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SysSalaryItemServiceImpl.java
@@ -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;
diff --git a/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
index 188a8fe6b..2bcc88ee3 100644
--- a/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
+++ b/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
@@ -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;
diff --git a/src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
index e72ae6f09..9be20c0ad 100644
--- a/src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
+++ b/src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
@@ -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;
diff --git a/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
index f44155e65..59b883897 100644
--- a/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
+++ b/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
@@ -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;
diff --git a/src/com/engine/salary/util/SalaryI18nUtil.java b/src/com/engine/salary/util/SalaryI18nUtil.java
index d85f6984b..7964fbe8a 100644
--- a/src/com/engine/salary/util/SalaryI18nUtil.java
+++ b/src/com/engine/salary/util/SalaryI18nUtil.java
@@ -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;
+
/**
* 多语言工具类
* Copyright: Copyright (c) 2022
@@ -10,6 +23,68 @@ package com.engine.salary.util;
**/
public class SalaryI18nUtil {
+
+ public static T i18n(T data) {
+ if (data == null ) {
+ return data;
+ }
+ try {
+ List 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 List i18nList(List dataList) {
+ if (CollectionUtils.isEmpty(dataList) ) {
+ return dataList;
+ }
+ try {
+ List 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 List getFields(Class clazz) {
+ List> allClasses = new ArrayList>();
+ 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());
+ }
+
/**
* 获取多语言信息
*
diff --git a/src/com/engine/salary/util/SalaryLoggerUtil.java b/src/com/engine/salary/util/SalaryLoggerUtil.java
index 6d35bd851..72d7aae28 100644
--- a/src/com/engine/salary/util/SalaryLoggerUtil.java
+++ b/src/com/engine/salary/util/SalaryLoggerUtil.java
@@ -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;
diff --git a/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java b/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java
index 8b1ff0f6e..dbc26d470 100644
--- a/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java
+++ b/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java
@@ -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;
diff --git a/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java b/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
index 0efa4f23f..22a642feb 100644
--- a/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
+++ b/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
@@ -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 optional = Arrays.stream(SalaryArchiveImportTypeEnum.values())
.filter(e -> StringUtils.isNotEmpty(queryParam.getImportType()) && e.getValue().equals(queryParam.getImportType())).findFirst();
if (!optional.isPresent()) {
diff --git a/src/com/engine/salary/wrapper/SalaryFieldWrapper.java b/src/com/engine/salary/wrapper/SalaryFieldWrapper.java
index 5edef7f36..462b015d3 100644
--- a/src/com/engine/salary/wrapper/SalaryFieldWrapper.java
+++ b/src/com/engine/salary/wrapper/SalaryFieldWrapper.java
@@ -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;
diff --git a/src/com/engine/salary/wrapper/SalaryItemWrapper.java b/src/com/engine/salary/wrapper/SalaryItemWrapper.java
index 12e333331..d5693105c 100644
--- a/src/com/engine/salary/wrapper/SalaryItemWrapper.java
+++ b/src/com/engine/salary/wrapper/SalaryItemWrapper.java
@@ -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;