Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/action/ExpensiveGoodsApplicationAction.java =================================================================== diff -u -r23480 -r23483 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/action/ExpensiveGoodsApplicationAction.java (.../ExpensiveGoodsApplicationAction.java) (revision 23480) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/action/ExpensiveGoodsApplicationAction.java (.../ExpensiveGoodsApplicationAction.java) (revision 23483) @@ -84,7 +84,7 @@ String firstBarcodeSql = "select case when wt.status = '1' then wt.handler else (select fullname from ss_users where id=wt.userid) end " +"from WorkFlowApprovalTask wt " - + "where wt.formid=ip.id and createtasktime=(select max(createtasktime) from WorkFlowApprovalTask wt where wt.formid=ip.id) and wt.isNodeDefinitionWorkFlowApprovalTask = 1"; + + "where wt.formid=ip.id and createtasktime=(select max(createtasktime) from WorkFlowApprovalTask wt where wt.formid=ip.id) and wt.isNodeApprovalTask = 1"; String select = "select ("+ firstBarcodeSql+ ") handler, " + "case when ip.processstatus = '已结束' then '已完成审批' else ip.currentNodeDefinitionName end taskName, " Index: forgon-core/src/main/java/com/forgon/workflow/model/WorkFlowApprovalTask.java =================================================================== diff -u -r23464 -r23483 --- forgon-core/src/main/java/com/forgon/workflow/model/WorkFlowApprovalTask.java (.../WorkFlowApprovalTask.java) (revision 23464) +++ forgon-core/src/main/java/com/forgon/workflow/model/WorkFlowApprovalTask.java (.../WorkFlowApprovalTask.java) (revision 23483) @@ -111,7 +111,7 @@ /** * 是否为流程定义的节点的待办任务(默认为true,若是该节点定义用户下被授权的用户的待办任务则:为false) */ - private Boolean isNodeDefinitionWorkFlowApprovalTask = true; + private Boolean isNodeApprovalTask = true; /** * 是否省平台产品(默认空) @@ -295,12 +295,12 @@ this.isPlatformAuthorizedEnterprise = isPlatformAuthorizedEnterprise; } - public Boolean getIsNodeDefinitionWorkFlowApprovalTask() { - return isNodeDefinitionWorkFlowApprovalTask; + public Boolean getIsNodeApprovalTask() { + return isNodeApprovalTask; } - public void setIsNodeDefinitionWorkFlowApprovalTask( - Boolean isNodeDefinitionWorkFlowApprovalTask) { - this.isNodeDefinitionWorkFlowApprovalTask = isNodeDefinitionWorkFlowApprovalTask; + public void setIsNodeApprovalTask(Boolean isNodeApprovalTask) { + this.isNodeApprovalTask = isNodeApprovalTask; } + } Index: forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java =================================================================== diff -u -r23468 -r23483 --- forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java (.../WorkFlowApprovalTaskManagerImpl.java) (revision 23468) +++ forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java (.../WorkFlowApprovalTaskManagerImpl.java) (revision 23483) @@ -211,7 +211,7 @@ wFATaskForAuthorized.setIsHospitalProduct(wFTaskForNodeDefinition.getIsHospitalProduct()); wFATaskForAuthorized.setIsProvinceProduct(wFTaskForNodeDefinition.getIsProvinceProduct()); wFATaskForAuthorized.setIsPlatformAuthorizedEnterprise(wFTaskForNodeDefinition.getIsPlatformAuthorizedEnterprise()); - wFATaskForAuthorized.setIsNodeDefinitionWorkFlowApprovalTask(false);//表示是被授权用户的待办任务 + wFATaskForAuthorized.setIsNodeApprovalTask(false);//表示是被授权用户的待办任务 objectDao.save(wFATaskForAuthorized); } }