diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/dto/ImportClassifyDTO.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/dto/ImportClassifyDTO.java index fd0104dc4..7a48fbaad 100644 --- a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/dto/ImportClassifyDTO.java +++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/dto/ImportClassifyDTO.java @@ -8,6 +8,12 @@ import java.io.Serializable; @Data public class ImportClassifyDTO implements Serializable { + @ExcelProperty(value = "考核指标归属部门") + private String createDeptName; + + @ExcelProperty(value = "考核部门") + private String examineDeptName; + @ExcelProperty(value = "指标分类") private String parentClassifyName; 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 0ee33870f..5ba4123c7 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 @@ -437,6 +437,10 @@ public class ClassifyServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("name",parentClassifyName) @@ -449,6 +453,7 @@ public class ClassifyServiceImpl extends BaseServiceImpl