From 08990a34a0627fcaed4c3d81b7c2dd4ae929de62 Mon Sep 17 00:00:00 2001 From: gssong <1742057357@qq.com> Date: Mon, 20 Nov 2023 21:48:43 +0800 Subject: [PATCH] =?UTF-8?q?add=20bpmn=E6=96=87=E4=BB=B6=20=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E6=B5=81=E7=A8=8B=E5=8A=9E=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ActTaskServiceImpl.java | 6 +++++- script/bpmn/请假流程(会签)-leave5.zip | Bin 0 -> 1770 bytes script/bpmn/请假流程(包容网关)-leave4.zip | Bin 0 -> 2232 bytes script/bpmn/请假流程(并行网关)-leave3.zip | Bin 0 -> 2156 bytes script/bpmn/请假流程(排他网关)-leave2.zip | Bin 0 -> 2087 bytes script/bpmn/请假流程(普通流程)-leave1.zip | Bin 0 -> 1657 bytes 6 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 script/bpmn/请假流程(会签)-leave5.zip create mode 100644 script/bpmn/请假流程(包容网关)-leave4.zip create mode 100644 script/bpmn/请假流程(并行网关)-leave3.zip create mode 100644 script/bpmn/请假流程(排他网关)-leave2.zip create mode 100644 script/bpmn/请假流程(普通流程)-leave1.zip diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java index 8728e8c27..25c005f6d 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java @@ -151,7 +151,11 @@ public class ActTaskServiceImpl implements IActTaskService { //办理意见 taskService.addComment(completeTaskBo.getTaskId(), task.getProcessInstanceId(), TaskStatusEnum.PASS.getStatus(), StringUtils.isBlank(completeTaskBo.getMessage()) ? "同意" : completeTaskBo.getMessage()); //办理任务 - taskService.complete(completeTaskBo.getTaskId(), completeTaskBo.getVariables()); + if (CollUtil.isNotEmpty(completeTaskBo.getVariables())) { + taskService.complete(completeTaskBo.getTaskId(), completeTaskBo.getVariables()); + } else { + taskService.complete(completeTaskBo.getTaskId()); + } List list = taskService.createTaskQuery().taskTenantId(TenantHelper.getTenantId()).processInstanceId(task.getProcessInstanceId()).list(); if (CollUtil.isEmpty(list)) { UpdateBusinessStatusCmd updateBusinessStatusCmd = new UpdateBusinessStatusCmd(task.getProcessInstanceId(), BusinessStatusEnum.FINISH.getStatus()); diff --git a/script/bpmn/请假流程(会签)-leave5.zip b/script/bpmn/请假流程(会签)-leave5.zip new file mode 100644 index 0000000000000000000000000000000000000000..a5e03efce37dc78f36fb79effe9dd404461b99ce GIT binary patch literal 1770 zcma)-Sv(tv8pYGGg`pV1Z3#t9?7P^P#^@zc(n_d(Oa?#k(kI$uRzufUT8cUj;}e0=*YFL+2kU5Q+`;3%xVUAGT?WOnoXf9z z-Oz2nfg4tNHSWwGAc@SE7lHK|wx*={RkgQDqRDXdj=TyvxmK9A)1V2eL5IX22E}hN zy;ht3Aa60PR;%!~z~ZIBLS2^0Lgd>)!!O_ddHkI4I#-WW)==4&@I*-FfB+#;-G+o4 zJ8VLV7tAL&w~j9e=se1UzLtl-c-*Nbg==?BPEM90biWdX%sCl7}^rvozZ(9BV9<|a~k&_BK6J!P)Qtox7eG6JP~-{hYy|o_D5cUw^OWl ztbA?}M>1;*4)*LXr1o?nr|IPxaV-V-$@F^ayHpA`-MixRo!61HY7-9Co!i9X{6*6t zBX^9VHq&)dgXkjcw3VYVtPvekeAYBB;?V9-Ufa)!K_ZsTc7^_?(}C3GJZ8n2%=1LH z7CXw%U~?-AG8W~m>QN(QtQ7R!z3iRFvHnjN^gqp?sT#V>?Ss?zGCw>%nA7w+ijL%b z>~wbMj^5?aR~NmSieu+++%>m)kA0xOLJ>){EuMKxW!n|$EhSay%1eAN+nK2Th-?Na z5vU+ophFOy@R+@ZLG+*kf?v2fj*U)gE%%FScIvW!Lz4~L%P&azZIx@EE2vD#PSj5l zFQsNEJJU0}zVj@_?d}scsoN-?ev9+4t8CK%F;->ZRLe)#z8sX4C=A_O%@84bOhi0~ zfdwd!Bno1le(mOM&zVih7D+diqi8w6`RTmBQrF~N!aaTirDtFI@NPs~8(+DR8jMno z`oRj(jN8ZB`L$k62^`}picmN!Hh*lmcVgSGsP;#uj?8i@0XEO)I~vH%JoF>rCGdR% zOWX&Z_m4U(fKki=9aV_B=8rIulCE1lEe}aR}xuJ$u$IZ%K!>TLr#Ypnwnw{90tp5DBd!w3wr?}x36 zp<8f4#vr*cafW4Y!iW$Pby0QvHMPu$cT82$;`>L|3HfeLPFlp#QxP4xoOFH+@IKwr zGb!nI{TtD~Y}^F)_p);{_p%tqOSCNOUWk%E*|**$C&7O#9)6AVP;mWmU+G}^2TwYF-RF?A!9SH8O0dgSd(m#mX7a3j;xjaIS{=)q_0;tU(uD%K%S*PBUoGxl@NHd zBM(gUGc>Zbn>6QSEaajvTyQM3oKayfq{JCj8$OEGe%KYKN8OuVrL)S27G`mG;vm;W z9VnyS6~iQSdA-XN8YS2g;a@E#sWO@c43oanGe`jUv`DI6t8N`emm|g1n`~slu?{6k za5-Li1vD143l-ai&e3gJ+;d@u0)_iwUgX7ELBq;RmlFtvmU`<4f^BuGFt%0~8o!bcG1;P~Olp>l7l)9me*6+X^dW53nwEWn48%lR zRo?|UV$B8*r#7MzjbxYjSb^j>{p#$2-nNz0fyK&m!e#a|tL&25L;$GJt4=u4{(YTH zM#=2D-bsYu0!Y0ZOmPd}2;dniBMMFVR@GZi`8p>#dT)eJg}ziL45&1QBDT*hO3da- z64Jn0lRa0o%!vPjHH7d7Kl|1f-Jxto>|&gsmk(}k?3M{87nv=<%!vHK&7N@r!7fdU zG8O<_k=?2j$Kb)2+f)QHt<$&$$ubX4d2;0~%%0AhJ}bGv(X+0=B{~^Japq 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 literal 0 HcmV?d00001 diff --git a/script/bpmn/请假流程(排他网关)-leave2.zip b/script/bpmn/请假流程(排他网关)-leave2.zip new file mode 100644 index 0000000000000000000000000000000000000000..7555193a564bf0073f552c10bf0662617d59dcc2 GIT binary patch literal 2087 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