From 3767976d9154273b85a576bde8af8c9a4baae522 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Mon, 19 Feb 2024 17:26:05 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=80=83=E6=A0=B8-=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=80=83=E6=A0=B8=E9=83=A8=E9=97=A8=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/logpm/supervise/dto/ImportClassifyDTO.java  | 6 ++++++
 .../supervise/service/impl/ClassifyServiceImpl.java      | 9 +++++++++
 2 files changed, 15 insertions(+)

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<ClassifyMapper, Classif
 			String parentClassifyName = importClassifyDTO.getParentClassifyName();
 			String parentClassifyDesc = importClassifyDTO.getParentClassifyDesc();
 			String parentClassifyRemark = importClassifyDTO.getParentClassifyRemark();
+			String createDeptName = importClassifyDTO.getCreateDeptName();
+
+			Long createDeptId = deptClient.findIdByName(createDeptName);
+
 			//判断指标分类是否已经存在
 			QueryWrapper<ClassifyEntity> queryWrapper = new QueryWrapper<>();
 			queryWrapper.eq("name",parentClassifyName)
@@ -449,6 +453,7 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 				parnetClassifyEntity.setDescription(parentClassifyDesc);
 				parnetClassifyEntity.setRemark(parentClassifyRemark);
 				parnetClassifyEntity.setPId(0L);
+				parnetClassifyEntity.setCreateDept(createDeptId);
 			}else{
 				parnetClassifyEntity.setDescription(parentClassifyDesc);
 				parnetClassifyEntity.setRemark(parentClassifyRemark);
@@ -462,11 +467,15 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 
 			String classifyName = importClassifyDTO.getClassifyName();
 			String classifyDesc = importClassifyDTO.getClassifyDesc();
+			String examineDeptName = importClassifyDTO.getExamineDeptName();
+			Long examineDeptId = deptClient.findIdByName(examineDeptName);
 
 			ClassifyEntity classifyEntity = new ClassifyEntity();
 			classifyEntity.setName(classifyName);
 			classifyEntity.setDescription(classifyDesc);
 			classifyEntity.setPId(parentClassifyId);
+			classifyEntity.setExamineDeptId(examineDeptId);
+			classifyEntity.setExamineDeptName(examineDeptName);
 			boolean b = save(classifyEntity);
 			if(!b){
 				log.warn("#############importClassify: 保存指标失败");