diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java index 9bced05..abe1bb2 100644 --- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java +++ b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java @@ -86,6 +86,6 @@ public interface ErrorCodeConstants { // ========== 评论 1_009_017_000 ========== ErrorCode COMMENT_NOT_EXISTS = new ErrorCode(1_009_017_000, "评论不存在"); // ========== 我的收藏 1_009_018_000 - ErrorCode STAR2_NOT_EXISTS = new ErrorCode(1_009_018_000, "我的收藏不存在"); + ErrorCode STAR2_NOT_EXISTS = new ErrorCode(1_009_018_000, "收藏不存在"); } diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/star2/vo/Star2PageReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/star2/vo/Star2PageReqVO.java index 0d07a75..e1b334c 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/star2/vo/Star2PageReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/star2/vo/Star2PageReqVO.java @@ -15,6 +15,9 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_ @ToString(callSuper = true) public class Star2PageReqVO extends PageParam { + @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "16811") + private Long id; + @Schema(description = "知识id", example = "27650") private Long kowsmId; @@ -28,4 +31,4 @@ public class Star2PageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; -} \ No newline at end of file +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/star2/vo/Star2RespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/star2/vo/Star2RespVO.java index 25f4709..d56c011 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/star2/vo/Star2RespVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/star2/vo/Star2RespVO.java @@ -12,6 +12,10 @@ import com.alibaba.excel.annotation.*; @ExcelIgnoreUnannotated public class Star2RespVO { + @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "16811") + @ExcelProperty("id") + private Long id; + @Schema(description = "知识id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27650") @ExcelProperty("知识id") private Long kowsmId; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/star2/vo/Star2SaveReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/star2/vo/Star2SaveReqVO.java index 93114cf..9a74abd 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/star2/vo/Star2SaveReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/star2/vo/Star2SaveReqVO.java @@ -9,6 +9,9 @@ import javax.validation.constraints.*; @Data public class Star2SaveReqVO { + @Schema(description = "id", example = "16811") + private Long id; + @Schema(description = "知识id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27650") @NotNull(message = "知识id不能为空") private Long kowsmId; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/star2/Star2Convert.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/star2/Star2Convert.java index 7985d23..57c0b16 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/star2/Star2Convert.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/star2/Star2Convert.java @@ -37,7 +37,6 @@ public interface Star2Convert { if (knowledge != null){ Star2VO.setKowsmTitle(knowledge.getKnowTitle()); } - System.out.println(Star2VO); return Star2VO; } } diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/star2/Star2Mapper.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/star2/Star2Mapper.java index 9184d58..8d013d1 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/star2/Star2Mapper.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/star2/Star2Mapper.java @@ -19,6 +19,7 @@ public interface Star2Mapper extends BaseMapperX { default PageResult selectPage(Star2PageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(Star2DO::getId, reqVO.getId()) .eqIfPresent(Star2DO::getKowsmId, reqVO.getKowsmId()) .eqIfPresent(Star2DO::getUserId, reqVO.getUserId()) .eqIfPresent(Star2DO::getKowsId, reqVO.getKowsId()) @@ -26,4 +27,4 @@ public interface Star2Mapper extends BaseMapperX { .orderByDesc(Star2DO::getId)); } -} \ No newline at end of file +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/knows/KnowledgeService.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/knows/KnowledgeService.java index 9c23b02..e08bddc 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/knows/KnowledgeService.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/knows/KnowledgeService.java @@ -1,13 +1,16 @@ package cn.iocoder.yudao.module.bpm.service.knows; import java.util.*; +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; import cn.iocoder.yudao.module.bpm.controller.admin.knows.vo.*; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOALeavePageReqVO; import cn.iocoder.yudao.module.bpm.dal.dataobject.knows.KnowledgeDO; import cn.iocoder.yudao.module.bpm.dal.dataobject.knows.CommentDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.module.bpm.dal.dataobject.knows.KnowtypeDO; import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOALeaveDO; +import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import javax.validation.Valid; @@ -66,12 +69,14 @@ public interface KnowledgeService { * @return 评论列表 */ List getCommentListByKnowId(Long knowId); - /** - * 更新请假申请的状态 - * - * @param id 编号 - * @param status 结果 - */ - void updateKnowledgeStatus(Long id, Integer status); + + List getKnowledgeList(KnowledgePageReqVO listReqVO); + + List getKnowledgeList(Collection ids); + default Map getKnowledgeMap(Collection ids) { + List list = getKnowledgeList(ids); + return CollectionUtils.convertMap(list, KnowledgeDO::getId); + } + } diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/knows/KnowledgeServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/knows/KnowledgeServiceImpl.java index aad23e2..0ce0a05 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/knows/KnowledgeServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/knows/KnowledgeServiceImpl.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.bpm.service.knows; +import cn.hutool.core.collection.CollUtil; import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi; import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOALeaveDO; @@ -114,6 +115,17 @@ public class KnowledgeServiceImpl implements KnowledgeService { list.forEach(o -> o.setKnowId(knowId)); commentMapper.insertBatch(list); } + @Override + public List getKnowledgeList(KnowledgePageReqVO listReqVO) { + return knowledgeMapper.selectList(listReqVO); + } + @Override + public List getKnowledgeList(Collection ids) { + if (CollUtil.isEmpty(ids)) { + return Collections.emptyList(); + } + return knowledgeMapper.selectBatchIds(ids); + } private void updateCommentList(Long knowId, List list) { deleteCommentByKnowId(knowId);