diff --git a/src/main/java/com/ydool/staff/entity/AuditLog.java b/src/main/java/com/ydool/staff/entity/AuditLog.java index 93b1b4a..d648651 100644 --- a/src/main/java/com/ydool/staff/entity/AuditLog.java +++ b/src/main/java/com/ydool/staff/entity/AuditLog.java @@ -35,7 +35,7 @@ public class AuditLog extends BaseEntity{ @ApiModelProperty(value = "处理意见") private String opinion; - @ApiModelProperty(value = "日志类型:personnel 人员 change:变更 ") + @ApiModelProperty(value = "日志类型 personnel:人员 change:变更 directors:董监 organization:招聘 personnel_indicators:指标") private String type; } diff --git a/src/main/java/com/ydool/staff/request/AuditLogRequest.java b/src/main/java/com/ydool/staff/request/AuditLogRequest.java new file mode 100644 index 0000000..0496881 --- /dev/null +++ b/src/main/java/com/ydool/staff/request/AuditLogRequest.java @@ -0,0 +1,20 @@ +package com.ydool.staff.request; + +import com.ydool.staff.entity.AuditLog; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@Data +public class AuditLogRequest extends AuditLog { + + @ApiModelProperty(value = "类型") + private String typeName; + + @ApiModelProperty(value = "发布人") + private String createdName; + + @ApiModelProperty(value = "修改人") + private String updatedName; +} diff --git a/src/main/java/com/ydool/staff/service/impl/AuditLogServiceImpl.java b/src/main/java/com/ydool/staff/service/impl/AuditLogServiceImpl.java index 38abb95..2a2a875 100644 --- a/src/main/java/com/ydool/staff/service/impl/AuditLogServiceImpl.java +++ b/src/main/java/com/ydool/staff/service/impl/AuditLogServiceImpl.java @@ -1,9 +1,7 @@ package com.ydool.staff.service.impl; -import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,17 +10,15 @@ import com.ydool.common.constant.ArgsConst; import com.ydool.common.data.dto.AjaxResult; import com.ydool.staff.dto.AuditLogDto; import com.ydool.staff.entity.AuditLog; -import com.ydool.staff.entity.Personnel; import com.ydool.staff.mapper.AuditLogMapper; +import com.ydool.staff.request.AuditLogRequest; import com.ydool.staff.service.IAuditLogService; import com.ydool.system.entity.User; import com.ydool.system.mapper.UserMapper; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; -import java.util.stream.Collectors; /** *
@@ -54,14 +50,33 @@ public class AuditLogServiceImpl extends BaseService