- * 公文管理 前端控制器 + * 前端控制器 *
* * @author jason@xqopen.cn @@ -166,7 +166,10 @@ public class AdminDocumentManagementController implements AdminDocumentManagemen activitiApi.startWorkflow(userId, management.getId(), activitiEnum.activitiType.postDocumentCgPj, isSigned ? activitiEnum.activitiClass.signedDocument : activitiEnum.activitiClass.postDocumentCgPj); }else if(ext.get("contentClass").equals("djKy")){ activitiApi.startWorkflow(userId, management.getId(), activitiEnum.activitiType.postDocumentDjKy, isSigned ? activitiEnum.activitiClass.signedDocument : activitiEnum.activitiClass.postDocumentDjKy); - }else{ + }else if(ext.get("contentClass").equals("foreignAffairs")){//对外事务，新增流程图 + activitiApi.startWorkflow(userId, management.getId(), activitiEnum.activitiType.postDocumentDysw, isSigned ? activitiEnum.activitiClass.signedDocument : activitiEnum.activitiClass.postDocumentDysw); + } + else{ /*鄂技协\鄂技协纪要发文*/ if(ext.get("CategoryID").equals("978108623924236290") || ext.get("CategoryID").equals("978108532228362241")){ activitiApi.startWorkflow(userId, management.getId(), activitiEnum.activitiType.postDocumentXh, isSigned ? activitiEnum.activitiClass.signedDocument : activitiEnum.activitiClass.postDocumentXh); diff --git a/src/main/java/com/xqopen/kehui/flows/util/MyTaskListener.java b/src/main/java/com/xqopen/kehui/flows/util/MyTaskListener.java index ee4cd61..91006ae 100644 --- a/src/main/java/com/xqopen/kehui/flows/util/MyTaskListener.java +++ b/src/main/java/com/xqopen/kehui/flows/util/MyTaskListener.java @@ -418,6 +418,10 @@ public class MyTaskListener implements TaskListener { private String setBranchLeader(activitiEnum.activitiClass aClass, String name, Long id) { AdminDocumentManagement management = documentManagementService.selectById(id); switch (aClass) { + case postDocumentCgPj: //公文管理(发文管理)->成果评价->分管领导由所长改为副所长，且删除所长节点 + return "depDirector"; + case postDocumentDysw: //公文管理(发文管理)->对外事务->删除部门主任节点，且分管领导为副所长 + return "depDirector"; case receivedDocument: return "depDirector"; /*case postDocument: diff --git a/src/main/java/com/xqopen/kehui/flows/util/activitiEnum.java b/src/main/java/com/xqopen/kehui/flows/util/activitiEnum.java index 104e192..65d0dfe 100644 --- a/src/main/java/com/xqopen/kehui/flows/util/activitiEnum.java +++ b/src/main/java/com/xqopen/kehui/flows/util/activitiEnum.java @@ -151,7 +151,8 @@ public class activitiEnum { @ApiModelProperty("发文") postDocumentHywbf("发文"), - + @ApiModelProperty("发文") + postDocumentDysw("发文管理->对外事务"), @ApiModelProperty("发文") postDocumentGong("发文"), @@ -474,6 +475,8 @@ public class activitiEnum { postDocumentCgPj("发文"), @ApiModelProperty("发文") postDocumentDjKy("发文"), + @ApiModelProperty("发文") + postDocumentDysw("发文->对外事务"), @ApiModelProperty("发文会签") signedDocument("发文会签"), @ApiModelProperty("收文任务") diff --git a/src/main/resources/processes/postDocumentCgPj.bpmn b/src/main/resources/processes/postDocumentCgPj.bpmn index fa02885..f0c9276 100644 --- a/src/main/resources/processes/postDocumentCgPj.bpmn +++ b/src/main/resources/processes/postDocumentCgPj.bpmn @@ -1,104 +1,86 @@ - -