Index: forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManager.java =================================================================== diff -u -r22102 -r22124 --- forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManager.java (.../WorkFlowApprovalTaskManager.java) (revision 22102) +++ forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManager.java (.../WorkFlowApprovalTaskManager.java) (revision 22124) @@ -29,14 +29,6 @@ public void deleteWorkFlowApprovalTask(Object[] idArray); /** - * 搜索待办任务 - * 查询待办任务 - * @return - */ - public List searchWorkFlowApprovalTask(); - - - /** * 根据id获取待办任务 * @param workFlowApprovalTaskId 待办任务id * @return @@ -106,7 +98,11 @@ */ public void confirmNoticeWorkFlowApprovalTask(WorkFlowApprovalTaskVO workFlowApprovalTaskVO); - + /** + * 加载某个工单的待办任务记录列表数据 + * @param formId 工单id + * @return + */ public JSONArray loadWorkFlowApprovalTaskRecordList(String formId); Index: forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java =================================================================== diff -u -r22103 -r22124 --- forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java (.../WorkFlowApprovalTaskManagerImpl.java) (revision 22103) +++ forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java (.../WorkFlowApprovalTaskManagerImpl.java) (revision 22124) @@ -342,7 +342,7 @@ workFlowApprovalTaskFail.setFormId(workFlowApprovalTask.getFormId()); workFlowApprovalTaskFail.setSerialNumber(workFlowApprovalTask.getSerialNumber()); workFlowApprovalTaskFail.setFormType(workFlowApprovalTask.getFormType()); - workFlowApprovalTaskFail.setTitle(workFlowApprovalTask.getFormId()+workFlowApprovalTask.getSerialNumber()); + workFlowApprovalTaskFail.setTitle(workFlowApprovalTask.getFormType()+workFlowApprovalTask.getSerialNumber()); workFlowApprovalTaskFail.setNodeDefinition(workFlowApprovalTask.getNodeDefinition()); workFlowApprovalTaskFail.setTaskName(workFlowApprovalTask.getTaskName()); workFlowApprovalTaskFail.setCreateTaskTime(new Date()); @@ -425,12 +425,6 @@ } @Override - public List searchWorkFlowApprovalTask() { - // TODO Auto-generated method stub - return null; - } - - @Override public void submitWorkFlowApprovalTask( WorkFlowApprovalTaskVO workFlowApprovalTaskVO) { WorkFlowApprovalTask workFlowApprovalTask=getWorkFlowApprovalTask(workFlowApprovalTaskVO.getWorkFlowApprovalTaskId());