From 108a6b97835245b5e53ba92be855a83c2a13bbad Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 18 Jul 2024 09:42:06 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B7=B2=E5=8F=91=E5=B7=B2=E5=8A=9E?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=8F=AA=E8=83=BD=E6=9F=A5=E7=9C=8B=E8=87=AA?= =?UTF-8?q?=E5=B7=B1=E7=9A=84=E8=8A=82=E7=82=B9=20=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E7=9B=91=E6=8E=A7=E5=8F=AF=E4=BB=A5=E6=9F=A5=E7=9C=8B=E6=89=80?= =?UTF-8?q?=E6=9C=89=E7=9A=84=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WorkCenterController.java | 3 ++- .../service/ProcessApprovalRecordService.java | 27 ++++++++++++++----- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java b/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java index 8900ba49..ef90294a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java @@ -134,11 +134,12 @@ public class WorkCenterController { public Result getApprovalRecordList(ProcessApprovalRecord processApprovalRecord, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + @RequestParam(name = "type") String type, HttpServletRequest req) { Page page = new Page<>(pageNo, pageSize); Page pageList; try { - pageList = processApprovalRecordService.pageList(page, processApprovalRecord, req); + pageList = processApprovalRecordService.pageList(page, processApprovalRecord, type, req); }catch (Exception e){ return Result.error(MessageUtils.getMessage(ResultCommon.ERROR)); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java index 6b9c7396..09bd763b 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java @@ -1,6 +1,7 @@ package com.jero.modules.activiti.service; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,6 +14,7 @@ import com.jero.modules.activiti.mapper.ProcessApprovalRecordMapper; import com.jero.modules.activiti.process.common.entity.ProcessSnapshot; import com.jero.modules.activiti.process.common.service.ProcessSnapshotService; import com.jero.modules.laws.common.util.CurrentUserUtil; +import com.jero.modules.sys.utils.UserUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -31,6 +33,14 @@ import java.util.stream.Collectors; */ @Service public class ProcessApprovalRecordService extends ServiceImpl { + + // 已办 + public static final String COMPLETED_RECORD_LIST = "1"; + // 已发 + public static final String SENT_RECORD_LIST = "2"; + // 流程监控 + public static final String ALL_RECORD_LIST = "3"; + @Resource private ISysBaseAPI sysBaseAPI; @@ -50,7 +60,9 @@ public class ProcessApprovalRecordService extends ServiceImpl pageList(Page page, ProcessApprovalRecord processApprovalRecord, HttpServletRequest req) { + public Page pageList(Page page, ProcessApprovalRecord processApprovalRecord, String type, HttpServletRequest req) { + boolean allSnapshotFlag = !type.equals(COMPLETED_RECORD_LIST); + String curUserId = UserUtils.getUserId(); QueryWrapper wrapper = new QueryWrapper<>(); if (StringUtils.isNotBlank(processApprovalRecord.getFinishFlagSearch())){ wrapper.in("finish_flag", Arrays.asList(processApprovalRecord.getFinishFlagSearch().split(","))); @@ -66,12 +78,15 @@ public class ProcessApprovalRecordService extends ServiceImpl snapshotList = processSnapshotService.list(processSnapshotWrapper); Map> snapshotMap = snapshotList.stream().collect(Collectors.groupingBy(ProcessSnapshot::getTaskId)); for (ProcessApprovalRecord record : records) { - List processSnapshots = snapshotMap.get(record.getTaskId()); - if (CollUtil.isNotEmpty(processSnapshots)) { - ProcessSnapshot snapshot = processSnapshots.get(0); - record.setSnapshotId(snapshot.getId()); - } String userId = record.getUserId(); + if (StrUtil.isNotBlank(userId) && (allSnapshotFlag || curUserId.equals(userId))) { + List processSnapshots = snapshotMap.get(record.getTaskId()); + if (CollUtil.isNotEmpty(processSnapshots)) { + ProcessSnapshot snapshot = processSnapshots.get(0); + record.setSnapshotId(snapshot.getId()); + } + } + String taskAcceptor = sysBaseAPI.translateUserRealNameFromTable(userId); String delegateBy = record.getDelegateBy(); if (StringUtils.isNotBlank(delegateBy)){