From 3f76b5bbbff942e2735579b84d2c9fc528941954 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Mon, 4 Mar 2024 16:12:30 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E7=B3=BB=E7=BB=9F=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/entity/extemp/po/ExtEmpPO.java | 54 ++++++++++++++++ .../service/impl/ExtEmpServiceImpl.java | 64 ++++++++++++++++++- 2 files changed, 117 insertions(+), 1 deletion(-) diff --git a/src/com/engine/salary/entity/extemp/po/ExtEmpPO.java b/src/com/engine/salary/entity/extemp/po/ExtEmpPO.java index 3d67dea25..e936ccf79 100644 --- a/src/com/engine/salary/entity/extemp/po/ExtEmpPO.java +++ b/src/com/engine/salary/entity/extemp/po/ExtEmpPO.java @@ -2,6 +2,7 @@ package com.engine.salary.entity.extemp.po; import com.engine.salary.annotation.TableTitle; +import com.engine.salary.elog.annotation.ElogTransform; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -18,114 +19,167 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor //hrsa_external_employee +@ElogTransform( name = "非系统人员") public class ExtEmpPO { + @ElogTransform(name = "主键id") private Long id; + /** * 姓名 */ @TableTitle(title = "姓名", dataIndex = "username", key = "username") + @ElogTransform(name = "姓名") private String username; + /** * 部门 */ @TableTitle(title = "部门", dataIndex = "departmentName", key = "departmentName") + @ElogTransform(name = "部门") private String departmentName; + /** * 部门ID */ + @ElogTransform(name = "部门ID") private Long departmentId; + /** * 分部 */ + @TableTitle(title = "分部", dataIndex = "subcompanyName", key = "subcompanyName") + @ElogTransform(name = "分部") private String subcompanyName; + /** * 分部ID */ + @ElogTransform(name = "分部ID") private Long subcompanyId; + /** * 岗位 */ // @TableTitle(title = "岗位", dataIndex = "jobtitleName", key = "jobtitleName") + @ElogTransform(name = "岗位") private String jobtitleName; + /** * 岗位ID */ + @ElogTransform(name = "岗位ID") private Long jobtitleId; + /** * 入职日期 */ @TableTitle(title = "入职日期", dataIndex = "companystartdate", key = "companystartdate") + @ElogTransform(name = "入职日期") private String companystartdate; + /** * 手机 */ + @ElogTransform(name = "手机") private String mobile; + /** * 状态编码 */ + @ElogTransform(name = "状态编码") private String status; + /** * 工号 */ @TableTitle(title = "工号", dataIndex = "workcode", key = "workcode") + @ElogTransform(name = "工号") private String workcode; + /** * 性别 */ + @ElogTransform(name = "性别") private String sex; + /** * 邮件 */ + @ElogTransform(name = "邮件") private String email; + /** * 电话 */ + @ElogTransform(name = "电话") private String telephone; + /** * 职称 */ + @ElogTransform(name = "职称") private String jobcall; + /** * 出生日期 */ + @ElogTransform(name = "出生日期") private String birthday; + /** * 身份证号码 */ + @ElogTransform(name = "身份证号码") private String idNo; + /** * 本人开户的银行卡卡号 */ + @ElogTransform(name = "本人开户的银行卡卡号") private String bankCardNum; + /** * 本人开户的银行卡开户支行全称 */ + @ElogTransform(name = "本人开户的银行卡开户支行全称") private String bankName; + /** * 是否已删除。0：未删除、1：已删除 */ + @ElogTransform(name = "是否已删除") private Integer deleteType; + /** * 创建人 */ + @ElogTransform(name = "创建人") private Long creator; + /** * 修改人 */ + @ElogTransform(name = "修改人") private Long modifier; + /** * 创建时间 */ + @ElogTransform(name = "创建时间") private Date createTime; + /** * 修改时间 */ + @ElogTransform(name = "修改时间") private Date updateTime; + /** * 租户ID */ + @ElogTransform(name = "租户ID") private String tenantKey; private Collection ids; diff --git a/src/com/engine/salary/service/impl/ExtEmpServiceImpl.java b/src/com/engine/salary/service/impl/ExtEmpServiceImpl.java index cf833a66f..e584332e5 100644 --- a/src/com/engine/salary/service/impl/ExtEmpServiceImpl.java +++ b/src/com/engine/salary/service/impl/ExtEmpServiceImpl.java @@ -2,6 +2,8 @@ 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.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.extemp.param.ExtEmpImportParam; import com.engine.salary.entity.extemp.param.ExtEmpQueryParam; @@ -10,6 +12,7 @@ import com.engine.salary.entity.extemp.po.ExtEmpPO; import com.engine.salary.entity.hrm.DeptInfo; import com.engine.salary.entity.hrm.SubCompanyInfo; import com.engine.salary.entity.salarysob.param.SalarySobRangeEmpQueryParam; +import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.mapper.datacollection.EmployMapper; import com.engine.salary.mapper.extemp.ExternalEmployeeMapper; @@ -17,6 +20,7 @@ import com.engine.salary.service.ExtEmpService; import com.engine.salary.service.SalaryEmployeeService; import com.engine.salary.util.SalaryDateUtil; import com.engine.salary.util.SalaryI18nUtil; +import com.engine.salary.util.db.IdGenerator; import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.excel.ExcelComment; import com.engine.salary.util.excel.ExcelParseHelper; @@ -27,7 +31,6 @@ import com.engine.salary.util.page.SalaryPageUtil; import com.engine.salary.util.valid.ValidUtil; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import com.engine.salary.util.db.IdGenerator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; @@ -102,6 +105,17 @@ public class ExtEmpServiceImpl extends Service implements ExtEmpService { po.setDeleteType(0); getExternalEmployeeMapper().insertIgnoreNull(po); + + // 记录日志 + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(po.getId())); + loggerContext.setTargetName(po.getUsername()); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "新增非系统人员")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "新增非系统人员") + ": " + po.getUsername()); + loggerContext.setNewValues(po); + SalaryElogConfig.extEmployeeLoggerTemplate.write(loggerContext); } @Override @@ -123,12 +137,38 @@ public class ExtEmpServiceImpl extends Service implements ExtEmpService { po.setUpdateTime(now); getExternalEmployeeMapper().updateIgnoreNull(po); + ExtEmpPO byId = getExternalEmployeeMapper().getById(po.getId()); + + // 记录日志 + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(byId.getId())); + loggerContext.setTargetName(byId.getUsername()); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "编辑非系统人员")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "编辑非系统人员") + ": " + byId.getUsername()); + loggerContext.setOldValues(oldPO); + loggerContext.setNewValues(byId); + SalaryElogConfig.extEmployeeLoggerTemplate.write(loggerContext); } @Override public void delete(Collection ids) { if (CollectionUtils.isNotEmpty(ids)) { + List extEmpPOS = getExternalEmployeeMapper().listSome(ExtEmpPO.builder().ids(ids).build()); ids.forEach(getExternalEmployeeMapper()::delete); + // 记录日志 + extEmpPOS.forEach(extEmployeePO -> { + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(extEmployeePO.getId())); + loggerContext.setTargetName(extEmployeePO.getUsername()); + loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "删除非系统人员")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "删除非系统人员") + ": " + extEmployeePO.getUsername()); + loggerContext.setOldValues(extEmployeePO); + SalaryElogConfig.extEmployeeLoggerTemplate.write(loggerContext); + }); } } @@ -477,10 +517,32 @@ public class ExtEmpServiceImpl extends Service implements ExtEmpService { //更新 for(ExtEmpPO po : updateExtEmpPOList) { getExternalEmployeeMapper().updateIgnoreNull(po); + + // 记录日志 + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(po.getId())); + loggerContext.setTargetName(po.getUsername()); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "导入-更新非系统人员")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "导入-更新非系统人员") + ": " + po.getUsername()); + loggerContext.setNewValues(po); + SalaryElogConfig.extEmployeeLoggerTemplate.write(loggerContext); } //新建 for(ExtEmpPO po : insertExtEmpPOList) { getExternalEmployeeMapper().insertIgnoreNull(po); + + // 记录日志 + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(po.getId())); + loggerContext.setTargetName(po.getUsername()); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "导入-新增非系统人员")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "导入-新增非系统人员") + ": " + po.getUsername()); + loggerContext.setNewValues(po); + SalaryElogConfig.extEmployeeLoggerTemplate.write(loggerContext); }