wangbo 4 years ago
parent
commit
7e40ceea46

+ 14 - 0
operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java

@@ -376,6 +376,19 @@ public class WorkOrderManageController {
         return new AjaxMessage<>(ResultStatus.OK, pages);
     }
 
+    @GetMapping("/select/children")
+    @ApiOperation(value = "查询子单")
+    public AjaxMessage<Pagination<WorkOrderManageDto>> selectSub(
+            @ApiParam(value = "工单ID", required = false) @RequestParam(required = false) Integer id){
+        WorkOrderManageDto workOrderManageDto = new WorkOrderManageDto();
+        workOrderManageDto.setOrderPid(id);
+        IPage<WorkOrderManageDto> iPage = new Page<>(1, 100);
+        iPage = workOrderManageService.selectPage(iPage, workOrderManageDto);
+        Pagination<WorkOrderManageDto> pages = new Pagination<>(iPage);
+        setName(pages.getList());
+        return new AjaxMessage<>(ResultStatus.OK, pages);
+    }
+
     @GetMapping("/resubmit")
     @ApiOperation(value = "重新派单")
     public AjaxMessage reSubmitOrder(
@@ -393,6 +406,7 @@ public class WorkOrderManageController {
             new AjaxMessage(ResultStatus.ERROR,"任务ID错误!");
         }
         Map<String,Object> args=new HashMap<>();
+        args.put("assineeFormUserId",orderUserId);
         List<TaskPorcessResult> handleResult = workFlowService.handleTask(Action.ACTION_AUDIT,workOrderManage.getCurrentTaskId(), args, null);
         workOrderManage.setCurrentTaskId(handleResult.size()>0?handleResult.get(0).getCurrentTaskId():null);
         workOrderManage.setCurrentUsers(handleResult.size()>0?handleResult.get(0).getCurrentTaskUsers():null);