diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/IndicatorsEntity.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/IndicatorsEntity.java index a097557c2..0f017da3b 100644 --- a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/IndicatorsEntity.java +++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/IndicatorsEntity.java @@ -29,6 +29,9 @@ public class IndicatorsEntity extends TenantEntity { @ApiModelProperty(value = "考核指标") private Long classifyId; + @ApiModelProperty(value = "考核指标名称") + private Long classifyName; + @ApiModelProperty(value = "分数") private int point; diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsAnnexMapper.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsAnnexMapper.java index 34ae2968f..330a9ea09 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsAnnexMapper.java +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsAnnexMapper.java @@ -17,5 +17,5 @@ public interface IndicatorsAnnexMapper extends BaseMapper * 删除考核所关联的附件资源 * @param id */ - void deleteResourceByInstanceoId(@Param("") Long id); + void deleteResourceByInstanceoId(@Param("indicatorsId") Long indicatorsId); } 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 062227e79..7f14b14ea 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 @@ -42,6 +42,7 @@ import com.logpm.supervise.wrapper.PointsWrapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.BeanUtil; @@ -227,10 +228,13 @@ public class ClassifyServiceImpl extends BaseServiceImpl