From 67fa48e7a0ca4dc2ee96d5efb7666ee03b880e3c Mon Sep 17 00:00:00 2001 From: gssong <1742057357@qq.com> Date: Sun, 26 Nov 2023 20:48:56 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E6=B7=BB=E5=8A=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E8=B0=83=E6=95=B4=E5=88=86=E7=B1=BB=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ActProcessDefinitionServiceImpl.java | 8 ++++---- script/bpmn/请假流程（子流程）-leave6.zip | Bin 0 -> 2182 bytes script/bpmn/请假流程（边界定时任务）-leave7.zip | Bin 0 -> 2172 bytes 3 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 script/bpmn/请假流程（子流程）-leave6.zip create mode 100644 script/bpmn/请假流程（边界定时任务）-leave7.zip diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java index 34f65f5d3..bb8af2405 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java @@ -20,6 +20,7 @@ import org.dromara.workflow.domain.WfCategory; import org.dromara.workflow.domain.bo.ProcessDefinitionBo; import org.dromara.workflow.domain.vo.ProcessDefinitionVo; import org.dromara.workflow.service.IActProcessDefinitionService; +import org.dromara.workflow.service.IWfCategoryService; import org.flowable.editor.constants.ModelDataJsonConstants; import org.flowable.engine.HistoryService; import org.flowable.engine.ProcessMigrationService; @@ -55,7 +56,7 @@ public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionSer private final ProcessMigrationService processMigrationService; - private final WfCategoryServiceImpl wfCategoryService; + private final IWfCategoryService iWfCategoryService; /** * 分页查询 @@ -205,7 +206,7 @@ public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionSer return true; } catch (Exception e) { e.printStackTrace(); - throw new ServiceException("操作失败:"+e.getMessage()); + throw new ServiceException("操作失败:" + e.getMessage()); } } @@ -280,8 +281,7 @@ public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionSer @Override public boolean deployByFile(MultipartFile file, String categoryCode) { try { - - WfCategory wfCategory = wfCategoryService.queryByCategoryCode(categoryCode); + WfCategory wfCategory = iWfCategoryService.queryByCategoryCode(categoryCode); if (wfCategory == null) { throw new ServiceException("流程分类不存在"); } diff --git a/script/bpmn/请假流程（子流程）-leave6.zip b/script/bpmn/请假流程（子流程）-leave6.zip new file mode 100644 index 0000000000000000000000000000000000000000..ded3cea9216eb9bc229ed475d7cd841b77cdd384 GIT binary patch literal 2182 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 T*JotmjX>%<{ literal 0 HcmV?d00001 diff --git a/script/bpmn/请假流程（边界定时任务）-leave7.zip b/script/bpmn/请假流程（边界定时任务）-leave7.zip new file mode 100644 index 0000000000000000000000000000000000000000..bd553753af1a443ee96e3faa6949f8f007f878b2 GIT binary patch literal 2172 zcmbW3cRUo18^_PcibTa3Me43(W{*-L~`nGQ3W*uW97pk@$~tmOLw_;3WEJ}eSa z!j-eBF?(XE9-(MH6vfiU{i8If} z4+n9pw=yDWRq**(TaUqiGU=GieQT+mG6^zLgxHSc&~ua8&3x|Z9t!LnQYdz16Ru-{ zo;bB-oEE9MdfS)O#^^9&yOZS?9MGteG^NC^DeDy}cR^Mfyc48aM^)H0y`gF3m-vbl zkpYpHO6gIg)&@mV!toh8^PDp2%*O_bbLl6uv8dyX(3IZxLMI188kP4|Q{GUtUq4Ix zyQCj24VQhbneFse_RHfBEBW(*iPj>_H+pM5UdE6WW7{#** z-Lfe|wa1pNuJNAoqiNkM_taE^PH4YV6X2(N_nhIu3P-!R5vkLI)%mCU^J`Q%+Nw;G zAt0ZhxtnGFx*9ayW{ABAY%s4erZ2M)UW^Iu#W%Il5~V7`)1*YXJ8mb&A$y)oC%#o4 zTkk(KL6xrA=6ol4Y_ywPz|s}H6?vDI(+%RD!rO_s9%S?B*n7o#YY(7L{WccH{N@Ti zcYrV5*`@0^#Gc7yl7^hL1;gYe{5wuDfKxD|q?QVmXq`{b&x zdnD%DwPxr$hx&W&(iENHA;G(}Y06wSDc)=n+v*yoYe`_i+QjnP@rGF+<00iPUu`C@ z^oi73{GJycOU=A~S4BoRi=&8l|LH-S_@FwT7pfVuC`+uX+RGqC^ZV^-qVu!Wn?sI&Z6OWcEZDdN0AcwtvMznLi1a3282bt6}o`nz= z8Vee5#9xF4+!vAl1_Xqnekz$L_nNig>nF}{xz-ynX66X@0Ih+p5l+Ja1GRfWyUP)8 z6l0ILq?0Vca*c&?H^DrxM|=!kQ|GpT5n^EZoK_knc2vyBJ9gB5*j`JrM)1N7mZ+<5 z9F+yFBIG1IVy+o_JZCZ>%TV5mPatwbm3mF)3QL%t^jj{xmNx}+beT_6NNyyhV-1aHO}bcd@8s7Uodn^ z&y>)I0V8m!4n~~n`;?#ceZEJ+gT)mm$CQoD_uF&F2egE_O!VQz1Uz*25bGXcn9cdm zk*Hqv_Sgd)CUe_x%|d*`T~;XD5w5k}8HXxe*0vKnr<(rxHFb};{jrH7n{CE5@`=2@V5^||<(jXqc4sm?9=J%n)4o(tL_p3q_STpAJb{z(M0bfl0q$kNQ!4GuljbTFS|m;l7x4w4$>qWo28s zD4JWe!Vg^`iRwXDFwGdKXJ<52U4MYSPZ;Sb0v1B+&ah$r`N0nZ778_7iFb{=-6J@{ z{d*JO49wRm`?R#$#+NoO{+WzTAn=fB;7=ejtz%Y`49tRsNa#El%L@#vSMS$bdMtKV z9*gQx9vMb)pmx9}Ak}U=kr5{M^sd8TNT(GXnr*Q2+p{M@N4V@Lvb`_wBC({4f8X5kU3MF#Y{Q_h+8| K+4L-b+kXJqoHOeH literal 0 HcmV?d00001