修复动态表单任务列表中任务重复问题 v1.10.2

henryyan · May 8, 2014 · f41a3f8 · f41a3f8
1 parent e902baf
commit f41a3f8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/.classpath b/.classpath
@@ -3,7 +3,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="test"/>
 	<classpathentry kind="src" path="resources"/>
-	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Tomcat v6.0.32-eclipse">
+	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v6.0">
 		<attributes>
 			<attribute name="owner.project.facets" value="jst.web"/>
 		</attributes>

diff --git a/resources/application.properties b/resources/application.properties
@@ -24,7 +24,7 @@ dbcp.maxActive=20
 dbcp.maxIdle=10
 
 #versions
-system.version=1.10.1
+system.version=1.10.2
 spring.version=3.2.5.RELEASE
 hibernate.version=4.2.5.Final
 activiti.version=5.15.1-kft

diff --git a/src/me/kafeitu/demo/activiti/web/form/dynamic/DynamicFormController.java b/src/me/kafeitu/demo/activiti/web/form/dynamic/DynamicFormController.java
@@ -111,7 +111,7 @@ public ModelAndView processDefinitionList(Model model, @RequestParam(value = "pr
     }
 
     /**
-     * 读取启动流程的表单字段
+     * 初始化启动流程，读取启动流程的表单字段来渲染start form
      */
     @RequestMapping(value = "get-form/start/{processDefinitionId}")
     @ResponseBody
@@ -172,7 +172,7 @@ public Map<String, Object> findTaskForm(@PathVariable("taskId") String taskId) t
     }
 
     /**
-     * 提交task的并保存form
+     * 办理任务，提交task的并保存form
      */
     @RequestMapping(value = "task/complete/{taskId}")
     @SuppressWarnings("unchecked")
@@ -212,7 +212,7 @@ public String completeTask(@PathVariable("taskId") String taskId, @RequestParam(
     }
 
     /**
-     * 读取启动流程的表单字段
+     * 提交启动流程
      */
     @RequestMapping(value = "start-process/{processDefinitionId}")
     @SuppressWarnings("unchecked")
@@ -276,7 +276,6 @@ public ModelAndView taskList(@RequestParam(value = "processType", required = fal
 
             List<Task> dynamicFormTasks = taskService.createTaskQuery().processDefinitionKey("leave-dynamic-from")
                     .taskCandidateOrAssigned(user.getId()).active().orderByTaskId().desc().list();
-            tasks.addAll(dynamicFormTasks);
 
             List<Task> dispatchTasks = taskService.createTaskQuery().processDefinitionKey("dispatch")
                     .taskCandidateOrAssigned(user.getId()).active().orderByTaskId().desc().list();

diff --git a/src/me/kafeitu/demo/activiti/web/form/formkey/FormKeyController.java b/src/me/kafeitu/demo/activiti/web/form/formkey/FormKeyController.java
@@ -92,7 +92,7 @@ public ModelAndView processDefinitionList(Model model, HttpServletRequest reques
     }
 
     /**
-     * 读取启动流程的表单内容
+     * 初始化启动流程，读取启动流程的表单内容来渲染start form
      */
     @RequestMapping(value = "get-form/start/{processDefinitionId}")
     @ResponseBody
@@ -115,7 +115,7 @@ public Object findTaskForm(@PathVariable("taskId") String taskId) throws Excepti
     }
 
     /**
-     * 提交task的并保存form
+     * 办理任务，提交task的并保存form
      */
     @RequestMapping(value = "task/complete/{taskId}")
     @SuppressWarnings("unchecked")