From 13de6c99c21021e34da54c4548b392ff530b8081 Mon Sep 17 00:00:00 2001 From: liu Date: Wed, 26 Jun 2024 14:39:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=9F=A5=E8=AF=86=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E9=83=A8=E5=88=86=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../knowledge/KnowledgeFlowController.java | 46 +++++-- .../knowledge/KnowledgeManageController.java | 18 ++- .../vo/knowledge/KnowledgeDetailResVO.java | 2 +- .../vo/knowledge/SaveKnowledgeReqVO.java | 12 +- .../knowsub/service/KnowledgeFlowService.java | 16 +++ .../service/KnowledgeManageService.java | 12 +- .../impl/KnowledgeFlowServiceImpl.java | 42 +++++++ .../impl/KnowledgeManageServiceImpl.java | 66 +++++----- .../mapper/KnowledgeFlowRecordMapper.java | 36 +++++- ...foMapper.java => KnowledgeInfoMapper.java} | 6 +- .../knowsub/mapper/KnowledgeMapper.java | 12 +- .../supervision/knowsub/model/Knowledge.java | 12 +- .../knowsub/model/KnowledgeFlowRecord.java | 25 ++++ .../knowsub/model/KnowledgeFlowTodo.java | 71 +++++++++++ ...wledgeBaseInfo.java => KnowledgeInfo.java} | 4 +- .../service/KnowledgeFlowRecordService.java | 22 ++++ .../service/KnowledgeFlowTodoService.java | 13 ++ ...Service.java => KnowledgeInfoService.java} | 4 +- .../knowsub/service/KnowledgeService.java | 13 +- .../impl/KnowledgeFlowRecordServiceImpl.java | 18 +++ .../impl/KnowledgeFlowTodoServiceImpl.java | 22 ++++ ...mpl.java => KnowledgeInfoServiceImpl.java} | 10 +- .../service/impl/KnowledgeServiceImpl.java | 12 +- .../vo/knowledge/KnowledgeFlowResVO.java | 26 ++++ .../mapper/KnowledgeFlowRecordMapper.xml | 114 ++++++++++++++++-- .../mapper/KnowledgeFlowTodoMapper.xml | 26 ++++ ...InfoMapper.xml => KnowledgeInfoMapper.xml} | 4 +- .../main/resources/mapper/KnowledgeMapper.xml | 31 +++-- 28 files changed, 597 insertions(+), 98 deletions(-) create mode 100644 know_sub_business/src/main/java/com/supervision/knowsub/service/KnowledgeFlowService.java create mode 100644 know_sub_business/src/main/java/com/supervision/knowsub/service/impl/KnowledgeFlowServiceImpl.java rename know_sub_model/src/main/java/com/supervision/knowsub/mapper/{KnowledgeBaseInfoMapper.java => KnowledgeInfoMapper.java} (58%) create mode 100644 know_sub_model/src/main/java/com/supervision/knowsub/model/KnowledgeFlowTodo.java rename know_sub_model/src/main/java/com/supervision/knowsub/model/{KnowledgeBaseInfo.java => KnowledgeInfo.java} (96%) create mode 100644 know_sub_model/src/main/java/com/supervision/knowsub/service/KnowledgeFlowTodoService.java rename know_sub_model/src/main/java/com/supervision/knowsub/service/{KnowledgeBaseInfoService.java => KnowledgeInfoService.java} (66%) create mode 100644 know_sub_model/src/main/java/com/supervision/knowsub/service/impl/KnowledgeFlowTodoServiceImpl.java rename know_sub_model/src/main/java/com/supervision/knowsub/service/impl/{KnowledgeBaseInfoServiceImpl.java => KnowledgeInfoServiceImpl.java} (51%) create mode 100644 know_sub_model/src/main/java/com/supervision/knowsub/vo/knowledge/KnowledgeFlowResVO.java create mode 100644 know_sub_model/src/main/resources/mapper/KnowledgeFlowTodoMapper.xml rename know_sub_model/src/main/resources/mapper/{KnowledgeBaseInfoMapper.xml => KnowledgeInfoMapper.xml} (94%) diff --git a/know_sub_business/src/main/java/com/supervision/knowsub/controller/knowledge/KnowledgeFlowController.java b/know_sub_business/src/main/java/com/supervision/knowsub/controller/knowledge/KnowledgeFlowController.java index 77d5e4c..b5777bb 100644 --- a/know_sub_business/src/main/java/com/supervision/knowsub/controller/knowledge/KnowledgeFlowController.java +++ b/know_sub_business/src/main/java/com/supervision/knowsub/controller/knowledge/KnowledgeFlowController.java @@ -1,13 +1,20 @@ package com.supervision.knowsub.controller.knowledge; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.supervision.knowsub.model.KnowledgeFlowRecord; +import com.supervision.knowsub.service.KnowledgeFlowService; +import com.supervision.knowsub.vo.knowledge.KnowledgeFlowResVO; 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; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.time.Instant; +import java.time.LocalDateTime; @Slf4j @RestController @@ -16,10 +23,33 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("knowledgeFlow") public class KnowledgeFlowController { + private final KnowledgeFlowService knowledgeFlowService; + @Operation(summary = "分页查询知识审批流程") + @Parameters({ + @Parameter(name = "processStatus", description = "审批状态 1未审批 2已审批", in = ParameterIn.QUERY), + @Parameter(name = "title", description = "标题,支持模糊", in = ParameterIn.QUERY), + @Parameter(name = "publishDeptId", description = "发文部门id", in = ParameterIn.QUERY), + @Parameter(name = "baseId", description = "应用字库ID", in = ParameterIn.QUERY), + @Parameter(name = "submittedDeptId", description = "报送部门ID", in = ParameterIn.QUERY), + @Parameter(name = "flowType", description = "审批类型 1知识报送 2:知识撤回 3 知识删除", in = ParameterIn.QUERY), + @Parameter(name = "publishDateBegin", description = "发文时间开始", in = ParameterIn.QUERY), + @Parameter(name = "publishDateEnd", description = "发文时间结束", in = ParameterIn.QUERY), + @Parameter(name = "pageNum", description = "分页", in = ParameterIn.QUERY), + @Parameter(name = "pageSize", description = "分页", in = ParameterIn.QUERY) + }) @GetMapping("queryKnowledgeFlowPage") - public void queryKnowledgeFlowPage() { - + public IPage queryKnowledgeFlowPage(Integer processStatus, + @RequestParam(required = false) String title, + @RequestParam(required = false) String publishDeptId, + @RequestParam(required = false) String baseId, + @RequestParam(required = false) String submittedDeptId, + @RequestParam(required = false) Instant flowType, + @RequestParam(required = false) LocalDateTime publishDateBegin, + @RequestParam(required = false) LocalDateTime publishDateEnd, + Integer pageNum, Integer pageSize) { + return knowledgeFlowService.queryKnowledgeFlowPage(processStatus, title, publishDeptId, baseId, submittedDeptId, flowType, + publishDateBegin, publishDateEnd, pageNum, pageSize); } @Operation(summary = "审批知识流程") @@ -30,11 +60,9 @@ public class KnowledgeFlowController { @Operation(summary = "查询知识库流转记录") @GetMapping("queryKnowledgeFlowRecord") - public void queryKnowledgeFlowRecord(String knowledgeId){ + public void queryKnowledgeFlowRecord(String knowledgeId) { } - - } diff --git a/know_sub_business/src/main/java/com/supervision/knowsub/controller/knowledge/KnowledgeManageController.java b/know_sub_business/src/main/java/com/supervision/knowsub/controller/knowledge/KnowledgeManageController.java index 5f859cc..6f71c7c 100644 --- a/know_sub_business/src/main/java/com/supervision/knowsub/controller/knowledge/KnowledgeManageController.java +++ b/know_sub_business/src/main/java/com/supervision/knowsub/controller/knowledge/KnowledgeManageController.java @@ -16,6 +16,8 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; +import java.time.LocalDateTime; + @Slf4j @RestController @Tag(name = "知识库查询") @@ -29,16 +31,24 @@ public class KnowledgeManageController { @Parameters({ @Parameter(name = "status", description = "流转状态 为空查全部,1草稿 2通过 3驳回 4已撤回 5已失效 6已删除 10待审批(新增) 11待审批(删除) 12待审批(撤回)", in = ParameterIn.QUERY), @Parameter(name = "title", description = "标题,支持模糊", in = ParameterIn.QUERY), - @Parameter(name = "publishDeptName", description = "发文部门,支持模糊", in = ParameterIn.QUERY), + @Parameter(name = "publishDeptId", description = "发文部门id", in = ParameterIn.QUERY), + @Parameter(name = "baseId", description = "应用字库ID", in = ParameterIn.QUERY), + @Parameter(name = "submittedDeptId", description = "报送部门ID", in = ParameterIn.QUERY), + @Parameter(name = "publishDateBegin", description = "发文时间开始", in = ParameterIn.QUERY), + @Parameter(name = "publishDateEnd", description = "发文时间结束", in = ParameterIn.QUERY), @Parameter(name = "pageNum", description = "分页", in = ParameterIn.QUERY), @Parameter(name = "pageSize", description = "分页", in = ParameterIn.QUERY) }) @GetMapping("queryKnowledgePage") public IPage queryKnowledgePage(@RequestParam(required = false) Integer status, @RequestParam(required = false) String title, - @RequestParam(required = false) String publishDeptName, + @RequestParam(required = false) String publishDeptId, + @RequestParam(required = false) String baseId, + @RequestParam(required = false) String submittedDeptId, + @RequestParam(required = false)LocalDateTime publishDateBegin, + @RequestParam(required = false)LocalDateTime publishDateEnd, Integer pageNum, Integer pageSize) { - return knowledgeManageService.queryKnowledgePage(status, title, publishDeptName, pageNum, pageSize); + return knowledgeManageService.queryKnowledgePage(status, title, publishDeptId, baseId, submittedDeptId, publishDateBegin, publishDateEnd, pageNum, pageSize); } @Operation(summary = "新增知识库") @@ -50,7 +60,7 @@ public class KnowledgeManageController { @Operation(summary = "修改知识库(已撤回才能编辑)") @PostMapping("updateKnowledge") public void updateKnowledge(@RequestBody ModifyKnowledgeReqVO reqVO) { - Assert.notBlank(reqVO.getKnowledgeId(),"知识ID不能为空"); + Assert.notBlank(reqVO.getKnowledgeId(), "知识ID不能为空"); knowledgeManageService.updateKnowledge(reqVO); } diff --git a/know_sub_business/src/main/java/com/supervision/knowsub/entity/vo/knowledge/KnowledgeDetailResVO.java b/know_sub_business/src/main/java/com/supervision/knowsub/entity/vo/knowledge/KnowledgeDetailResVO.java index ed16966..ca5caf0 100644 --- a/know_sub_business/src/main/java/com/supervision/knowsub/entity/vo/knowledge/KnowledgeDetailResVO.java +++ b/know_sub_business/src/main/java/com/supervision/knowsub/entity/vo/knowledge/KnowledgeDetailResVO.java @@ -14,7 +14,7 @@ public class KnowledgeDetailResVO { private Knowledge knowledge; - private KnowledgeBaseInfo knowledgeBaseInfo; + private KnowledgeInfo knowledgeInfo; private KnowledgeContext knowledgeContext; diff --git a/know_sub_business/src/main/java/com/supervision/knowsub/entity/vo/knowledge/SaveKnowledgeReqVO.java b/know_sub_business/src/main/java/com/supervision/knowsub/entity/vo/knowledge/SaveKnowledgeReqVO.java index a32b8dd..b979b4a 100644 --- a/know_sub_business/src/main/java/com/supervision/knowsub/entity/vo/knowledge/SaveKnowledgeReqVO.java +++ b/know_sub_business/src/main/java/com/supervision/knowsub/entity/vo/knowledge/SaveKnowledgeReqVO.java @@ -1,13 +1,12 @@ package com.supervision.knowsub.entity.vo.knowledge; import cn.hutool.core.date.DateTime; -import com.supervision.knowsub.model.KnowledgeBaseInfo; +import com.supervision.knowsub.model.KnowledgeInfo; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Min; import lombok.Data; -import java.util.Date; import java.util.List; @Data @@ -21,6 +20,9 @@ public class SaveKnowledgeReqVO { @Schema(description = "报送人ID") private String userId; + @Schema(description = "应用子库ID") + private String baseId; + @Schema(description = "报送部门ID") private String submittedDeptId; @@ -39,8 +41,8 @@ public class SaveKnowledgeReqVO { @Schema(description = "链接列表") private List linkList; - @Schema(description = "发布部门") - private String publishDept; + @Schema(description = "发布部门Id") + private String publishDeptId; @Schema(description = "发文时间") private DateTime publishDate; @@ -48,6 +50,6 @@ public class SaveKnowledgeReqVO { @Schema(description = "知识的基础信息") - private KnowledgeBaseInfo knowledgeBaseInfo; + private KnowledgeInfo knowledgeInfo; } diff --git a/know_sub_business/src/main/java/com/supervision/knowsub/service/KnowledgeFlowService.java b/know_sub_business/src/main/java/com/supervision/knowsub/service/KnowledgeFlowService.java new file mode 100644 index 0000000..0d614aa --- /dev/null +++ b/know_sub_business/src/main/java/com/supervision/knowsub/service/KnowledgeFlowService.java @@ -0,0 +1,16 @@ +package com.supervision.knowsub.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.supervision.knowsub.model.KnowledgeFlowRecord; +import com.supervision.knowsub.vo.knowledge.KnowledgeFlowResVO; +import org.springframework.web.bind.annotation.RequestParam; + +import java.time.Instant; +import java.time.LocalDateTime; + +public interface KnowledgeFlowService { + + IPage queryKnowledgeFlowPage(Integer processStatus,String title, String publishDeptId, String baseId, String submittedDeptId, Instant flowType, + LocalDateTime publishDateBegin, LocalDateTime publishDateEnd, + Integer pageNum, Integer pageSize); +} diff --git a/know_sub_business/src/main/java/com/supervision/knowsub/service/KnowledgeManageService.java b/know_sub_business/src/main/java/com/supervision/knowsub/service/KnowledgeManageService.java index 2335208..81aebda 100644 --- a/know_sub_business/src/main/java/com/supervision/knowsub/service/KnowledgeManageService.java +++ b/know_sub_business/src/main/java/com/supervision/knowsub/service/KnowledgeManageService.java @@ -6,10 +6,20 @@ import com.supervision.knowsub.entity.vo.knowledge.ModifyKnowledgeReqVO; import com.supervision.knowsub.entity.vo.knowledge.SaveKnowledgeReqVO; import com.supervision.knowsub.model.Knowledge; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; + +import java.time.LocalDateTime; public interface KnowledgeManageService { - IPage queryKnowledgePage(Integer status, String title, String publishDeptName, Integer pageNum, Integer pageSize); + IPage queryKnowledgePage(Integer status, + String title, + String publishDeptId, + String baseId, + String submittedDeptId, + LocalDateTime publishDateBegin, + LocalDateTime publishDateEnd, + Integer pageNum, Integer pageSize); void saveKnowledge(SaveKnowledgeReqVO reqVO); diff --git a/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/KnowledgeFlowServiceImpl.java b/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/KnowledgeFlowServiceImpl.java new file mode 100644 index 0000000..973b9ca --- /dev/null +++ b/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/KnowledgeFlowServiceImpl.java @@ -0,0 +1,42 @@ +package com.supervision.knowsub.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.supervision.knowsub.exception.BusinessException; +import com.supervision.knowsub.mapper.KnowledgeFlowRecordMapper; +import com.supervision.knowsub.model.KnowledgeFlowRecord; +import com.supervision.knowsub.service.KnowledgeFlowRecordService; +import com.supervision.knowsub.service.KnowledgeFlowService; +import com.supervision.knowsub.vo.knowledge.KnowledgeFlowResVO; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.time.Instant; +import java.time.LocalDateTime; + +@Slf4j +@Service +@RequiredArgsConstructor +public class KnowledgeFlowServiceImpl implements KnowledgeFlowService { + + private final KnowledgeFlowRecordService knowledgeFlowRecordService; + + @Override + public IPage queryKnowledgeFlowPage(Integer processStatus, String title, String publishDeptId, String baseId, + String submittedDeptId, Instant flowType, + LocalDateTime publishDateBegin, LocalDateTime publishDateEnd, + Integer pageNum, Integer pageSize) { + // 查询待办 + if (1 == processStatus) { + return knowledgeFlowRecordService.queryKnowledgeFlowTodoPage(title, publishDeptId, baseId, submittedDeptId, flowType, + publishDateBegin, publishDateEnd, new Page<>(pageNum, pageSize)); + } + // 查询已办 + if (2 == processStatus) { + return knowledgeFlowRecordService.queryKnowledgeFlowCompletePage(title, publishDeptId, baseId, submittedDeptId, flowType, + publishDateBegin, publishDateEnd, new Page<>(pageNum, pageSize)); + } + throw new BusinessException("不支持的状态类型"); + } +} diff --git a/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/KnowledgeManageServiceImpl.java b/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/KnowledgeManageServiceImpl.java index c44651f..9f493c4 100644 --- a/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/KnowledgeManageServiceImpl.java +++ b/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/KnowledgeManageServiceImpl.java @@ -17,10 +17,10 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; import java.util.List; import java.util.Objects; import java.util.Set; -import java.util.stream.Collectors; @Slf4j @Service @@ -31,7 +31,7 @@ public class KnowledgeManageServiceImpl implements KnowledgeManageService { private final KnowledgeContextService knowledgeContextService; - private final KnowledgeBaseInfoService knowledgeBaseInfoService; + private final KnowledgeInfoService knowledgeInfoService; private final KnowledgeAttachmentService knowledgeAttachmentService; @@ -43,25 +43,36 @@ public class KnowledgeManageServiceImpl implements KnowledgeManageService { @Override - public IPage queryKnowledgePage(Integer status, String title, String publishDeptName, Integer pageNum, Integer pageSize) { + public IPage queryKnowledgePage(Integer status, + String title, + String publishDeptId, + String baseId, + String submittedDeptId, + LocalDateTime publishDateBegin, + LocalDateTime publishDateEnd, Integer pageNum, Integer pageSize) { String userId = UserUtil.getUser().getId(); - return knowledgeService.queryKnowledgePage(status, title, publishDeptName, userId, pageNum, pageSize); + return knowledgeService.queryKnowledgePage(status, title, publishDeptId, baseId, submittedDeptId, publishDateBegin, publishDateEnd, userId, pageNum, pageSize); } @Override @Transactional(rollbackFor = Exception.class) public void saveKnowledge(SaveKnowledgeReqVO reqVO) { + Assert.notBlank(reqVO.getBaseId(),"应用子库不能为空"); var context = new KnowledgeContext(); context.setContext(reqVO.getContent()); knowledgeContextService.save(context); + KnowledgeInfo baseInfo = reqVO.getKnowledgeInfo(); + baseInfo.setContextId(context.getId()); + knowledgeInfoService.save(baseInfo); + Knowledge knowledge = new Knowledge(); knowledge.setTitle(reqVO.getTitle()); knowledge.setContentId(context.getId()); - // TODO 这里目前子库设置为空 - knowledge.setBaseId(null); - knowledge.setPublishDept(reqVO.getPublishDept()); + knowledge.setInfoId(baseInfo.getId()); + knowledge.setBaseId(reqVO.getBaseId()); + knowledge.setPublishDeptId(reqVO.getPublishDeptId()); // 目前只有人工添加 knowledge.setKnowledgeFrom(1); knowledge.setStatus(reqVO.getOperate() == 1 ? StatusEnum.DRAFT.getStatus() : StatusEnum.WAIT_APPROVAL.getStatus()); @@ -71,9 +82,7 @@ public class KnowledgeManageServiceImpl implements KnowledgeManageService { } knowledgeService.save(knowledge); // 保存知识的基本信息 - KnowledgeBaseInfo baseInfo = reqVO.getKnowledgeBaseInfo(); - baseInfo.setContextId(context.getId()); - knowledgeBaseInfoService.save(baseInfo); + // 附件以及URL没添加 for (String fileId : reqVO.getFileIdList()) { KnowledgeAttachment attachment = new KnowledgeAttachment(); @@ -100,6 +109,7 @@ public class KnowledgeManageServiceImpl implements KnowledgeManageService { */ @Override public void updateKnowledge(ModifyKnowledgeReqVO reqVO) { + Assert.notBlank(reqVO.getBaseId(),"应用子库不能为空"); Knowledge knowledge = knowledgeService.getOptById(reqVO.getKnowledgeId()).orElseThrow(() -> new BusinessException("未找到知识")); // 首先校验状态,草稿/已撤回/已失效/驳回,才能修改(通过的,要先撤回才能修改) Set canModifyStatusSet = Set.of(StatusEnum.DRAFT.getStatus(), StatusEnum.RECALL.getStatus(), StatusEnum.INVALID.getStatus(), StatusEnum.REJECT.getStatus()); @@ -112,8 +122,8 @@ public class KnowledgeManageServiceImpl implements KnowledgeManageService { // 然后更新 knowledge.setTitle(reqVO.getTitle()); - // TODO 这里目前子库设置为空 - knowledge.setPublishDept(reqVO.getPublishDept()); + knowledge.setBaseId(reqVO.getBaseId()); + knowledge.setPublishDeptId(reqVO.getPublishDeptId()); knowledge.setSubmittedDeptId(reqVO.getSubmittedDeptId()); knowledge.setStatus(reqVO.getOperate() == 1 ? StatusEnum.DRAFT.getStatus() : StatusEnum.WAIT_APPROVAL.getStatus()); @@ -123,20 +133,20 @@ public class KnowledgeManageServiceImpl implements KnowledgeManageService { } knowledgeService.updateById(knowledge); // 更新基础信息 - KnowledgeBaseInfo knowledgeBaseInfo = reqVO.getKnowledgeBaseInfo(); - Assert.notBlank(knowledgeBaseInfo.getKnowledgeId(), "知识ID不能为空"); + KnowledgeInfo knowledgeInfo = reqVO.getKnowledgeInfo(); + Assert.notBlank(knowledgeInfo.getKnowledgeId(), "知识ID不能为空"); // 这里需要用SQL进行更新,不能用封装的updateById,因为前端某些字段可能变为空,用updateById不能让那个想为空的变成空 - knowledgeBaseInfoService.lambdaUpdate() - .set(KnowledgeBaseInfo::getPolicyType, knowledgeBaseInfo.getPolicyType()) - .set(KnowledgeBaseInfo::getTerritory, knowledgeBaseInfo.getTerritory()) - .set(KnowledgeBaseInfo::getPublishScope, knowledgeBaseInfo.getPublishScope()) - .set(KnowledgeBaseInfo::getKnowledgeTag, knowledgeBaseInfo.getKnowledgeTag()) - .set(KnowledgeBaseInfo::getAutoLoseEffect, knowledgeBaseInfo.getAutoLoseEffect()) - .set(KnowledgeBaseInfo::getExecTimeBegin, knowledgeBaseInfo.getExecTimeBegin()) - .set(KnowledgeBaseInfo::getExecTimeEnd, knowledgeBaseInfo.getExecTimeEnd()) - .set(KnowledgeBaseInfo::getTimeliness, knowledgeBaseInfo.getTimeliness()) - .set(KnowledgeBaseInfo::getPublishDate, knowledgeBaseInfo.getPublishDate()) - .eq(KnowledgeBaseInfo::getKnowledgeId, knowledgeBaseInfo.getKnowledgeId()).update(); + knowledgeInfoService.lambdaUpdate() + .set(KnowledgeInfo::getPolicyType, knowledgeInfo.getPolicyType()) + .set(KnowledgeInfo::getTerritory, knowledgeInfo.getTerritory()) + .set(KnowledgeInfo::getPublishScope, knowledgeInfo.getPublishScope()) + .set(KnowledgeInfo::getKnowledgeTag, knowledgeInfo.getKnowledgeTag()) + .set(KnowledgeInfo::getAutoLoseEffect, knowledgeInfo.getAutoLoseEffect()) + .set(KnowledgeInfo::getExecTimeBegin, knowledgeInfo.getExecTimeBegin()) + .set(KnowledgeInfo::getExecTimeEnd, knowledgeInfo.getExecTimeEnd()) + .set(KnowledgeInfo::getTimeliness, knowledgeInfo.getTimeliness()) + .set(KnowledgeInfo::getPublishDate, knowledgeInfo.getPublishDate()) + .eq(KnowledgeInfo::getKnowledgeId, knowledgeInfo.getKnowledgeId()).update(); // 有可能更新附件 updateKnowledgeFile(reqVO, knowledge); // 有可能更新URL @@ -211,13 +221,13 @@ public class KnowledgeManageServiceImpl implements KnowledgeManageService { @Override public KnowledgeDetailResVO queryKnowledgeDetail(String knowledgeId) { Knowledge knowledge = knowledgeService.getOptById(knowledgeId).orElseThrow(() -> new BusinessException("未找到知识")); - KnowledgeBaseInfo knowledgeBaseInfo = knowledgeBaseInfoService.lambdaQuery().eq(KnowledgeBaseInfo::getKnowledgeId, knowledgeId).oneOpt().orElse(new KnowledgeBaseInfo()); + KnowledgeInfo knowledgeInfo = knowledgeInfoService.lambdaQuery().eq(KnowledgeInfo::getKnowledgeId, knowledgeId).oneOpt().orElse(new KnowledgeInfo()); KnowledgeContext knowledgeContext = knowledgeContextService.getOptById(knowledge.getContentId()).orElse(new KnowledgeContext()); List knowledgeLinkList = knowledgeLinkService.lambdaQuery().eq(KnowledgeLink::getKnowledgeId, knowledgeId).list(); List knowledgeAttachmentList = knowledgeAttachmentService.lambdaQuery().eq(KnowledgeAttachment::getKnowledgeId, knowledgeId).list(); List fileIdList = knowledgeAttachmentList.stream().map(KnowledgeAttachment::getFileId).toList(); List fileInfos = fileService.listByFileId(fileIdList); - return new KnowledgeDetailResVO(knowledge, knowledgeBaseInfo, knowledgeContext, knowledgeLinkList, fileInfos); + return new KnowledgeDetailResVO(knowledge, knowledgeInfo, knowledgeContext, knowledgeLinkList, fileInfos); } @Override @@ -230,7 +240,7 @@ public class KnowledgeManageServiceImpl implements KnowledgeManageService { if (flowRecordService.lambdaQuery().eq(KnowledgeFlowRecord::getKnowledgeId, knowledgeId).count() == 0) { // 如果没有走过审批的记录,则可以直接删除 knowledgeService.removeById(knowledgeId); - knowledgeBaseInfoService.lambdaUpdate().eq(KnowledgeBaseInfo::getKnowledgeId, knowledgeId).remove(); + knowledgeInfoService.lambdaUpdate().eq(KnowledgeInfo::getKnowledgeId, knowledgeId).remove(); knowledgeContextService.lambdaUpdate().eq(KnowledgeContext::getId, knowledge.getContentId()).remove(); // 删除文件 List list = knowledgeAttachmentService.lambdaQuery().eq(KnowledgeAttachment::getKnowledgeId, knowledgeId).list(); diff --git a/know_sub_model/src/main/java/com/supervision/knowsub/mapper/KnowledgeFlowRecordMapper.java b/know_sub_model/src/main/java/com/supervision/knowsub/mapper/KnowledgeFlowRecordMapper.java index 226065c..e976b38 100644 --- a/know_sub_model/src/main/java/com/supervision/knowsub/mapper/KnowledgeFlowRecordMapper.java +++ b/know_sub_model/src/main/java/com/supervision/knowsub/mapper/KnowledgeFlowRecordMapper.java @@ -1,16 +1,42 @@ package com.supervision.knowsub.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.supervision.knowsub.model.KnowledgeFlowRecord; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.supervision.knowsub.vo.knowledge.KnowledgeFlowResVO; +import org.apache.ibatis.annotations.Param; + +import java.time.Instant; +import java.time.LocalDateTime; /** -* @author Administrator -* @description 针对表【ks_knowledge_flow_record(知识报送审批记录表)】的数据库操作Mapper -* @createDate 2024-06-24 11:35:15 -* @Entity com.supervision.knowsub.model.KnowledgeFlowRecord -*/ + * @author Administrator + * @description 针对表【ks_knowledge_flow_record(知识报送审批记录表)】的数据库操作Mapper + * @createDate 2024-06-24 11:35:15 + * @Entity com.supervision.knowsub.model.KnowledgeFlowRecord + */ public interface KnowledgeFlowRecordMapper extends BaseMapper { + IPage queryKnowledgeFlowTodoPage( + @Param("title") String title, + @Param("publishDeptId") String publishDeptId, + @Param("baseId") String baseId, + @Param("submittedDeptId") String submittedDeptId, + @Param("flowType") Instant flowType, + @Param("publishDateBegin") LocalDateTime publishDateBegin, + @Param("publishDateEnd") LocalDateTime publishDateEnd, + Page page); + + IPage queryKnowledgeFlowCompletePage( @Param("title") String title, + @Param("publishDeptId") String publishDeptId, + @Param("baseId") String baseId, + @Param("submittedDeptId") String submittedDeptId, + @Param("flowType") Instant flowType, + @Param("publishDateBegin") LocalDateTime publishDateBegin, + @Param("publishDateEnd") LocalDateTime publishDateEnd, + Page page); + } diff --git a/know_sub_model/src/main/java/com/supervision/knowsub/mapper/KnowledgeBaseInfoMapper.java b/know_sub_model/src/main/java/com/supervision/knowsub/mapper/KnowledgeInfoMapper.java similarity index 58% rename from know_sub_model/src/main/java/com/supervision/knowsub/mapper/KnowledgeBaseInfoMapper.java rename to know_sub_model/src/main/java/com/supervision/knowsub/mapper/KnowledgeInfoMapper.java index 24423b5..4da8b98 100644 --- a/know_sub_model/src/main/java/com/supervision/knowsub/mapper/KnowledgeBaseInfoMapper.java +++ b/know_sub_model/src/main/java/com/supervision/knowsub/mapper/KnowledgeInfoMapper.java @@ -1,15 +1,15 @@ package com.supervision.knowsub.mapper; -import com.supervision.knowsub.model.KnowledgeBaseInfo; +import com.supervision.knowsub.model.KnowledgeInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author Administrator * @description 针对表【ks_knowledge_base_info(知识基本信息表)】的数据库操作Mapper * @createDate 2024-06-24 11:35:15 -* @Entity com.supervision.knowsub.model.KnowledgeBaseInfo +* @Entity com.supervision.knowsub.model.KnowledgeInfo */ -public interface KnowledgeBaseInfoMapper extends BaseMapper { +public interface KnowledgeInfoMapper extends BaseMapper { } diff --git a/know_sub_model/src/main/java/com/supervision/knowsub/mapper/KnowledgeMapper.java b/know_sub_model/src/main/java/com/supervision/knowsub/mapper/KnowledgeMapper.java index dd6c008..8367028 100644 --- a/know_sub_model/src/main/java/com/supervision/knowsub/mapper/KnowledgeMapper.java +++ b/know_sub_model/src/main/java/com/supervision/knowsub/mapper/KnowledgeMapper.java @@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.supervision.knowsub.model.Knowledge; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.time.LocalDateTime; /** * @author Administrator @@ -13,7 +16,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface KnowledgeMapper extends BaseMapper { - IPage queryKnowledgePage(Integer status, String title, String publishDeptName,String userId, Page page); + IPage queryKnowledgePage(@Param("status") Integer status, + @Param("title") String title, + @Param("publishDeptId") String publishDeptId, + @Param("baseId") String baseId, + @Param("submittedDeptId") String submittedDeptId, + @Param("publishDateBegin") LocalDateTime publishDateBegin, + @Param("publishDateEnd") LocalDateTime publishDateEnd, + @Param("userId") String userId, Page page); } diff --git a/know_sub_model/src/main/java/com/supervision/knowsub/model/Knowledge.java b/know_sub_model/src/main/java/com/supervision/knowsub/model/Knowledge.java index 8d9b5d1..a049236 100644 --- a/know_sub_model/src/main/java/com/supervision/knowsub/model/Knowledge.java +++ b/know_sub_model/src/main/java/com/supervision/knowsub/model/Knowledge.java @@ -36,6 +36,12 @@ public class Knowledge implements Serializable { @Schema(description = "知识内容ID") private String contentId; + /** + * 知识基本信息ID + */ + @Schema(description = "知识基本信息ID") + private String infoId; + /** * 应用子库ID */ @@ -43,10 +49,10 @@ public class Knowledge implements Serializable { private String baseId; /** - * 发文部门(部门名称全文) + * 发文部门ID */ - @Schema(description = "发文部门(部门名称全文)") - private String publishDept; + @Schema(description = "发文部门ID") + private String publishDeptId; /** * 知识来源 1人工添加 diff --git a/know_sub_model/src/main/java/com/supervision/knowsub/model/KnowledgeFlowRecord.java b/know_sub_model/src/main/java/com/supervision/knowsub/model/KnowledgeFlowRecord.java index f9c6b7e..7523508 100644 --- a/know_sub_model/src/main/java/com/supervision/knowsub/model/KnowledgeFlowRecord.java +++ b/know_sub_model/src/main/java/com/supervision/knowsub/model/KnowledgeFlowRecord.java @@ -29,6 +29,16 @@ public class KnowledgeFlowRecord implements Serializable { */ private String flowId; + /** + * 审批类型 1知识报送 2:知识撤回 3 知识删除 + */ + private Integer flowType; + + /** + * 流程对应的流转规则节点ID + */ + private String flowRuleId; + /** * 操作名称 */ @@ -39,6 +49,11 @@ public class KnowledgeFlowRecord implements Serializable { */ private String processUserId; + /** + * 审批人所在部门 + */ + private String processDeptId; + /** * 审批时间 */ @@ -49,6 +64,16 @@ public class KnowledgeFlowRecord implements Serializable { */ private String remark; + /** + * 提交人ID + */ + private String submitUserId; + + /** + * 提交人所在部门 + */ + private String submitDeptId; + /** * 创建人ID */ diff --git a/know_sub_model/src/main/java/com/supervision/knowsub/model/KnowledgeFlowTodo.java b/know_sub_model/src/main/java/com/supervision/knowsub/model/KnowledgeFlowTodo.java new file mode 100644 index 0000000..6903824 --- /dev/null +++ b/know_sub_model/src/main/java/com/supervision/knowsub/model/KnowledgeFlowTodo.java @@ -0,0 +1,71 @@ +package com.supervision.knowsub.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; +import lombok.Data; + +/** + * 流程审批待办表 + * @TableName ks_knowledge_flow_todo + */ +@TableName(value ="ks_knowledge_flow_todo") +@Data +public class KnowledgeFlowTodo implements Serializable { + /** + * 主键 + */ + @TableId + private String id; + + /** + * 流程ID + */ + private String flowId; + + /** + * 审批类型 1知识报送 2:知识撤回 3 知识删除 + */ + private Integer flowType; + + /** + * 知识ID + */ + private String knowledgeId; + + /** + * 节点ID + */ + private String ruleId; + + /** + * 代办人ID + */ + private String todoUserId; + + /** + * 创建人ID + */ + private String createUserId; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + /** + * 更新人ID + */ + private String updateUserId; + + /** + * 更新时间 + */ + private LocalDateTime updateTime; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/know_sub_model/src/main/java/com/supervision/knowsub/model/KnowledgeBaseInfo.java b/know_sub_model/src/main/java/com/supervision/knowsub/model/KnowledgeInfo.java similarity index 96% rename from know_sub_model/src/main/java/com/supervision/knowsub/model/KnowledgeBaseInfo.java rename to know_sub_model/src/main/java/com/supervision/knowsub/model/KnowledgeInfo.java index bb80953..bf47150 100644 --- a/know_sub_model/src/main/java/com/supervision/knowsub/model/KnowledgeBaseInfo.java +++ b/know_sub_model/src/main/java/com/supervision/knowsub/model/KnowledgeInfo.java @@ -13,9 +13,9 @@ import lombok.Data; * * @TableName ks_knowledge_base_info */ -@TableName(value = "ks_knowledge_base_info") +@TableName(value = "ks_knowledge_info") @Data -public class KnowledgeBaseInfo implements Serializable { +public class KnowledgeInfo implements Serializable { /** * 主键 */ diff --git a/know_sub_model/src/main/java/com/supervision/knowsub/service/KnowledgeFlowRecordService.java b/know_sub_model/src/main/java/com/supervision/knowsub/service/KnowledgeFlowRecordService.java index 12c29c8..065a294 100644 --- a/know_sub_model/src/main/java/com/supervision/knowsub/service/KnowledgeFlowRecordService.java +++ b/know_sub_model/src/main/java/com/supervision/knowsub/service/KnowledgeFlowRecordService.java @@ -1,7 +1,13 @@ package com.supervision.knowsub.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.supervision.knowsub.model.KnowledgeFlowRecord; import com.baomidou.mybatisplus.extension.service.IService; +import com.supervision.knowsub.vo.knowledge.KnowledgeFlowResVO; + +import java.time.Instant; +import java.time.LocalDateTime; /** * @author Administrator @@ -10,4 +16,20 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface KnowledgeFlowRecordService extends IService { + /** + * 查询待办 + */ + IPage queryKnowledgeFlowTodoPage(String title, String publishDeptId, String baseId, + String submittedDeptId, Instant flowType, + LocalDateTime publishDateBegin, LocalDateTime publishDateEnd, + Page page); + + /** + * 查询已办 + */ + IPage queryKnowledgeFlowCompletePage(String title, String publishDeptId, String baseId, + String submittedDeptId, Instant flowType, + LocalDateTime publishDateBegin, LocalDateTime publishDateEnd, + Page page); + } diff --git a/know_sub_model/src/main/java/com/supervision/knowsub/service/KnowledgeFlowTodoService.java b/know_sub_model/src/main/java/com/supervision/knowsub/service/KnowledgeFlowTodoService.java new file mode 100644 index 0000000..07350ae --- /dev/null +++ b/know_sub_model/src/main/java/com/supervision/knowsub/service/KnowledgeFlowTodoService.java @@ -0,0 +1,13 @@ +package com.supervision.knowsub.service; + +import com.supervision.knowsub.model.KnowledgeFlowTodo; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author flevance +* @description 针对表【ks_knowledge_flow_todo(流程审批待办表)】的数据库操作Service +* @createDate 2024-06-26 11:21:49 +*/ +public interface KnowledgeFlowTodoService extends IService { + +} diff --git a/know_sub_model/src/main/java/com/supervision/knowsub/service/KnowledgeBaseInfoService.java b/know_sub_model/src/main/java/com/supervision/knowsub/service/KnowledgeInfoService.java similarity index 66% rename from know_sub_model/src/main/java/com/supervision/knowsub/service/KnowledgeBaseInfoService.java rename to know_sub_model/src/main/java/com/supervision/knowsub/service/KnowledgeInfoService.java index eaa005e..15bfc24 100644 --- a/know_sub_model/src/main/java/com/supervision/knowsub/service/KnowledgeBaseInfoService.java +++ b/know_sub_model/src/main/java/com/supervision/knowsub/service/KnowledgeInfoService.java @@ -1,6 +1,6 @@ package com.supervision.knowsub.service; -import com.supervision.knowsub.model.KnowledgeBaseInfo; +import com.supervision.knowsub.model.KnowledgeInfo; import com.baomidou.mybatisplus.extension.service.IService; /** @@ -8,6 +8,6 @@ import com.baomidou.mybatisplus.extension.service.IService; * @description 针对表【ks_knowledge_base_info(知识基本信息表)】的数据库操作Service * @createDate 2024-06-24 11:35:15 */ -public interface KnowledgeBaseInfoService extends IService { +public interface KnowledgeInfoService extends IService { } diff --git a/know_sub_model/src/main/java/com/supervision/knowsub/service/KnowledgeService.java b/know_sub_model/src/main/java/com/supervision/knowsub/service/KnowledgeService.java index c5b9156..ea98e8f 100644 --- a/know_sub_model/src/main/java/com/supervision/knowsub/service/KnowledgeService.java +++ b/know_sub_model/src/main/java/com/supervision/knowsub/service/KnowledgeService.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.supervision.knowsub.model.Knowledge; import com.baomidou.mybatisplus.extension.service.IService; +import java.time.LocalDateTime; + /** * @author Administrator * @description 针对表【ks_knowledge(知识表)】的数据库操作Service @@ -13,13 +15,16 @@ public interface KnowledgeService extends IService { /** * 分页查询知识 - * @param status 状态 - * @param title 标题,支持模糊 - * @param publishDeptName 发布机构,支持模糊 * @param pageNum pageNum * @param pageSize pageSize * @return IPage */ - IPage queryKnowledgePage(Integer status, String title, String publishDeptName,String userId, Integer pageNum, Integer pageSize); + IPage queryKnowledgePage(Integer status, + String title, + String publishDeptId, + String baseId, + String submittedDeptId, + LocalDateTime publishDateBegin, + LocalDateTime publishDateEnd,String userId, Integer pageNum, Integer pageSize); } diff --git a/know_sub_model/src/main/java/com/supervision/knowsub/service/impl/KnowledgeFlowRecordServiceImpl.java b/know_sub_model/src/main/java/com/supervision/knowsub/service/impl/KnowledgeFlowRecordServiceImpl.java index 9eac4e2..fa8e779 100644 --- a/know_sub_model/src/main/java/com/supervision/knowsub/service/impl/KnowledgeFlowRecordServiceImpl.java +++ b/know_sub_model/src/main/java/com/supervision/knowsub/service/impl/KnowledgeFlowRecordServiceImpl.java @@ -1,11 +1,17 @@ package com.supervision.knowsub.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.supervision.knowsub.model.KnowledgeFlowRecord; import com.supervision.knowsub.service.KnowledgeFlowRecordService; import com.supervision.knowsub.mapper.KnowledgeFlowRecordMapper; +import com.supervision.knowsub.vo.knowledge.KnowledgeFlowResVO; import org.springframework.stereotype.Service; +import java.time.Instant; +import java.time.LocalDateTime; + /** * @author Administrator * @description 针对表【ks_knowledge_flow_record(知识报送审批记录表)】的数据库操作Service实现 @@ -15,6 +21,18 @@ import org.springframework.stereotype.Service; public class KnowledgeFlowRecordServiceImpl extends ServiceImpl implements KnowledgeFlowRecordService{ + @Override + public IPage queryKnowledgeFlowTodoPage(String title, String publishDeptId, String baseId, String submittedDeptId, Instant flowType, + LocalDateTime publishDateBegin, LocalDateTime publishDateEnd, + Page page) { + return this.baseMapper.queryKnowledgeFlowTodoPage(title, publishDeptId, baseId, submittedDeptId, flowType, publishDateBegin, publishDateEnd, page); + } + + @Override + public IPage queryKnowledgeFlowCompletePage(String title, String publishDeptId, String baseId, String submittedDeptId, Instant flowType, + LocalDateTime publishDateBegin, LocalDateTime publishDateEnd, Page page) { + return this.baseMapper.queryKnowledgeFlowCompletePage(title, publishDeptId, baseId, submittedDeptId, flowType, publishDateBegin, publishDateEnd, page); + } } diff --git a/know_sub_model/src/main/java/com/supervision/knowsub/service/impl/KnowledgeFlowTodoServiceImpl.java b/know_sub_model/src/main/java/com/supervision/knowsub/service/impl/KnowledgeFlowTodoServiceImpl.java new file mode 100644 index 0000000..54a73dc --- /dev/null +++ b/know_sub_model/src/main/java/com/supervision/knowsub/service/impl/KnowledgeFlowTodoServiceImpl.java @@ -0,0 +1,22 @@ +package com.supervision.knowsub.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.supervision.knowsub.model.KnowledgeFlowTodo; +import com.supervision.knowsub.service.KnowledgeFlowTodoService; +import com.supervision.knowsub.mapper.KnowledgeFlowTodoMapper; +import org.springframework.stereotype.Service; + +/** +* @author flevance +* @description 针对表【ks_knowledge_flow_todo(流程审批待办表)】的数据库操作Service实现 +* @createDate 2024-06-26 11:21:49 +*/ +@Service +public class KnowledgeFlowTodoServiceImpl extends ServiceImpl + implements KnowledgeFlowTodoService{ + +} + + + + diff --git a/know_sub_model/src/main/java/com/supervision/knowsub/service/impl/KnowledgeBaseInfoServiceImpl.java b/know_sub_model/src/main/java/com/supervision/knowsub/service/impl/KnowledgeInfoServiceImpl.java similarity index 51% rename from know_sub_model/src/main/java/com/supervision/knowsub/service/impl/KnowledgeBaseInfoServiceImpl.java rename to know_sub_model/src/main/java/com/supervision/knowsub/service/impl/KnowledgeInfoServiceImpl.java index ca83fb7..bc544d7 100644 --- a/know_sub_model/src/main/java/com/supervision/knowsub/service/impl/KnowledgeBaseInfoServiceImpl.java +++ b/know_sub_model/src/main/java/com/supervision/knowsub/service/impl/KnowledgeInfoServiceImpl.java @@ -1,9 +1,9 @@ package com.supervision.knowsub.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.supervision.knowsub.model.KnowledgeBaseInfo; -import com.supervision.knowsub.service.KnowledgeBaseInfoService; -import com.supervision.knowsub.mapper.KnowledgeBaseInfoMapper; +import com.supervision.knowsub.model.KnowledgeInfo; +import com.supervision.knowsub.service.KnowledgeInfoService; +import com.supervision.knowsub.mapper.KnowledgeInfoMapper; import org.springframework.stereotype.Service; /** @@ -12,8 +12,8 @@ import org.springframework.stereotype.Service; * @createDate 2024-06-24 11:35:15 */ @Service -public class KnowledgeBaseInfoServiceImpl extends ServiceImpl - implements KnowledgeBaseInfoService{ +public class KnowledgeInfoServiceImpl extends ServiceImpl + implements KnowledgeInfoService { } diff --git a/know_sub_model/src/main/java/com/supervision/knowsub/service/impl/KnowledgeServiceImpl.java b/know_sub_model/src/main/java/com/supervision/knowsub/service/impl/KnowledgeServiceImpl.java index 592a728..6079c84 100644 --- a/know_sub_model/src/main/java/com/supervision/knowsub/service/impl/KnowledgeServiceImpl.java +++ b/know_sub_model/src/main/java/com/supervision/knowsub/service/impl/KnowledgeServiceImpl.java @@ -8,6 +8,8 @@ import com.supervision.knowsub.service.KnowledgeService; import com.supervision.knowsub.mapper.KnowledgeMapper; import org.springframework.stereotype.Service; +import java.time.LocalDateTime; + /** * @author Administrator * @description 针对表【ks_knowledge(知识表)】的数据库操作Service实现 @@ -18,8 +20,14 @@ public class KnowledgeServiceImpl extends ServiceImpl queryKnowledgePage(Integer status, String title, String publishDeptName, String userId, Integer pageNum, Integer pageSize) { - return this.baseMapper.queryKnowledgePage(status, title, publishDeptName, userId, new Page<>(pageNum, pageSize)); + public IPage queryKnowledgePage(Integer status, + String title, + String publishDeptId, + String baseId, + String submittedDeptId, + LocalDateTime publishDateBegin, + LocalDateTime publishDateEnd, String userId, Integer pageNum, Integer pageSize) { + return this.baseMapper.queryKnowledgePage(status, title, publishDeptId, baseId, submittedDeptId, publishDateBegin, publishDateEnd, userId, new Page<>(pageNum, pageSize)); } } diff --git a/know_sub_model/src/main/java/com/supervision/knowsub/vo/knowledge/KnowledgeFlowResVO.java b/know_sub_model/src/main/java/com/supervision/knowsub/vo/knowledge/KnowledgeFlowResVO.java new file mode 100644 index 0000000..9241888 --- /dev/null +++ b/know_sub_model/src/main/java/com/supervision/knowsub/vo/knowledge/KnowledgeFlowResVO.java @@ -0,0 +1,26 @@ +package com.supervision.knowsub.vo.knowledge; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +@Schema +public class KnowledgeFlowResVO { + + @Schema(description = "待办ID") + private String todoId; + @Schema(description = "知识ID") + private String knowledgeId; + @Schema(description = "标题") + private String title; + @Schema(description = "审批类型 1知识报送 2:知识撤回 3 知识删除") + private String flowType; + @Schema(description = "提交部门名称") + private String submitDeptName; + @Schema(description = "提交人名称") + private String submitUserName; + @Schema(description = "知识来源 1人工提报") + private String knowledgeFrom; + + +} diff --git a/know_sub_model/src/main/resources/mapper/KnowledgeFlowRecordMapper.xml b/know_sub_model/src/main/resources/mapper/KnowledgeFlowRecordMapper.xml index b30f27f..a71f056 100644 --- a/know_sub_model/src/main/resources/mapper/KnowledgeFlowRecordMapper.xml +++ b/know_sub_model/src/main/resources/mapper/KnowledgeFlowRecordMapper.xml @@ -5,23 +5,113 @@ - - - - - - - - - - - + + + + + + + + + + + + + - id,knowledge_id,flow_id, + id + ,knowledge_id,flow_id,flow_type, process_name,process_user_id,process_time, remark,create_user_id,create_time, update_user_id,update_time + + + + diff --git a/know_sub_model/src/main/resources/mapper/KnowledgeFlowTodoMapper.xml b/know_sub_model/src/main/resources/mapper/KnowledgeFlowTodoMapper.xml new file mode 100644 index 0000000..e8de8ee --- /dev/null +++ b/know_sub_model/src/main/resources/mapper/KnowledgeFlowTodoMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + id + ,flow_id,flow_type,knowledge_id, + rule_id,todo_user_id,create_user_id, + create_time,update_user_id,update_time + + diff --git a/know_sub_model/src/main/resources/mapper/KnowledgeBaseInfoMapper.xml b/know_sub_model/src/main/resources/mapper/KnowledgeInfoMapper.xml similarity index 94% rename from know_sub_model/src/main/resources/mapper/KnowledgeBaseInfoMapper.xml rename to know_sub_model/src/main/resources/mapper/KnowledgeInfoMapper.xml index 75d00be..7cb4f8c 100644 --- a/know_sub_model/src/main/resources/mapper/KnowledgeBaseInfoMapper.xml +++ b/know_sub_model/src/main/resources/mapper/KnowledgeInfoMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/know_sub_model/src/main/resources/mapper/KnowledgeMapper.xml b/know_sub_model/src/main/resources/mapper/KnowledgeMapper.xml index 18caa4d..fb24af9 100644 --- a/know_sub_model/src/main/resources/mapper/KnowledgeMapper.xml +++ b/know_sub_model/src/main/resources/mapper/KnowledgeMapper.xml @@ -8,8 +8,9 @@ + - + @@ -22,28 +23,40 @@ id - ,title,content_id, - base_id,publish_dept,knowledge_from, + ,title,content_id,info_id, + base_id,publish_dept_id,knowledge_from, status,submitted_dept_id,create_user_id, create_time,update_user_id,update_time