From d46d05402b34c8a64334702a448cf1bcbdd33c15 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期四, 16 十月 2025 09:14:56 +0800
Subject: [PATCH] 功能修改
---
multi-system/src/main/java/com/gkhy/exam/system/service/impl/ExternalKnowledgeServiceImpl.java | 1 +
multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalKnowledgeServiceImpl.java | 3 ++-
multi-system/src/main/java/com/gkhy/exam/system/domain/DTO/KnowledgeImportDTO.java | 10 ++++++++++
multi-system/src/main/java/com/gkhy/exam/system/domain/ExternalKnowledge.java | 5 +++++
multi-system/src/main/java/com/gkhy/exam/system/domain/InternalKnowledge.java | 8 +++++++-
5 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/DTO/KnowledgeImportDTO.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/DTO/KnowledgeImportDTO.java
index 8755793..de1551e 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/DTO/KnowledgeImportDTO.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/DTO/KnowledgeImportDTO.java
@@ -1,7 +1,11 @@
package com.gkhy.exam.system.domain.DTO;
import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
@Data
public class KnowledgeImportDTO {
@@ -9,9 +13,15 @@
@ExcelProperty("名称")
private String name;
+ @ExcelProperty("编号")
+ private String number;
+
@ExcelProperty("文件类型")
//1、体系2、项目3、其他 4、技术文件 5、知识产权 6、质量服务标准 (内部知识)
//1、标准2、规范3、法律法规4、其他 (外部知识)
private String knowledgeType;
+
+
+
}
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/ExternalKnowledge.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/ExternalKnowledge.java
index ce7de27..e0b1df3 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/ExternalKnowledge.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/ExternalKnowledge.java
@@ -41,6 +41,11 @@
@NotBlank(message = "名称不能为空")
private String name;
+ @ApiModelProperty(value ="编号",required = true)
+ @TableField("number")
+ @NotBlank(message = "编号不能为空")
+ private String number;
+
@ApiModelProperty(value ="1、标准2、规范3、法律法规4、其他",required = true)
@TableField("knowledge_type")
@NotNull(message = "类型不能为空")
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/InternalKnowledge.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/InternalKnowledge.java
index 9d3e195..6e3dcad 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/InternalKnowledge.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/InternalKnowledge.java
@@ -43,7 +43,13 @@
@NotBlank(message = "名称不能为空")
private String name;
- @ApiModelProperty(value ="1、体系文件2、项目文件3、其他 4、技术文件 5、知识产权 6、质量服务标准",required = true)
+ @ApiModelProperty(value ="编号",required = true)
+ @TableField("number")
+ @NotBlank(message = "编号不能为空")
+ private String number;
+
+
+ @ApiModelProperty(value ="1、体系文件2、项目文件3、其他 4、技术文件 5、知识产权 6、质量服务标准 7会议文件",required = true)
@TableField("knowledge_type")
@NotNull(message = "类型不能为空")
private Integer knowledgeType;
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/ExternalKnowledgeServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/ExternalKnowledgeServiceImpl.java
index 1b092cc..528a08f 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/ExternalKnowledgeServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/ExternalKnowledgeServiceImpl.java
@@ -100,6 +100,7 @@
// 转换为实体对象
ExternalKnowledge externalKnowledge = new ExternalKnowledge();
externalKnowledge.setName(dto.getName());
+ externalKnowledge.setNumber(dto.getNumber());
switch (dto.getKnowledgeType()) {
case "标准":
externalKnowledge.setKnowledgeType(1);
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalKnowledgeServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalKnowledgeServiceImpl.java
index c0f3444..9eb363f 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalKnowledgeServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalKnowledgeServiceImpl.java
@@ -113,10 +113,11 @@
knowledge.setKnowledgeType(6);
break;
default:
- knowledge.setKnowledgeType(0);
+ knowledge.setKnowledgeType(7);
break;
}
knowledge.setCompanyId(companyId);
+ knowledge.setNumber(dto.getNumber());
internalKnowledgeMapper.insert(knowledge);
result.setSuccessCount(result.getSuccessCount() + 1);
} catch (Exception e) {
--
Gitblit v1.9.2