提交增加终止状态判断

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java

@@ -84,8 +84,8 @@ public class WorkOrderManageController {
     public AjaxMessage<Integer> insertSelective(@ApiParam(value = "工单信息", required = true) @RequestBody WorkOrderManage workOrderManage) {
         LoginUser currentUser = UserUtil.getCurrentUser();
         workOrderManage.setTenantId(currentUser.getTenantId());
-        workOrderManage.setCompanyOrgId(currentUser.getCompanyId().toString());
-        workOrderManage.setDepartmentOrgId(currentUser.getDepartmentId().toString());
+        workOrderManage.setCompanyOrgId(currentUser.getCompanyId()!=null?currentUser.getCompanyId().toString():null);
+        workOrderManage.setDepartmentOrgId(currentUser.getDepartmentId()!=null?currentUser.getDepartmentId().toString():null);
         workOrderManage.setCreateBy(currentUser.getId().toString());
         workOrderManage.setDateCreate(workOrderManage.getDateCreate()==null?new Date():workOrderManage.getDateCreate());
         workOrderManage.setOrderStatus(0);
@@ -213,14 +213,14 @@ public class WorkOrderManageController {
                 if(childOrder.size()>1){
                     for(int i=1;i<childOrder.size();i++) {
                         WorkOrderManageDto child=childOrder.get(i);
-                        if(child.getOrderTypeId()==4&&child.getOrderStatus()!=2)
+                        if(child.getOrderTypeId()==4&&child.getOrderStatus()!=2&&child.getOrderStatus()!=3)
                             return new AjaxMessage<>(ResultStatus.CHILD_ORDER_ING);
                     }
                 }
 
                 //判断父单完成情况后才可以提交
                 WorkOrderManage parentOrder=workOrderManageService.selectByPrimaryKey(order.getOrderPid());
-                if(order.getOrderTypeId()==2&&parentOrder.getOrderStatus()!=2) {
+                if(order.getOrderTypeId()==2&&parentOrder.getOrderStatus()!=2&&parentOrder.getOrderStatus()!=3) {
                     return new AjaxMessage<>(ResultStatus.PARENT_ORDER_ING);
                 }
             }
@@ -348,19 +348,6 @@ 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("/pending")
     @ApiOperation(value = "查询待处理工单")
     public AjaxMessage<Pagination<WorkOrderManageDto>> selectPendingOrder(
@@ -406,7 +393,6 @@ 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);