From 69f831e4815360e42a10aaafd61c181875bee708 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Thu, 23 Aug 2018 19:18:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=80=E5=9B=9E=E7=BB=8F?= =?UTF-8?q?=E9=94=80=E5=95=86=E5=90=8E=EF=BC=8C=E6=8F=90=E4=BA=A4=E4=BF=A1?= =?UTF-8?q?=E5=AE=A1=E5=90=8E=E6=B5=81=E7=A8=8B=E5=9C=A8=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=B8=AD=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/amarsoft/app/flow/FlowAction.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/com/amarsoft/app/flow/FlowAction.java b/src/com/amarsoft/app/flow/FlowAction.java index 577b944f2..b6556d9bc 100644 --- a/src/com/amarsoft/app/flow/FlowAction.java +++ b/src/com/amarsoft/app/flow/FlowAction.java @@ -1029,7 +1029,7 @@ public class FlowAction { // 根据任务编号，查出流程的编号，阶段编号，对象类型，对象编号:新增加xuyunlong 归档每一步归档 ft = ftManager .createQuery( - "select O.flowno,O.phaseno,O.objecttype,O.objectno,O.userid,O.orgid from O where serialNo=:serialNo ") + "select O.flowno,O.phaseno,O.FLOWSTATE,O.ASSIGNEDTASKNO,O.objecttype,O.objectno,O.userid,O.orgid from O where serialNo=:serialNo ") .setParameter("serialNo", taskNo).getSingleResult(false); // 将数据保存到历史记录里 PhaseInfoArchive(ft.getAttribute("flowno").getString(), ft @@ -1071,6 +1071,16 @@ public class FlowAction { } }else{ flowService.commitAction(taskNo, phaseAction, phaseOpinion, "", tx); + + if(ft.getAttribute("FLOWSTATE").getString().equals("ANYBACK")){ //退回之后再提交 + + if(ft.getAttribute("ASSIGNEDTASKNO")!=null){ + if(ft.getAttribute("ASSIGNEDTASKNO").getString().length()>0){//如果退回再提交给原处理人要更新状态 + ftManager.createQuery("update o set FLOWSTATE='NORMAL' WHERE objectno=:objectno and endtime is null") + .setParameter("objectno", ft.getAttribute("objectno").getString()).executeUpdate(); + } + } + } } // 更新代理人 BizObject taskUser = ftManager.createQuery("select O.userId from O where O.SERIALNO=:taskNo").setParameter("taskNo", this.taskNo).getSingleResult(false);