From 010a61d2e80fd2169305bee5505d3f7d53dcb174 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期二, 28 十月 2025 08:29:40 +0800
Subject: [PATCH] 功能修改
---
multi-system/src/main/java/com/gkhy/exam/system/service/impl/ExternalKnowledgeServiceImpl.java | 17 +++++------------
multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalKnowledgeServiceImpl.java | 6 +++---
multi-system/src/main/java/com/gkhy/exam/system/domain/DTO/KnowledgeImportDTO.java | 4 ++--
multi-system/src/main/java/com/gkhy/exam/system/domain/ExternalKnowledge.java | 2 +-
multi-system/src/main/java/com/gkhy/exam/system/domain/InternalKnowledge.java | 4 ++--
5 files changed, 13 insertions(+), 20 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 de1551e..220afb0 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
@@ -17,8 +17,8 @@
private String number;
@ExcelProperty("文件类型")
- //1、体系2、项目3、其他 4、技术文件 5、知识产权 6、质量服务标准 (内部知识)
- //1、标准2、规范3、法律法规4、其他 (外部知识)
+ //1、体系文件2、项目文件3、其他 4、技术文件 5、知识产权 7、会议文件 (内部知识)
+ //1、标准2、规范3、法律法规4、其他 5、质量服务标准 (外部知识)
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 e0b1df3..11c7d25 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
@@ -46,7 +46,7 @@
@NotBlank(message = "编号不能为空")
private String number;
- @ApiModelProperty(value ="1、标准2、规范3、法律法规4、其他",required = true)
+ @ApiModelProperty(value ="1、标准2、规范3、法律法规4、其他 5、质量服务标准",required = true)
@TableField("knowledge_type")
@NotNull(message = "类型不能为空")
private Integer knowledgeType;
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 6e3dcad..f855d15 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
@@ -48,8 +48,8 @@
@NotBlank(message = "编号不能为空")
private String number;
-
- @ApiModelProperty(value ="1、体系文件2、项目文件3、其他 4、技术文件 5、知识产权 6、质量服务标准 7会议文件",required = true)
+//6、质量服务标准
+ @ApiModelProperty(value ="1、体系文件2、项目文件3、其他 4、技术文件 5、知识产权 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 528a08f..d80c920 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
@@ -5,21 +5,15 @@
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.read.listener.ReadListener;
import com.alibaba.excel.read.metadata.ReadSheet;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.gkhy.exam.common.api.CommonPage;
import com.gkhy.exam.common.api.CommonResult;
import com.gkhy.exam.common.api.ImportResult;
import com.gkhy.exam.common.constant.UserConstant;
-import com.gkhy.exam.common.domain.entity.SysDept;
-import com.gkhy.exam.common.domain.entity.SysUser;
import com.gkhy.exam.common.utils.PageUtils;
import com.gkhy.exam.common.utils.SecurityUtils;
import com.gkhy.exam.system.domain.DTO.KnowledgeImportDTO;
-import com.gkhy.exam.system.domain.DTO.StandingBookImportDTO;
import com.gkhy.exam.system.domain.ExternalKnowledge;
-import com.gkhy.exam.system.domain.StandingBook;
-import com.gkhy.exam.system.domain.vo.DeptVo;
import com.gkhy.exam.system.mapper.ExternalKnowledgeMapper;
import com.gkhy.exam.system.service.ExternalKnowledgeService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -31,8 +25,6 @@
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
/**
* <p>
@@ -59,12 +51,12 @@
@Override
public CommonResult saveExternalKnowledge(ExternalKnowledge externalKnowledge) {
int i = 0;
- if (externalKnowledge.getId() == null){
+ if (externalKnowledge.getId() == null) {
externalKnowledge.setCreateBy(SecurityUtils.getUsername());
externalKnowledge.setCreateTime(LocalDateTime.now());
i = externalKnowledgeMapper.insert(externalKnowledge);
- }else {
+ } else {
externalKnowledge.setUpdateBy(SecurityUtils.getUsername());
externalKnowledge.setUpdateTime(LocalDateTime.now());
i = externalKnowledgeMapper.updateById(externalKnowledge);
@@ -111,6 +103,9 @@
case "法律法规":
externalKnowledge.setKnowledgeType(3);
break;
+ case "质量服务标准":
+ externalKnowledge.setKnowledgeType(5);
+ break;
default:
externalKnowledge.setKnowledgeType(4);
break;
@@ -123,8 +118,6 @@
result.setFailCount(result.getFailCount() + 1);
}
}
-
-
@Override
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 9eb363f..287aa57 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
@@ -109,9 +109,9 @@
case "知识产权":
knowledge.setKnowledgeType(5);
break;
- case "质量服务标准":
- knowledge.setKnowledgeType(6);
- break;
+// case "质量服务标准":
+// knowledge.setKnowledgeType(6);
+// break;
default:
knowledge.setKnowledgeType(7);
break;
--
Gitblit v1.9.2