From c7593dcb35ea49cd464827c25cffe1c8a1f793db Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Wed, 14 Jan 2026 09:23:36 +0800 Subject: [PATCH] commit --- .../handlers/impl/CountersignHandler.java | 5 ++++- .../club/service/impl/SysClubServiceImpl.java | 4 ++-- .../transact/ProposalMineController.java | 18 +++++++++++++++--- .../plugins/sysUserAuditOpinion/index.vue | 1 + .../zhgh/activity/basic/settings/index.html | 2 +- .../member/change/manage/index.html | 2 +- .../zhghh5/club/clubApproval/index.html | 2 +- .../views/platform/zhghh5/sys/home/todo.js | 4 +--- 8 files changed, 26 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/budwk/app/flow/engine/handlers/impl/CountersignHandler.java b/src/main/java/com/budwk/app/flow/engine/handlers/impl/CountersignHandler.java index 6d22201..2fd8911 100644 --- a/src/main/java/com/budwk/app/flow/engine/handlers/impl/CountersignHandler.java +++ b/src/main/java/com/budwk/app/flow/engine/handlers/impl/CountersignHandler.java @@ -80,7 +80,7 @@ public class CountersignHandler implements IHandler { } if (!isMerged && CountersignTypeEnum.PARALLEL.toString().equalsIgnoreCase(countersignType)) { // 是否所有会签任务已完成 - isMerged = execution.getEngine().processTaskService().getDoingTaskList(execution.getProcessInstanceId(), new String[]{taskModel.getName()}).size() == 0; + boolean finished = execution.getEngine().processTaskService().getDoingTaskList(execution.getProcessInstanceId(), new String[]{taskModel.getName()}).size() == 0; if (!isMerged) { // 未通过，更新已完成实例数量 Dict addVariable = Dict.create(); @@ -88,6 +88,9 @@ public class CountersignHandler implements IHandler { addVariable.put(prefix + FlowConst.NR_OF_COMPLETED_AGREE_INSTANCES, execution.getArgs().get(prefix + FlowConst.NR_OF_COMPLETED_AGREE_INSTANCES)); execution.getEngine().processInstanceService().addVariable(execution.getProcessInstanceId(), addVariable); } + if(finished) { + execution.getEngine().processTaskService().rejectTask(execution.getProcessModel(), execution.getProcessTask()); + } } if (isMerged) { // 获取所有会签参数键值 diff --git a/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubServiceImpl.java b/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubServiceImpl.java index cb62947..e6ca750 100644 --- a/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubServiceImpl.java @@ -168,7 +168,7 @@ public class SysClubServiceImpl extends BaseServiceImpl implements SysC SysClub sysClub = dao().insertWith(club, "sponsors"); if(ObjectUtil.isNotEmpty(managePerson)){ - List clubUsers = managePerson.stream().map(person -> { + List clubUsers = managePerson.stream().filter(o -> StrUtil.isNotBlank(o.getString("userId"))).map(person -> { ClubUser clubUser = new ClubUser(); clubUser.setClubId(club.getId()); clubUser.setRoleCode(List.of(person.getString("roleCode"))); @@ -193,7 +193,7 @@ public class SysClubServiceImpl extends BaseServiceImpl implements SysC dao().clear(ClubUser.class, Cnd.where(ClubUser::getClubId, "=", club.getId())); if (ObjectUtil.isNotEmpty(managePerson)) { - List clubUsers = managePerson.stream().map(person -> { + List clubUsers = managePerson.stream().filter(o -> StrUtil.isNotBlank(o.getString("userId"))).map(person -> { ClubUser clubUser = new ClubUser(); clubUser.setClubId(club.getId()); clubUser.setRoleCode(List.of(person.getString("roleCode"))); diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalMineController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalMineController.java index 0b273eb..67279ba 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalMineController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalMineController.java @@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HtmlUtil; +import cn.hutool.json.JSONUtil; import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; @@ -44,6 +45,7 @@ import org.nutz.mvc.annotation.Param; import javax.validation.Valid; import java.util.Date; import java.util.List; +import java.util.Objects; @IocBean @At("/platform/proposal/mine") @@ -262,15 +264,25 @@ public class ProposalMineController { .desc(ProcessTask::getCreatedAt)); // 已完成附议的代表 - List taskList = dao.query(ProcessTask.class, Cnd.where(ProcessTask::getProcessInstanceId, "=", processInstance.getId()) + /*List taskList = dao.query(ProcessTask.class, Cnd.where(ProcessTask::getProcessInstanceId, "=", processInstance.getId()) .and(ProcessTask::getTaskName, "=", "second") .and(ProcessTask::getTaskState, "in", List.of(ProcessTaskStateEnum.DOING.getCode(), ProcessTaskStateEnum.FINISHED.getCode())) .and(ProcessTask::getId, ">", inviteTask.getId()) - ); + );*/ + + List taskList = dao.query(ProcessTask.class, Cnd.where(ProcessTask::getProcessInstanceId, "=", processInstance.getId()) + .and(ProcessTask::getTaskName, "=", "second") + .and(ProcessTask::getTaskState, "in", List.of(ProcessTaskStateEnum.DOING.getCode(), ProcessTaskStateEnum.FINISHED.getCode())) + ); + + List tasks = taskList.stream().filter(o -> { + Dict args = JSONUtil.toBean(o.getVariable(), Dict.class); + return Objects.equals(args.getInt("submitType"), ProcessSubmitTypeEnum.AGREE.getCode()); + }).toList(); ProposalConfig proposalConfig = dao.fetch(ProposalConfig.class, Cnd.NEW()); - if (taskList.size() + seconders.length < proposalConfig.getSeconderNum()) { + if (tasks.size() + seconders.length < proposalConfig.getSeconderNum()) { return Result.error("至少邀请" + proposalConfig.getSeconderNum() + "个附议人"); } diff --git a/src/main/resources/static/components/plugins/sysUserAuditOpinion/index.vue b/src/main/resources/static/components/plugins/sysUserAuditOpinion/index.vue index 2bced5a..abda33a 100644 --- a/src/main/resources/static/components/plugins/sysUserAuditOpinion/index.vue +++ b/src/main/resources/static/components/plugins/sysUserAuditOpinion/index.vue @@ -91,6 +91,7 @@ module.exports = { if (res.code === 0) { this.$message.success("设置成功") this.dialogVisible = false + this.listOpinion() } }) }, diff --git a/src/main/resources/views/platform/zhgh/activity/basic/settings/index.html b/src/main/resources/views/platform/zhgh/activity/basic/settings/index.html index 296fda7..deb8a54 100644 --- a/src/main/resources/views/platform/zhgh/activity/basic/settings/index.html +++ b/src/main/resources/views/platform/zhgh/activity/basic/settings/index.html @@ -96,7 +96,7 @@ layout("/layouts/platform.html"){ - + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/manage/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/change/manage/index.html index 27e6928..68b7f55 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/manage/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/manage/index.html @@ -71,7 +71,7 @@ layout("/layouts/platform.html"){ code="UserType"> --> - 导出会员名单 +
退回 - 不同意 + 不同意 同意
diff --git a/src/main/resources/views/platform/zhghh5/sys/home/todo.js b/src/main/resources/views/platform/zhghh5/sys/home/todo.js index 43e809f..2f1688c 100644 --- a/src/main/resources/views/platform/zhghh5/sys/home/todo.js +++ b/src/main/resources/views/platform/zhghh5/sys/home/todo.js @@ -46,9 +46,7 @@ const todo = { title="variable.instanceName">