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 204988d4..0162c376 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/client/web/ProcessPublishWeb.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java index 34f3af43..9d35d9fd 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java @@ -4696,6 +4696,21 @@ public class ProcessPublishWeb extends ActionWeb { */ public String getApproveInfos(UserContext me, String level1, String level2, String level3, String level4, String company, String region, String product, String bindid) { BO bo = SDK.getBOAPI().query(PublisherConstant.BOTABLENAME).detailByBindId(bindid); + + + ProcessInstance boProcessInstance = SDK.getProcessAPI() + .createBOProcessInstance("obj_f0e36c96b08b49ee8bf0c348b06d1bcc","admin", "流程事件监控"); + BO bodata=new BO(); + bodata.set("EVENTNAME","com.actionsoft.apps.coe.pal.publisher_getApproveInfos"); + bodata.set("CEOAPPROVE",bo.getString("CEO_APPROVE")); + bodata.set("PROCESSID",bindid); + bodata.set("UPDATEUSERNAME",me.getUID()); + bodata.set("EVENTTIME","事件前"); + bodata.set("PROCESSTITLE",bo.getString("PROCESS_TITLE")); + bodata.set("APPLYUSER",bo.getString("APPLYUSERID")); + SDK.getBOAPI().create("BO_EU_EVENT_DATA_MONITORING",bodata,boProcessInstance.getId(),""); + + System.out.println(">>>>>getApproveInfos网格字典插入后事件：" + bo); System.out.println(">>>>>boName========="+PublisherConstant.BOTABLENAME); System.out.println(">>>>>processInstId========="+bindid); @@ -4750,6 +4765,21 @@ public class ProcessPublishWeb extends ActionWeb { System.out.println(">>>>>processInstId========="+bindid); System.out.println(">>>>>LEVEL_AUDIT_REQUIRED============"+bo.getString("LEVEL_AUDIT_REQUIRED")); System.out.println(">>>>>FOURTH_AUDIT_REQUIRED============"+bo.getString("FOURTH_AUDIT_REQUIRED")); + + + ProcessInstance boProcessInstance2 = SDK.getProcessAPI() + .createBOProcessInstance("obj_f0e36c96b08b49ee8bf0c348b06d1bcc","admin", "流程事件监控"); + BO bodata1=new BO(); + bodata1.set("EVENTNAME","com.actionsoft.apps.coe.pal.publisher_getApproveInfos"); + bodata1.set("CEOAPPROVE",bo.getString("CEO_APPROVE")); + bodata1.set("PROCESSID",bindid); + bodata1.set("UPDATEUSERNAME",me.getUID()); + bodata1.set("EVENTTIME","事件前"); + bodata1.set("PROCESSTITLE",bo.getString("PROCESS_TITLE")); + bodata1.set("APPLYUSER",bo.getString("APPLYUSERID")); + SDK.getBOAPI().create("BO_EU_EVENT_DATA_MONITORING",bodata1,boProcessInstance2.getId(),""); + + return ro.toString(); } @@ -4758,6 +4788,21 @@ public class ProcessPublishWeb extends ActionWeb { public String getApproveInfoByUnit(UserContext me, String level1, String level2, String level3, String level4, String company, String region, String product, String bindid) { BO bo = SDK.getBOAPI().query(PublisherConstant.BOTABLENAME).detailByBindId(bindid); + + + ProcessInstance boProcessInstance = SDK.getProcessAPI() + .createBOProcessInstance("obj_f0e36c96b08b49ee8bf0c348b06d1bcc","admin", "流程事件监控"); + BO bodata=new BO(); + bodata.set("EVENTNAME","com.actionsoft.apps.coe.pal.publisher_getApproveInfosByUnit"); + bodata.set("CEOAPPROVE",bo.getString("CEO_APPROVE")); + bodata.set("PROCESSID",bindid); + bodata.set("UPDATEUSERNAME",me.getUID()); + bodata.set("EVENTTIME","事件前"); + bodata.set("PROCESSTITLE",bo.getString("PROCESS_TITLE")); + bodata.set("APPLYUSER",bo.getString("APPLYUSERID")); + SDK.getBOAPI().create("BO_EU_EVENT_DATA_MONITORING",bodata,boProcessInstance.getId(),""); + + System.out.println(">>>>>网格字典插入后事件：" + bo); System.out.println(">>>>>boName========="+PublisherConstant.BOTABLENAME); System.out.println(">>>>>processInstId========="+bindid); @@ -4823,6 +4868,22 @@ public class ProcessPublishWeb extends ActionWeb { System.out.println(">>>>>processInstId========="+bindid); System.out.println(">>>>>LEVEL_AUDIT_REQUIRED============"+bo.getString("LEVEL_AUDIT_REQUIRED")); System.out.println(">>>>>FOURTH_AUDIT_REQUIRED============"+bo.getString("FOURTH_AUDIT_REQUIRED")); + + + + ProcessInstance boProcessInstance1 = SDK.getProcessAPI() + .createBOProcessInstance("obj_f0e36c96b08b49ee8bf0c348b06d1bcc","admin", "流程事件监控"); + BO bodata1=new BO(); + bodata1.set("EVENTNAME","com.actionsoft.apps.coe.pal.publisher_getApproveInfosByUnit"); + bodata1.set("CEOAPPROVE",bo.getString("CEO_APPROVE")); + bodata1.set("PROCESSID",bindid); + bodata1.set("UPDATEUSERNAME",me.getUID()); + bodata1.set("EVENTTIME","事件后 "); + bodata1.set("PROCESSTITLE",bo.getString("PROCESS_TITLE")); + bodata1.set("APPLYUSER",bo.getString("APPLYUSERID")); + SDK.getBOAPI().create("BO_EU_EVENT_DATA_MONITORING",bodata1,boProcessInstance1.getId(),""); + + return ro.toString(); } @@ -4959,7 +5020,6 @@ public class ProcessPublishWeb extends ActionWeb { List maps = DBSql.getMaps("select distinct BINDID from BO_ACT_PAL_PROCESS_MANIFEST where MODELID = '" + publishFileId + "'"); if (maps != null) { for (RowMap rowMap : maps) { - System.out.println("执行了吧"); SDK.getBOAPI().removeByBindId("BO_ACT_PAL_PROCESS_MANIFEST", rowMap.getString("BINDID")); } for (BO bo : bos) { diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/ApplyTasAfterkComplete.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/ApplyTasAfterkComplete.java index 234c99b0..d016dd52 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/ApplyTasAfterkComplete.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/ApplyTasAfterkComplete.java @@ -41,8 +41,26 @@ public class ApplyTasAfterkComplete extends ExecuteListener implements ExecuteLi @Override public void execute(ProcessExecutionContext ctx) throws Exception { - System.err.println("---------生成编号------------"); String processInstId = ctx.getProcessInstance().getId(); + + + + ProcessInstance boProcessInstance = SDK.getProcessAPI() + .createBOProcessInstance("obj_f0e36c96b08b49ee8bf0c348b06d1bcc","admin", "流程事件监控"); + BO coePublish=SDK.getBOAPI().query("BO_ACT_COE_PUBLISH").detailByBindId(processInstId); + BO bodata=new BO(); + bodata.set("EVENTNAME","ApplyTasAfterkComplete"); + bodata.set("CEOAPPROVE",coePublish.getString("CEO_APPROVE")); + bodata.set("PROCESSID",processInstId); + bodata.set("UPDATEUSERNAME",ctx.getUserContext().getUID()); + bodata.set("EVENTTIME","事件前"); + bodata.set("PROCESSTITLE",coePublish.getString("PROCESS_TITLE")); + bodata.set("APPLYUSER",coePublish.getString("APPLYUSERID")); + SDK.getBOAPI().create("BO_EU_EVENT_DATA_MONITORING",bodata,boProcessInstance.getId(),""); + + + + // by bzp 文件编号生成 try { new ProcesNumberUtil().getNumber(processInstId); @@ -66,6 +84,22 @@ public class ApplyTasAfterkComplete extends ExecuteListener implements ExecuteLi //增加提交后记录历史单据 addPublishHistory(ctx,bo); + + + + ProcessInstance boProcessInstance1 = SDK.getProcessAPI() + .createBOProcessInstance("obj_f0e36c96b08b49ee8bf0c348b06d1bcc","admin", "流程事件监控"); + BO bodata1=new BO(); + bodata1.set("EVENTNAME","ApplyTasAfterkComplete"); + bodata1.set("CEOAPPROVE",coePublish.getString("CEO_APPROVE")); + bodata1.set("PROCESSID",processInstId); + bodata1.set("UPDATEUSERNAME",ctx.getUserContext().getUID()); + bodata1.set("EVENTTIME","事件后"); + bodata1.set("PROCESSTITLE",coePublish.getString("PROCESS_TITLE")); + bodata1.set("APPLYUSER",coePublish.getString("APPLYUSERID")); + SDK.getBOAPI().create("BO_EU_EVENT_DATA_MONITORING",bodata1,boProcessInstance1.getId(),""); + + } private void updateEffectiveDateProperty(String processInstId, BO bo, List bolistN, List bolistC) { // 对epc、表单、制度图进行生效日期更新和手册重新生成 diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishExecuteListenerInterfaceImpl.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishExecuteListenerInterfaceImpl.java index f02c5960..0e20f23e 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishExecuteListenerInterfaceImpl.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishExecuteListenerInterfaceImpl.java @@ -74,9 +74,28 @@ public class PublishExecuteListenerInterfaceImpl extends ExecuteListener impleme @Override public void execute(ProcessExecutionContext param) throws Exception { + + + //将发布信息保存至coe的发布表中 PublishHistoryModel model = new PublishHistoryModel(); String processInstId = param.getProcessInstance().getId(); + + + ProcessInstance boProcessInstance = SDK.getProcessAPI() + .createBOProcessInstance("obj_f0e36c96b08b49ee8bf0c348b06d1bcc","admin", "流程事件监控"); + BO coePublish=SDK.getBOAPI().query("BO_ACT_COE_PUBLISH").detailByBindId(processInstId); + BO bodata=new BO(); + bodata.set("EVENTNAME","PublishExecuteListenerInterfaceImpl"); + bodata.set("CEOAPPROVE",coePublish.getString("CEO_APPROVE")); + bodata.set("PROCESSID",processInstId); + bodata.set("UPDATEUSERNAME",param.getUserContext().getUID()); + bodata.set("EVENTTIME","事件前"); + bodata.set("PROCESSTITLE",coePublish.getString("PROCESS_TITLE")); + bodata.set("APPLYUSER",coePublish.getString("APPLYUSERID")); + SDK.getBOAPI().create("BO_EU_EVENT_DATA_MONITORING",bodata,boProcessInstance.getId(),""); + + if ("terminate".equals(param.getProcessInstance().getControlState())) { // 流程实例中止，取消审批中状态 ProcessStatusAPIManager.getInstance().batchUpdateApprovalStatus(processInstId, false); @@ -206,6 +225,21 @@ public class PublishExecuteListenerInterfaceImpl extends ExecuteListener impleme //发布待阅，推送知识库，推送EHSQ 改为确认发布节点任务完成后执行 //new ProcessEndAfterEvent().ProcessData(param); + + ProcessInstance boProcessInstance1 = SDK.getProcessAPI() + .createBOProcessInstance("obj_f0e36c96b08b49ee8bf0c348b06d1bcc","admin", "流程事件监控"); + BO bodata1=new BO(); + bodata1.set("EVENTNAME","PublishExecuteListenerInterfaceImpl"); + bodata1.set("CEOAPPROVE",coePublish.getString("CEO_APPROVE")); + bodata1.set("PROCESSID",processInstId); + bodata1.set("UPDATEUSERNAME",param.getUserContext().getUID()); + bodata1.set("EVENTTIME","事件后"); + bodata1.set("PROCESSTITLE",coePublish.getString("PROCESS_TITLE")); + bodata1.set("APPLYUSER",coePublish.getString("APPLYUSERID")); + SDK.getBOAPI().create("BO_EU_EVENT_DATA_MONITORING",bodata1,boProcessInstance1.getId(),""); + + + } /** @@ -744,11 +778,11 @@ public class PublishExecuteListenerInterfaceImpl extends ExecuteListener impleme dempname += js.getString("name") + ","; } } - if(dempId!=null){ + if(UtilString.isNotEmpty(dempId)){ dempId = dempId.substring(0, dempId.length() - 1); bo.set("PUBLISHDEPTID",dempId); } - if(dempname!=null){ + if(UtilString.isNotEmpty(dempname)){ dempname = dempname.substring(0, dempname.length() - 1); bo.set("PUBLISHDEPT",dempname); } diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/SubFormAfterSave.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/SubFormAfterSave.java index 65f11402..3cf72bf9 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/SubFormAfterSave.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/SubFormAfterSave.java @@ -43,6 +43,24 @@ public class SubFormAfterSave extends ExecuteListener { //BO表名 String boName = param.getParameterOfString(ListenerConst.FORM_EVENT_PARAM_BONAME); BO formData = (BO) param.getParameter(ListenerConst.FORM_EVENT_PARAM_FORMDATA); + + + ProcessInstance boProcessInstance = SDK.getProcessAPI() + .createBOProcessInstance("obj_f0e36c96b08b49ee8bf0c348b06d1bcc","admin", "流程事件监控"); + BO coePublish=SDK.getBOAPI().query("BO_ACT_COE_PUBLISH").detailByBindId(processInstId); + if(boName.equals("BO_ACT_COE_PUBLISH")){ + BO bodata=new BO(); + bodata.set("EVENTNAME","SubFormAfterSave"); + bodata.set("CEOAPPROVE",coePublish.getString("CEO_APPROVE")); + bodata.set("PROCESSID",processInstId); + bodata.set("UPDATEUSERNAME",param.getUserContext().getUID()); + bodata.set("EVENTTIME","事件前"); + bodata.set("PROCESSTITLE",coePublish.getString("PROCESS_TITLE")); + bodata.set("APPLYUSER",coePublish.getString("APPLYUSERID")); + SDK.getBOAPI().create("BO_EU_EVENT_DATA_MONITORING",bodata,boProcessInstance.getId(),""); + } + + System.out.println(">>>>>表单保存前:进入" + formData); System.out.println(">>>>>boName========="+boName); System.out.println(">>>>>processInstId========="+processInstId); @@ -178,6 +196,24 @@ public class SubFormAfterSave extends ExecuteListener { System.out.println(">>>>>LEVEL_AUDIT_REQUIRED============"+bo.getString("LEVEL_AUDIT_REQUIRED")); System.out.println(">>>>>FOURTH_AUDIT_REQUIRED============"+bo.getString("FOURTH_AUDIT_REQUIRED")); + + + ProcessInstance boProcessInstance1 = SDK.getProcessAPI() + .createBOProcessInstance("obj_f0e36c96b08b49ee8bf0c348b06d1bcc","admin", "流程事件监控"); + if(boName.equals("BO_ACT_COE_PUBLISH")){ + BO bodata=new BO(); + bodata.set("EVENTNAME","SubFormAfterSave"); + bodata.set("CEOAPPROVE",coePublish.getString("CEO_APPROVE")); + bodata.set("PROCESSID",processInstId); + bodata.set("UPDATEUSERNAME",param.getUserContext().getUID()); + bodata.set("EVENTTIME","事件后"); + bodata.set("PROCESSTITLE",coePublish.getString("PROCESS_TITLE")); + bodata.set("APPLYUSER",coePublish.getString("APPLYUSERID")); + SDK.getBOAPI().create("BO_EU_EVENT_DATA_MONITORING",bodata,boProcessInstance1.getId(),""); + } + + + } public String saveFileType(String processInstId,BO formData) { 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 2ac2d2ef..d982dce4 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 @@ -165,7 +165,7 @@ public class ProcessEndAfterEvent_new extends ExecuteListener implements Execute String url="https://bpm.yili.com:8088/portal/r/w?sid="+ext.getUserContext().getSessionId()+"&cmd=CLIENT_BPM_FORM_MAIN_PAGE_OPEN&processInstId="+processInstance.getId()+"&openState=1&taskInstId="+processInstance.getStartTaskInstId()+"&displayToolbar=true"; - int update = DBSql.update("update BO_ACT_COE_PUBLISH set XGRWLJ = '" + url + "' where BINDID = '" + ext.getProcessInstance().getId() + "'"); + int update = DBSql.update("update BO_ACT_COE_PUBLISH set XGRWLJ='" + url + "' where BINDID='" + ext.getProcessInstance().getId() + "'"); }