From 0f048aecb2b5104b43c8f2b744cd35c88617e42f Mon Sep 17 00:00:00 2001 From: tangfutang Date: Sun, 28 Jun 2020 10:36:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E8=BF=9B=E5=8D=95=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=92=8C=E5=88=86=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flow/action/comm/BaseFlowStartAction.java | 22 ++++++++++++++++++- .../commbusiness/PlatformDataToTemp.java | 1 + 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src_sys/com/tenwa/flow/action/comm/BaseFlowStartAction.java b/src_sys/com/tenwa/flow/action/comm/BaseFlowStartAction.java index 63783a69f..b45e2b9c7 100644 --- a/src_sys/com/tenwa/flow/action/comm/BaseFlowStartAction.java +++ b/src_sys/com/tenwa/flow/action/comm/BaseFlowStartAction.java @@ -3,6 +3,7 @@ package com.tenwa.flow.action.comm; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; import apx.com.amarsoft.als.base.flow.FlowTask; @@ -23,7 +24,10 @@ import com.amarsoft.are.jbo.BizObjectManager; import com.amarsoft.are.jbo.JBOException; import com.amarsoft.are.jbo.JBOFactory; import com.amarsoft.are.jbo.JBOTransaction; +import com.amarsoft.context.ASUser; import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import com.tenwa.flow.service.FlowUserManageServie; +import com.tenwa.flow.service.FlowUserManageServieImp; public class BaseFlowStartAction extends FlowBussionAction { private String error_message = "failed@发起流程出错"; @@ -204,7 +208,23 @@ public class BaseFlowStartAction extends FlowBussionAction { throw new Exception( "未找到流程信息" ); JSONArray ja = JSONArray.parseArray(actionScript); JSONObject obj = ja.getJSONObject(0); - flowAction.setPhaseAction(obj.getString("userinfo").replaceAll(","," ")); + if(obj.getString("usertype").indexOf("任务池")>0){ + flowAction.setPhaseAction(obj.getString("userinfo").replaceAll(","," ")); + }else{ + FlowUserManageServie fUserManager = new FlowUserManageServieImp(tx, new ASUser(submitUserId)); + Map model = new HashMap(); + model.put("flowunid", this.submitFlowunid); + model.put("objectno", submitFlowunid); + model.put("taskno", taskNo); + Map mapPassReader = fUserManager.getFlowOperatorUser(model, actionScript); + Set keySet = mapPassReader.keySet(); + if(!keySet.isEmpty()){ + flowAction.setPhaseAction(keySet.iterator().next()+" "+mapPassReader.get(keySet.iterator().next())); + }else{ + throw new Exception( "提交流程失败" ); + } + + } } flowAction.submit( tx ); tx.commit(); diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/PlatformDataToTemp.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/PlatformDataToTemp.java index ec9a53ce0..9bc3fb80e 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/PlatformDataToTemp.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/PlatformDataToTemp.java @@ -217,6 +217,7 @@ public class PlatformDataToTemp extends BaseBussiness { lpitBo.setAttributeValue("IS_NETCAR",ppiBo.getAttribute("IS_NETCAR")); lpitBo.setAttributeValue("source_type",ppiBo.getAttribute("source_type")); lpitBo.setAttributeValue("APPLICATION_NO",ppiBo.getAttribute("APPLICATION_NO")); + lpitBo.setAttributeValue("PROJECT_NAME",lpitBo.getAttribute("project_no")+"-"+this.getAttribute("custname").toString()); if(!"0".equals(ppiBo.getAttribute("IS_NETCAR").toString())){ lpitBo.setAttributeValue("IS_OPERATION",ppiBo.getAttribute("IS_OPERATION")); lpitBo.setAttributeValue("IS_AFFILIATED",ppiBo.getAttribute("IS_AFFILIATED"));