From 1ea7e38d7d2152012db3f49934e84d164a07d613 Mon Sep 17 00:00:00 2001
From: yanghb <yangbhwork@163.com>
Date: 星期二, 07 一月 2025 17:59:37 +0800
Subject: [PATCH] feat: 完善备注
---
land-system/src/main/java/com/zzg/system/service/state/impl/StateProcessTemplateServiceImpl.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/land-system/src/main/java/com/zzg/system/service/state/impl/StateProcessTemplateServiceImpl.java b/land-system/src/main/java/com/zzg/system/service/state/impl/StateProcessTemplateServiceImpl.java
index 7d0ce49..3538814 100644
--- a/land-system/src/main/java/com/zzg/system/service/state/impl/StateProcessTemplateServiceImpl.java
+++ b/land-system/src/main/java/com/zzg/system/service/state/impl/StateProcessTemplateServiceImpl.java
@@ -277,8 +277,10 @@
//查询任务参与者
LambdaQueryWrapper<FlwTaskActor> query = new LambdaQueryWrapper<>();
query.and(qy -> qy.eq(FlwTaskActor::getActorId, userId)
+ //0指定用户
.eq(FlwTaskActor::getActorType, 0)
.or().in(FlwTaskActor::getActorId, userId)
+ //1指定角色
.eq(FlwTaskActor::getActorType, 1));
if (ObjectUtil.isNotNull(processTaskListBO) && ObjectUtil.isNotNull(flwHisInstances)) {
// 添加条件
@@ -312,6 +314,7 @@
stateTaskQuery.like(StateTaskCenter::getCreateBy, processTaskListBO.getCreateBy());
}
stateTaskQuery.in(StateTaskCenter::getFlowId, instanceIds);
+ //1集体 2国有
stateTaskQuery.eq(StateTaskCenter::getType,2);
stateTaskQuery.orderByDesc(BaseEntity::getCreateTime);
List<StateTaskCenter> taskCenters = stateTaskCenterService.list(stateTaskQuery);
@@ -341,6 +344,7 @@
for (ProcessTaskListVO processTaskListVO : processTaskListVOS) {
List<FlwTask> flwTask = flwHisTaskMap.get(NumberUtil.parseLong(processTaskListVO.getFlowId()));
if (!CollectionUtils.isEmpty(flwTask) && ObjectUtil.isNotEmpty(flwTask.get(0))) {
+ //待审核
processTaskListVO.setStatus("0");
processTaskListVO.setNodeName(flwTask.get(0).getTaskName());
processTaskListVO.setTaskId(flwTask.get(0).getId().toString());
@@ -368,7 +372,9 @@
LambdaQueryWrapper<FlwHisTaskActor> query = Wrappers.<FlwHisTaskActor>lambdaQuery()
.and(qy -> qy.eq(FlwTaskActor::getActorId, userId)
+ //0指定用户
.eq(FlwTaskActor::getActorType, 0)
+ //指定角色
.or().in(FlwTaskActor::getActorId, userId)
.eq(FlwTaskActor::getActorType, 1));
@@ -410,6 +416,7 @@
if (ObjectUtil.isEmpty(instanceId)) {
return new PageInfo<>();
}
+ //1集体 2国有
stateTaskQuery.eq(StateTaskCenter::getType,2);
stateTaskQuery.in(StateTaskCenter::getFlowId, instanceId);
stateTaskQuery.orderByDesc(BaseEntity::getCreateTime);
@@ -491,6 +498,7 @@
}
List<FlwHisTask> flwHisTaskList = flwHisTaskMapper.selectList(
Wrappers.<FlwHisTask>lambdaQuery()
+ //2=抄送
.eq(FlwHisTask::getTaskType, 2)
.in(FlwHisTask::getId, hisTaskIds));
@@ -514,6 +522,7 @@
if (ObjectUtil.isEmpty(instanceId)) {
return new PageInfo<>();
}
+ //1集体 2国有
stateTaskQuery.eq(StateTaskCenter::getType,2);
stateTaskQuery.in(StateTaskCenter::getFlowId, instanceId);
stateTaskQuery.orderByDesc(BaseEntity::getCreateTime);
--
Gitblit v1.7.1