PDM前端改造

流程待办优化

src/com/yonde/wfc/controller/WfcProcessController.java

@@ -66,10 +66,9 @@ public class WfcProcessController {
     @GetMapping({"/task/countOfType"})
     public Map<String, Integer> getTaskTypeAndCount(@RequestParam("userName") String userName) {
         Map<String, Integer> resultMap = new HashMap<String, Integer>();
-        List<DxWfProcessTaskVO> todoTaskList = null;
         try {
-            todoTaskList = WfcProcessService.getTodoTaskList(userName);
-            resultMap.put("todoTask", todoTaskList.size());
+            int todoTaskListSize = WfcProcessService.getTodoTaskListSize(userName);
+            resultMap.put("todoTask", todoTaskListSize);
             resultMap.put("forwardTask", 0);
             resultMap.put("unClaimedTask", 0);
         } catch (Exception e) {

src/com/yonde/wfc/service/WfcProcessService.java

@@ -137,11 +137,6 @@ public class WfcProcessService implements RemoteAccess {
                         objVO = new DxChangeNoticeVo(changeOrder2);
                         return objVO;
                     }
-                    if (pbo instanceof WTChangeOrder2) {
-                        WTChangeOrder2 changeOrder2 = (WTChangeOrder2) pbo;
-                        objVO = new DxChangeNoticeVo(changeOrder2);
-                        return objVO;
-                    }
                     if (pbo instanceof WTChangeRequest2) {
                         WTChangeRequest2 changeRequest2 = (WTChangeRequest2) pbo;
                         objVO = new DxChangeRequestVo(changeRequest2);
@@ -302,6 +297,11 @@ public class WfcProcessService implements RemoteAccess {
         return dxWfProcessTaskVO;
     }
 
+    /**
+     * 完成待办
+     * @param operationArgsVO
+     * @throws Exception
+     */
     public static void executeOperation(DxWfTaskOperationArgsVO operationArgsVO) throws Exception {
         if (!RemoteMethodServer.ServerFlag) {
             RemoteMethodServer.getDefault().invoke("executeOperation", WfcProcessService.class.getName(), null,
@@ -329,6 +329,7 @@ public class WfcProcessService implements RemoteAccess {
                     vector = WorkflowUtil.toVector(routerSelect);
                 }
                 WorkflowUtil.completeTask(workItem,vector,description);
+                return;
             }
             if ("delegateTask".equalsIgnoreCase(operationName)) {
                 String targetUserName = operationArgsVO.getTargetUserId();