From 2e6d8f5bc027b2736b1fd452f2d6de403f196739 Mon Sep 17 00:00:00 2001 From: liu Date: Fri, 5 Jul 2024 10:41:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96,=E9=A6=96=E9=A1=B5=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/HomepageServiceImpl.java | 18 ++++++++---------- .../mapper/KnowledgeFlowRecordMapper.xml | 2 +- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/HomepageServiceImpl.java b/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/HomepageServiceImpl.java index abef5b7..30ebc9a 100644 --- a/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/HomepageServiceImpl.java +++ b/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/HomepageServiceImpl.java @@ -35,9 +35,9 @@ public class HomepageServiceImpl implements HomepageService { private final KnowledgeSubmitRecordService knowledgeSubmitRecordService; /** - * 先看用户是否具有任意节点的审批权限， - * 如果被配置审批权限，则认为为知识审批人员视角。 - * 如没有被配置审批权限，则以报送人员视角进行统计 + * 先看用户是否是知识审批角色 + * 如果是知识审批角色,则按知识审批角色统计 + * 如没有知识审批角色，则以报送人员视角进行统计 * 如没有任何角色权限，数据全部显示为0 *

* 知识数量:如果多次审批,则进行去重,只保留一次 @@ -69,10 +69,10 @@ public class HomepageServiceImpl implements HomepageService { resVO.setLastLoginTime(systemUser.getRecentLoginTime()); // 首先查询用户是否有审批的权限, List roleTypeList = user.getRoleTypeList(); + Long passTotalCount = knowledgeService.lambdaQuery().eq(Knowledge::getStatus, StatusEnum.PASS.getStatus()).count(); + resVO.setKnowledgeCount(passTotalCount); // 如果用户有审批权限,则以审批人的视角 if (roleTypeList.contains(RoleTypeEnum.KNOWLEDGE_APPROVAL.getRoleType())) { - // 全量知识,所有审批通过的 - resVO.setKnowledgeCount(knowledgeService.lambdaQuery().eq(Knowledge::getStatus, StatusEnum.PASS.getStatus()).count()); // 待审批 resVO.setWaitProcessCount(knowledgeFlowTodoService.lambdaQuery().eq(KnowledgeFlowTodo::getTodoUserId, user.getId()).count()); // 由我审批并标记为审批通过的数量 @@ -80,12 +80,10 @@ public class HomepageServiceImpl implements HomepageService { // 由我审批并标记为“驳回”的知识数量。 resVO.setRejectProcessCount(knowledgeFlowRecordService.queryPassProcessCountByUser(user.getId(), 2, null)); // 查询由我审批且目前已失效的 - resVO.setInvalidProcessCount(knowledgeFlowRecordService.queryPassProcessCountByUser(user.getId(), null, null)); + resVO.setInvalidProcessCount(knowledgeFlowRecordService.queryPassProcessCountByUser(user.getId(), null, 5)); } // 没有被配置审批权限，则以报送人员视角进行统计 - else if (roleTypeList.contains(RoleTypeEnum.KNOWLEDGE_SUBMIT.getRoleType())){ - // 首先查询所有通过 - Long passTotalCount = knowledgeService.lambdaQuery().eq(Knowledge::getStatus, StatusEnum.PASS.getStatus()).count(); + else if (roleTypeList.contains(RoleTypeEnum.KNOWLEDGE_SUBMIT.getRoleType())) { // 然后找到属于自己的知识的草稿 Long userSelfCount = knowledgeService.lambdaQuery().ne(Knowledge::getStatus, StatusEnum.PASS.getStatus()) .eq(Knowledge::getDraftBelongUserId, user.getId()).count(); @@ -96,7 +94,7 @@ public class HomepageServiceImpl implements HomepageService { resVO.setInvalidProcessCount(knowledgeSubmitRecordService.queryKnowledgeSubmitStatusCount(user.getId(), StatusEnum.INVALID.getStatus())); resVO.setPassProcessCount(knowledgeSubmitRecordService.queryKnowledgeSubmitStatusCount(user.getId(), StatusEnum.PASS.getStatus())); } - // 没有任何角色权限，数据全部显示为0 + // 没有任何角色权限，就只展示全量的,其他的都是0 return resVO; } } diff --git a/know_sub_model/src/main/resources/mapper/KnowledgeFlowRecordMapper.xml b/know_sub_model/src/main/resources/mapper/KnowledgeFlowRecordMapper.xml index 4ace72e..3227b0f 100644 --- a/know_sub_model/src/main/resources/mapper/KnowledgeFlowRecordMapper.xml +++ b/know_sub_model/src/main/resources/mapper/KnowledgeFlowRecordMapper.xml @@ -131,7 +131,7 @@ left join ks_knowledge t2 on t1.knowledge_id = t2.id where process_user_id = #{userId} - and process_status = #{processStatus} + and t1.process_status = #{processStatus}