diff --git a/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar b/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar index 87dc0c59..e6ddb0c9 100644 Binary files a/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar and b/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar differ diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/Plugins.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/Plugins.java index a11abbd0..13ed77a4 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/Plugins.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/Plugins.java @@ -5,8 +5,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.actionsoft.apps.coe.pal.publisher.at.SendPublisherMessageAt; -import com.actionsoft.apps.coe.pal.publisher.at.getRoleAt; +import com.actionsoft.apps.coe.pal.publisher.at.*; import com.actionsoft.apps.coe.pal.publisher.client.web.ProcessPublishClientWeb; import com.actionsoft.apps.coe.pal.publisher.client.web.ProcessPublishWeb; import com.actionsoft.apps.coe.pal.publisher.conf.PublisherConf; @@ -153,6 +152,11 @@ public class Plugins implements PluginListener { list.add(new AtFormulaPluginProfile("根据发布人部门获取角色账号", "@getRole(*orgdepart)", getRoleAt.class.getName(), "根据发布人部门获取角色账号", "根据发布人部门获取角色账号")); + list.add(new AtFormulaPluginProfile("根据表单部门查找流程校对人", "@FindProcessAndProofreader(*orgdepart)", FindProcessAndProofreaderAt.class.getName(), "根据表单部门查找流程校对人", "根据表单部门查找流程校对人")); + + list.add(new AtFormulaPluginProfile("根据表单部门查找意见征询发送人员配置表获取发送通知人员", "@ConfigurationSendMessage(*orgdepart)", ConfigurationSendMessageAt.class.getName(), "根据表单部门查找意见征询发送人员配置表获取发送通知人员", "根据表单部门查找意见征询发送人员配置表获取发送通知人员")); + + list.add(new AtFormulaPluginProfile("根据当前部门获取一级部门", "@getFirstDepart(*fullDepartId)", getFirstDepartAt.class.getName(), "根据当前部门获取一级部门", "根据当前部门获取一级部门")); return list; } diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/at/ConfigurationSendMessageAt.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/at/ConfigurationSendMessageAt.java new file mode 100644 index 00000000..452ec2ca --- /dev/null +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/at/ConfigurationSendMessageAt.java @@ -0,0 +1,24 @@ +package com.actionsoft.apps.coe.pal.publisher.at; + +import com.actionsoft.bpms.bo.engine.BO; +import com.actionsoft.bpms.commons.at.AbstExpression; +import com.actionsoft.bpms.commons.at.ExpressionContext; +import com.actionsoft.sdk.local.SDK; + +public class ConfigurationSendMessageAt extends AbstExpression { + + public ConfigurationSendMessageAt(ExpressionContext atContext, String expressionValue) { + super(atContext, expressionValue); + } + + public String execute(String expression) { + // 获取发送部门 + String depName = getParameter(expression, 1); + BO act_sendpublishmessage=SDK.getBOAPI().query("BO_ACT_CONSULTATION_SEND_PRO").addQuery("DEPNAME=",depName).detail(); + String sendperson=null; + if(act_sendpublishmessage!=null){ + sendperson=act_sendpublishmessage.getString("SENDPERSON"); + } + return sendperson; + } +} diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/at/FindProcessAndProofreaderAt.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/at/FindProcessAndProofreaderAt.java new file mode 100644 index 00000000..99981d2f --- /dev/null +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/at/FindProcessAndProofreaderAt.java @@ -0,0 +1,28 @@ +package com.actionsoft.apps.coe.pal.publisher.at; + +import com.actionsoft.bpms.bo.engine.BO; +import com.actionsoft.bpms.commons.at.AbstExpression; +import com.actionsoft.bpms.commons.at.ExpressionContext; +import com.actionsoft.sdk.local.SDK; + +public class FindProcessAndProofreaderAt extends AbstExpression { + + public FindProcessAndProofreaderAt(ExpressionContext atContext, String expressionValue) { + super(atContext, expressionValue); + } + + public String execute(String expression) { + + String departmanager = null; + //获取发布人部门 + String orgdepart = getParameter(expression, 1); + + BO bo_act_processmanager=SDK.getBOAPI().query("BO_ACT_PROCESSMANAGER").addQuery("ORGDEPART=",orgdepart).detail(); + + if(bo_act_processmanager!=null){ + //部门内部校对人 + departmanager = bo_act_processmanager.getString("DEPARTMANAGER"); + } + return departmanager; + } +} diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/at/getFirstDepartAt.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/at/getFirstDepartAt.java new file mode 100644 index 00000000..851396b9 --- /dev/null +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/at/getFirstDepartAt.java @@ -0,0 +1,25 @@ +package com.actionsoft.apps.coe.pal.publisher.at; + +import com.actionsoft.bpms.bo.engine.BO; +import com.actionsoft.bpms.commons.at.AbstExpression; +import com.actionsoft.bpms.commons.at.ExpressionContext; +import com.actionsoft.sdk.local.SDK; + +public class getFirstDepartAt extends AbstExpression { + + + public getFirstDepartAt(ExpressionContext atContext, String expressionValue) { + super(atContext, expressionValue); + } + + public String execute(String expression) { + + //获取表单部门 + String fullDepart = getParameter(expression, 1); + + String firstDepartment=fullDepart.substring(0,fullDepart.indexOf("/")); + + return firstDepartment; + } + +} diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent_new.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent_new.java index 70521840..4a5cfa8a 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent_new.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent_new.java @@ -139,6 +139,9 @@ public class ProcessEndAfterEvent_new extends ExecuteListener implements Execute SDK.getProcessAPI().start(processInstance); + BO boRecordData=new BO(); + boRecordData.set("PROCESS_NAME",bo_act_coe_publish.getString("PROCESS_TITLE")); + SDK.getBOAPI().create("BO_ACT_DOCUMENT_PUBLICITY_TASK", boRecordData, processInstance.getId(), ""); //发送OA待办 TaskInstance taskInstance= SDK.getTaskAPI().getInstanceById(processInstance.getStartTaskInstId()); @@ -2634,7 +2637,7 @@ public class ProcessEndAfterEvent_new extends ExecuteListener implements Execute } xmlDatasUtil.setCreaterworkcode(""); HttpClientUtils httpClientUtil = new HttpClientUtils(); - String taskurl= SDK.getAppAPI().getProperty("com.awspaas.user.apps.yili.integration", "taskurl"); + String taskurl= "http://10.105.1.59/services/yili"; String s = httpClientUtil.SendPend(taskurl, xmlDatasUtil); //System.out.println("状态码============》》》》》》》》》》》"+s);