diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/ClassifyEntity.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/ClassifyEntity.java index 4505c6003..7ecbfc683 100644 --- a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/ClassifyEntity.java +++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/ClassifyEntity.java @@ -17,10 +17,9 @@ package com.logpm.supervise.entity; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; +import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; @@ -52,9 +51,21 @@ public class ClassifyEntity extends TenantEntity { @ApiModelProperty(value = "备注") private String remark; /** - * 是否是父指标 默认为0 + * 是否是父指标 默认为0 */ @ApiModelProperty(value = "是否是父指标 默认为0 ") private Long pId; + /** + * 考核部门id + */ + @ApiModelProperty(value = "考核部门id ") + private Long examineDeptId; + + /** + * 考核部门名称 + */ + @ApiModelProperty(value = "考核部门名称 ") + private String examineDeptName; + } diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java index 096c3b4ea..210288cce 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java @@ -184,6 +184,8 @@ public class ClassifyServiceImpl extends BaseServiceImpl