diff --git a/com.awspaas.user.apps.yili.integration/lib/com.awspaas.user.apps.yili.integration.jar b/com.awspaas.user.apps.yili.integration/lib/com.awspaas.user.apps.yili.integration.jar index a823fbfc..9f066484 100644 Binary files a/com.awspaas.user.apps.yili.integration/lib/com.awspaas.user.apps.yili.integration.jar and b/com.awspaas.user.apps.yili.integration/lib/com.awspaas.user.apps.yili.integration.jar differ diff --git a/com.awspaas.user.apps.yili.integration/src/com/awspaas/user/apps/integration/oa/TaskListener.java b/com.awspaas.user.apps.yili.integration/src/com/awspaas/user/apps/integration/oa/TaskListener.java index 2ab451b5..b36d032b 100644 --- a/com.awspaas.user.apps.yili.integration/src/com/awspaas/user/apps/integration/oa/TaskListener.java +++ b/com.awspaas.user.apps.yili.integration/src/com/awspaas/user/apps/integration/oa/TaskListener.java @@ -442,113 +442,115 @@ public class TaskListener extends ProcessPubicListener { public void updateCEO_Approve(String taskId,String processId,ProcessExecutionContext pec) throws IOException, DocumentException { BO bo_act_coe_publish1 = SDK.getBOAPI().query("BO_ACT_COE_PUBLISH").detailByBindId(processId); BO bo=SDK.getBOAPI().query("BO_ACT_DATA_MONITORING").detailByBindId(processId); - if(bo==null){ - String approve1=bo_act_coe_publish1.getString("CEO_APPROVE"); - if(approve1.equals("Y")){ + if(bo_act_coe_publish1!=null){ + if(bo==null){ + String approve1=bo_act_coe_publish1.getString("CEO_APPROVE"); + if(approve1.equals("Y")){ + ProcessInstance processInst_1 = SDK.getProcessAPI().createProcessInstance("obj_d57df7db3e6845b3b30e7ff3cdd591c9","10036614","流程标题名称为"+pec.getProcessInstance().getTitle()+"总裁数据代办异常"); + BO bo_faid = new BO(); + bo_faid.set("TASKID",taskId); + bo_faid.set("APPLYUSER",bo_act_coe_publish1.getCreateUser()); + bo_faid.set("PROCESS_TITLE",pec.getProcessInstance().getTitle()); + bo_faid.set("PROCESSID",bo_act_coe_publish1.getBindId()); + SDK.getBOAPI().create("BO_ACT_DATA_CEO_MIGRATION",bo_faid,processInst_1.getId(),"admin"); - ProcessInstance processInst_1 = SDK.getProcessAPI().createProcessInstance("obj_d57df7db3e6845b3b30e7ff3cdd591c9","10036614","流程标题名称为"+pec.getProcessInstance().getTitle()+"总裁数据代办异常"); - BO bo_faid = new BO(); - bo_faid.set("TASKID",taskId); - bo_faid.set("APPLYUSER",bo_act_coe_publish1.getCreateUser()); - bo_faid.set("PROCESS_TITLE",pec.getProcessInstance().getTitle()); - bo_faid.set("PROCESSID",bo_act_coe_publish1.getBindId()); - SDK.getBOAPI().create("BO_ACT_DATA_CEO_MIGRATION",bo_faid,processInst_1.getId(),"admin"); - - ProcessInstance processInst_2 = SDK.getProcessAPI().createProcessInstance("obj_d57df7db3e6845b3b30e7ff3cdd591c9","00116580","流程标题名称为"+pec.getProcessInstance().getTitle()+"总裁数据代办异常"); + ProcessInstance processInst_2 = SDK.getProcessAPI().createProcessInstance("obj_d57df7db3e6845b3b30e7ff3cdd591c9","00116580","流程标题名称为"+pec.getProcessInstance().getTitle()+"总裁数据代办异常"); - BO bo_faid1 = new BO(); - bo_faid1.set("TASKID",taskId); - bo_faid1.set("APPLYUSER",bo_act_coe_publish1.getCreateUser()); - bo_faid1.set("PROCESS_TITLE",pec.getProcessInstance().getTitle()); - bo_faid1.set("PROCESSID",bo_act_coe_publish1.getBindId()); - SDK.getBOAPI().create("BO_ACT_DATA_CEO_MIGRATION",bo_faid1,processInst_2.getId(),"admin"); + BO bo_faid1 = new BO(); + bo_faid1.set("TASKID",taskId); + bo_faid1.set("APPLYUSER",bo_act_coe_publish1.getCreateUser()); + bo_faid1.set("PROCESS_TITLE",pec.getProcessInstance().getTitle()); + bo_faid1.set("PROCESSID",bo_act_coe_publish1.getBindId()); + SDK.getBOAPI().create("BO_ACT_DATA_CEO_MIGRATION",bo_faid1,processInst_2.getId(),"admin"); - ProcessInstance processInst_3 = SDK.getProcessAPI().createProcessInstance("obj_d57df7db3e6845b3b30e7ff3cdd591c9","admin","流程标题名称为"+pec.getProcessInstance().getTitle()+"总裁数据代办异常"); + ProcessInstance processInst_3 = SDK.getProcessAPI().createProcessInstance("obj_d57df7db3e6845b3b30e7ff3cdd591c9","admin","流程标题名称为"+pec.getProcessInstance().getTitle()+"总裁数据代办异常"); - BO bo_faid2 = new BO(); - bo_faid2.set("TASKID",taskId); - bo_faid2.set("APPLYUSER",bo_act_coe_publish1.getCreateUser()); - bo_faid2.set("PROCESS_TITLE",pec.getProcessInstance().getTitle()); - bo_faid2.set("PROCESSID",bo_act_coe_publish1.getBindId()); - SDK.getBOAPI().create("BO_ACT_DATA_CEO_MIGRATION",bo_faid2,processInst_3.getId(),"admin"); + BO bo_faid2 = new BO(); + bo_faid2.set("TASKID",taskId); + bo_faid2.set("APPLYUSER",bo_act_coe_publish1.getCreateUser()); + bo_faid2.set("PROCESS_TITLE",pec.getProcessInstance().getTitle()); + bo_faid2.set("PROCESSID",bo_act_coe_publish1.getBindId()); + SDK.getBOAPI().create("BO_ACT_DATA_CEO_MIGRATION",bo_faid2,processInst_3.getId(),"admin"); - SDK.getProcessAPI().start(processInst_1); - SDK.getProcessAPI().start(processInst_2); - SDK.getProcessAPI().start(processInst_3); + SDK.getProcessAPI().start(processInst_1); + SDK.getProcessAPI().start(processInst_2); + SDK.getProcessAPI().start(processInst_3); - //发送OA待办 - TaskInstance taskInstance1= SDK.getTaskAPI().getInstanceById(processInst_1.getStartTaskInstId()); - TaskInstance taskInstance2= SDK.getTaskAPI().getInstanceById(processInst_2.getStartTaskInstId()); + //发送OA待办 + TaskInstance taskInstance1= SDK.getTaskAPI().getInstanceById(processInst_1.getStartTaskInstId()); + TaskInstance taskInstance2= SDK.getTaskAPI().getInstanceById(processInst_2.getStartTaskInstId()); - sendOaDataPending(taskInstance1,processInst_1,"10036614"); - sendOaDataPending(taskInstance2,processInst_2,"00116580"); + sendOaDataPending(taskInstance1,processInst_1,"10036614"); + sendOaDataPending(taskInstance2,processInst_2,"00116580"); - //挂起流程 - SDK.getProcessAPI().suspend(pec.getProcessInstance()); + //挂起流程 + SDK.getProcessAPI().suspend(pec.getProcessInstance()); + } + BO bo1=new BO(); + bo1.set("PROCESSID",processId); + bo1.set("TASKID",taskId); + bo1.set("CEO_APPROVE",bo_act_coe_publish1.getString("CEO_APPROVE")); + SDK.getBOAPI().create("BO_ACT_DATA_MONITORING", bo1, processId, "admin"); + }else{ + String approve=bo.getString("CEO_APPROVE"); + String approve1=bo_act_coe_publish1.getString("CEO_APPROVE"); + if(approve.equals("N") && approve1.equals("Y")){ + ProcessInstance processInst_1 = SDK.getProcessAPI().createProcessInstance("obj_d57df7db3e6845b3b30e7ff3cdd591c9","10036614","流程标题名称为"+pec.getProcessInstance().getTitle()+"总裁数据代办异常"); + BO bo_faid = new BO(); + bo_faid.set("TASKID",taskId); + bo_faid.set("APPLYUSER",bo_act_coe_publish1.getCreateUser()); + bo_faid.set("PROCESS_TITLE",pec.getProcessInstance().getTitle()); + bo_faid.set("PROCESSID",bo_act_coe_publish1.getBindId()); + SDK.getBOAPI().create("BO_ACT_DATA_CEO_MIGRATION",bo_faid,processInst_1.getId(),"admin"); + + ProcessInstance processInst_2 = SDK.getProcessAPI().createProcessInstance("obj_d57df7db3e6845b3b30e7ff3cdd591c9","00116580","流程标题名称为"+pec.getProcessInstance().getTitle()+"总裁数据代办异常"); + + + BO bo_faid1 = new BO(); + bo_faid1.set("TASKID",taskId); + bo_faid1.set("APPLYUSER",bo_act_coe_publish1.getCreateUser()); + bo_faid1.set("PROCESS_TITLE",pec.getProcessInstance().getTitle()); + bo_faid1.set("PROCESSID",bo_act_coe_publish1.getBindId()); + SDK.getBOAPI().create("BO_ACT_DATA_CEO_MIGRATION",bo_faid1,processInst_2.getId(),"admin"); + + ProcessInstance processInst_3 = SDK.getProcessAPI().createProcessInstance("obj_d57df7db3e6845b3b30e7ff3cdd591c9","admin","流程标题名称为"+pec.getProcessInstance().getTitle()+"总裁数据代办异常"); + + BO bo_faid2 = new BO(); + bo_faid2.set("TASKID",taskId); + bo_faid2.set("APPLYUSER",bo_act_coe_publish1.getCreateUser()); + bo_faid2.set("PROCESS_TITLE",pec.getProcessInstance().getTitle()); + bo_faid2.set("PROCESSID",bo_act_coe_publish1.getBindId()); + SDK.getBOAPI().create("BO_ACT_DATA_CEO_MIGRATION",bo_faid2,processInst_3.getId(),"admin"); + + SDK.getProcessAPI().start(processInst_1); + SDK.getProcessAPI().start(processInst_2); + SDK.getProcessAPI().start(processInst_3); + + + //发送OA待办 + TaskInstance taskInstance1= SDK.getTaskAPI().getInstanceById(processInst_1.getStartTaskInstId()); + TaskInstance taskInstance2= SDK.getTaskAPI().getInstanceById(processInst_2.getStartTaskInstId()); + + + sendOaDataPending(taskInstance1,processInst_1,"10036614"); + sendOaDataPending(taskInstance2,processInst_2,"00116580"); + + + + //挂起流程 + SDK.getProcessAPI().suspend(pec.getProcessInstance()); + } + bo.set("CEO_APPROVE",approve1); + SDK.getBOAPI().update("BO_ACT_DATA_MONITORING",bo); } - BO bo1=new BO(); - bo1.set("PROCESSID",processId); - bo1.set("TASKID",taskId); - bo1.set("CEO_APPROVE",bo_act_coe_publish1.getString("CEO_APPROVE")); - SDK.getBOAPI().create("BO_ACT_DATA_MONITORING", bo1, processId, "admin"); - }else{ - String approve=bo.getString("CEO_APPROVE"); - String approve1=bo_act_coe_publish1.getString("CEO_APPROVE"); - if(approve.equals("N") && approve1.equals("Y")){ - ProcessInstance processInst_1 = SDK.getProcessAPI().createProcessInstance("obj_d57df7db3e6845b3b30e7ff3cdd591c9","10036614","流程标题名称为"+pec.getProcessInstance().getTitle()+"总裁数据代办异常"); - BO bo_faid = new BO(); - bo_faid.set("TASKID",taskId); - bo_faid.set("APPLYUSER",bo_act_coe_publish1.getCreateUser()); - bo_faid.set("PROCESS_TITLE",pec.getProcessInstance().getTitle()); - bo_faid.set("PROCESSID",bo_act_coe_publish1.getBindId()); - SDK.getBOAPI().create("BO_ACT_DATA_CEO_MIGRATION",bo_faid,processInst_1.getId(),"admin"); - - ProcessInstance processInst_2 = SDK.getProcessAPI().createProcessInstance("obj_d57df7db3e6845b3b30e7ff3cdd591c9","00116580","流程标题名称为"+pec.getProcessInstance().getTitle()+"总裁数据代办异常"); - - - BO bo_faid1 = new BO(); - bo_faid1.set("TASKID",taskId); - bo_faid1.set("APPLYUSER",bo_act_coe_publish1.getCreateUser()); - bo_faid1.set("PROCESS_TITLE",pec.getProcessInstance().getTitle()); - bo_faid1.set("PROCESSID",bo_act_coe_publish1.getBindId()); - SDK.getBOAPI().create("BO_ACT_DATA_CEO_MIGRATION",bo_faid1,processInst_2.getId(),"admin"); - - ProcessInstance processInst_3 = SDK.getProcessAPI().createProcessInstance("obj_d57df7db3e6845b3b30e7ff3cdd591c9","admin","流程标题名称为"+pec.getProcessInstance().getTitle()+"总裁数据代办异常"); - - BO bo_faid2 = new BO(); - bo_faid2.set("TASKID",taskId); - bo_faid2.set("APPLYUSER",bo_act_coe_publish1.getCreateUser()); - bo_faid2.set("PROCESS_TITLE",pec.getProcessInstance().getTitle()); - bo_faid2.set("PROCESSID",bo_act_coe_publish1.getBindId()); - SDK.getBOAPI().create("BO_ACT_DATA_CEO_MIGRATION",bo_faid2,processInst_3.getId(),"admin"); - - SDK.getProcessAPI().start(processInst_1); - SDK.getProcessAPI().start(processInst_2); - SDK.getProcessAPI().start(processInst_3); - - - //发送OA待办 - TaskInstance taskInstance1= SDK.getTaskAPI().getInstanceById(processInst_1.getStartTaskInstId()); - TaskInstance taskInstance2= SDK.getTaskAPI().getInstanceById(processInst_2.getStartTaskInstId()); - - - sendOaDataPending(taskInstance1,processInst_1,"10036614"); - sendOaDataPending(taskInstance2,processInst_2,"00116580"); - - - - //挂起流程 - SDK.getProcessAPI().suspend(pec.getProcessInstance()); - } - bo.set("CEO_APPROVE",approve1); - SDK.getBOAPI().update("BO_ACT_DATA_MONITORING",bo); } + } /** diff --git a/com.awspaas.user.apps.yili.integration/src/com/awspaas/user/apps/integration/oauth/TaskController.java b/com.awspaas.user.apps.yili.integration/src/com/awspaas/user/apps/integration/oauth/TaskController.java index 8e306b44..628b172f 100644 --- a/com.awspaas.user.apps.yili.integration/src/com/awspaas/user/apps/integration/oauth/TaskController.java +++ b/com.awspaas.user.apps.yili.integration/src/com/awspaas/user/apps/integration/oauth/TaskController.java @@ -663,7 +663,6 @@ public class TaskController { // } String appendHtml=null; - System.out.println("substring===="+substring); try { //如果判断字符串没有span标签,则通过系统插入span标签 Document doc = Jsoup.parse(substring); @@ -936,7 +935,7 @@ public class TaskController { String methodId = DBSql.getString(conn,"select PLMETHODID from APP_ACT_COE_PAL_REPOSITORY where ID= '" + bo.getString("PUBLISHFILEID") + "'"); if (UtilString.isNotEmpty(methodId)) { - if (methodId.equals("control.policy")) { + if (methodId.equals("control.policy")|| methodId.equals("process.scheme")) { sql_upfile = "select * from APP_ACT_COE_PAL_UPFILE where palrepositoryid in (select ID from APP_ACT_COE_PAL_REPOSITORY where ID= '" + bo.getString("PUBLISHFILEID") + "') AND FILETYPE = 'f' ORDER BY FILENAME ASC"; } @@ -1122,7 +1121,7 @@ public class TaskController { .getString(conn,"select PLMETHODID from APP_ACT_COE_PAL_REPOSITORY where ID= '" + bo.getString("STOPFILEID") + "'"); if (UtilString.isNotEmpty(methodId)) { - if (methodId.equals("control.policy")) { + if (methodId.equals("control.policy")|| methodId.equals("process.scheme")) { sql_upfile = "select * from APP_ACT_COE_PAL_UPFILE where palrepositoryid in (select ID from APP_ACT_COE_PAL_REPOSITORY where ID= '" + bo.getString("STOPFILEID") + "') AND FILETYPE = 'f' ORDER BY FILENAME ASC"; } @@ -1298,7 +1297,7 @@ public class TaskController { String methodId = DBSql.getString(conn,"select PLMETHODID from APP_ACT_COE_PAL_REPOSITORY where ID= '" + bo.getString("CHANGEDFILEIDNEW") + "'"); if (UtilString.isNotEmpty(methodId)) { - if (methodId.equals("control.policy")) { + if (methodId.equals("control.policy")|| methodId.equals("process.scheme")) { sql_upfile = "select * from APP_ACT_COE_PAL_UPFILE where palrepositoryid in (select ID from APP_ACT_COE_PAL_REPOSITORY where ID= '" + bo.getString("CHANGEDFILEIDNEW") + "') AND FILETYPE = 'f' ORDER BY FILENAME ASC";