From dc560902e313e54f4a4e70d71bdf172c75fdbea8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Tue, 11 Feb 2025 23:11:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FlowTaskServiceImpl.java | 20 +++++++++---- ...ProProjectInfoSubdeptsUsersController.java | 9 ++++++ .../IProProjectInfoSubdeptsUsersService.java | 1 + .../proProjectInfoSubdeptsUsers/index.vue | 29 +++++++++++++++++-- 4 files changed, 50 insertions(+), 9 deletions(-) diff --git a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowTaskServiceImpl.java b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowTaskServiceImpl.java index 980efb27..615ddf27 100644 --- a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowTaskServiceImpl.java +++ b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowTaskServiceImpl.java @@ -120,10 +120,20 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask ProcessInstance processInstance = runtimeService.createProcessInstanceQuery() .processInstanceId(task.getProcessInstanceId()) .singleResult(); - - if(task.getName().indexOf("安全教育")>-1 || task.getName().indexOf("预算员审批")>-1){ + /**if(task.getName().indexOf("预算员审批")>-1 || task.getName().indexOf("预算员审批")>-1 || task.getName().indexOf("预算员审批")>-1){ + R data = remoteProService.findUserComSign(Convert.toLong(processInstance.getBusinessKey()), SecurityConstants.INNER); + Boolean vis = data.getData(); + if(!vis){ + return AjaxResult.error("未查询到三级安全教育主管签名信息..."); + } + R data = remoteProService.findUserProSign(Convert.toLong(processInstance.getBusinessKey()), SecurityConstants.INNER); + Boolean vis = data.getData(); + if(!vis){ + return AjaxResult.error("未查询到安质部部长签名信息..."); + } + } + if(task.getName().indexOf("安全教育")>-1){ R data = remoteProService.findUserComSign(Convert.toLong(processInstance.getBusinessKey()), SecurityConstants.INNER); - System.out.println("DDD1"+JSON.toJSONString(data)); Boolean vis = data.getData(); if(!vis){ return AjaxResult.error("未查询到三级安全教育主管签名信息..."); @@ -131,7 +141,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask } if(task.getName().indexOf("安质部")>-1){ R data = remoteProService.findUserProSign(Convert.toLong(processInstance.getBusinessKey()), SecurityConstants.INNER); - System.out.println("DDD2"+JSON.toJSONString(data)); Boolean vis = data.getData(); if(!vis){ return AjaxResult.error("未查询到安质部部长签名信息..."); @@ -139,12 +148,11 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask } if(task.getName().indexOf("班组")>-1){ R data = remoteProService.findUserGroSign(Convert.toLong(processInstance.getBusinessKey()), SecurityConstants.INNER); - System.out.println("DDD3"+JSON.toJSONString(data)); Boolean vis = data.getData(); if(!vis){ return AjaxResult.error("未查询到班组长签名信息..."); } - } + }*/ if (DelegationState.PENDING.equals(task.getDelegationState())) { taskService.addComment(taskVo.getTaskId(), taskVo.getInstanceId(), FlowComment.DELEGATE.getType(), taskVo.getComment()); taskService.resolveTask(taskVo.getTaskId(), taskVo.getVariables()); diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java index 6aa4d322..6cc2d8be 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java @@ -284,4 +284,13 @@ public class ProProjectInfoSubdeptsUsersController extends BaseController return toAjax(proProjectInfoSubdeptsUsersService.editDefaultProjectById(id)); } + /** + * 修改为默认项目 + */ + @GetMapping("/fileSign/{id}") + public AjaxResult fileSign(@PathVariable("id") Long id) + { + return toAjax(proProjectInfoSubdeptsUsersService.fileSign(id)); + } + } diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoSubdeptsUsersService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoSubdeptsUsersService.java index 3798e158..972ee572 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoSubdeptsUsersService.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoSubdeptsUsersService.java @@ -171,4 +171,5 @@ public interface IProProjectInfoSubdeptsUsersService Boolean findUserProSign(Long id); Boolean findUserGroSign(Long id); + } diff --git a/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue b/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue index d006fab5..decbaf79 100644 --- a/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue +++ b/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue @@ -78,9 +78,8 @@ - + - @@ -119,7 +118,9 @@ 离场 进场 + v-hasPermi="['manage:proProjectInfoSubdeptsUsers:remove']">进场< /> + 签名 @@ -504,6 +505,28 @@ function getList() { }); } +function isSign(row){ + if(row.approveStatus==100){ + if(row.userPost=='1' || row.userPost=='2' || row.userPost=='3' || row.userPost=='6' || row.userPost=='8'){ + if(row.eduFilePath.indexOf("-p")>-1 && row.eduFilePath.indexOf("-c")>-1){ + return false; + }else{ + return true; + } + }else if(row.userPost=='4' || row.userPost=='5'){ + if(row.eduFilePath.indexOf("-g")>-1 && row.eduFilePath.indexOf("-p")>-1 && row.eduFilePath.indexOf("-c")>-1){ + return false; + }else{ + return true; + } + }else{ + return false; + } + }else{ + return false; + } +} + // 取消按钮 function cancel() { open.value = false;