Merge remote-tracking branch 'origin/dev_1.0.0' into dev_1.0.0

know_sub_business/src/main/java/com/supervision/knowsub/controller/knowledge/KnowledgeManageController.java

@@ -1,9 +1,12 @@
 package com.supervision.knowsub.controller.knowledge;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.supervision.knowsub.controller.service.KnowledgeManageService;
+import com.supervision.knowsub.service.KnowledgeManageService;
 import com.supervision.knowsub.model.Knowledge;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -22,9 +25,16 @@ public class KnowledgeManageController {
     private final KnowledgeManageService knowledgeManageService;
 
     @Operation(summary = "查询知识库分页")
+    @Parameters({
+            @Parameter(name = "status", description = "流转状态 为空查全部,1草稿 2待审批 3驳回 4通过 5删除  6已失效",required = false,allowEmptyValue = true, in = ParameterIn.QUERY),
+            @Parameter(name = "title", description = "标题,支持模糊",required = false, in = ParameterIn.QUERY),
+            @Parameter(name = "publishDeptName", description = "发文部门,支持模糊",required = true, in = ParameterIn.QUERY),
+            @Parameter(name = "pageNum", description = "分页", in = ParameterIn.QUERY),
+            @Parameter(name = "pageSize", description = "分页", in = ParameterIn.QUERY)
+    })
     @GetMapping("queryKnowledgePage")
-    public IPage<Knowledge> queryKnowledgePage(Integer status, String title, String deptName, Integer pageNum, Integer pageSize) {
-        return knowledgeManageService.queryKnowledgePage(status, title, deptName, pageNum, pageSize);
+    public IPage<Knowledge> queryKnowledgePage(Integer status, String title, String publishDeptName, Integer pageNum, Integer pageSize) {
+        return knowledgeManageService.queryKnowledgePage(status, title, publishDeptName, pageNum, pageSize);
     }
 
     @Operation(summary = "新增知识库")

know_sub_business/src/main/java/com/supervision/knowsub/service/KnowledgeManageService.java

@@ -1,9 +1,9 @@
-package com.supervision.knowsub.controller.service;
+package com.supervision.knowsub.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.supervision.knowsub.model.Knowledge;
 
 public interface KnowledgeManageService {
 
-    IPage<Knowledge> queryKnowledgePage(Integer status,String title, String deptName, Integer pageNum, Integer pageSize);
+    IPage<Knowledge> queryKnowledgePage(Integer status,String title, String publishDeptName, Integer pageNum, Integer pageSize);
 }

know_sub_business/src/main/java/com/supervision/knowsub/service/impl/KnowledgeManageServiceImpl.java

@@ -1,10 +1,10 @@
-package com.supervision.knowsub.controller.service.impl;
+package com.supervision.knowsub.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.supervision.knowsub.controller.service.KnowledgeManageService;
+import com.supervision.knowsub.service.KnowledgeManageService;
 import com.supervision.knowsub.model.Knowledge;
 import com.supervision.knowsub.service.KnowledgeService;
 import lombok.RequiredArgsConstructor;