Merge remote-tracking branch 'origin/master'

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);
@@ -205,6 +205,8 @@ public class WorkOrderManageController {
                 workOrderManage.setTaskNo(DatesUtil.formatDate(new Date(),"yyyyMMddHHmmss")+String.valueOf((int) (Math.random()*(9999-1000)+1000)));
                 workOrderManage.setOrderPid(flowId);
                 workOrderManage.setEventType(order.getEventType());
+                workOrderManage.setCompanyOrgId(order.getCompanyOrgId());
+                workOrderManage.setDepartmentOrgId(order.getDepartmentOrgId());
                 workOrderManage.setOrderTypeId(actionId==4?4:2);
                 workOrderManageService.insertSelective(workOrderManage);
             }else if(actionId==6){
@@ -213,14 +215,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);
                 }
             }
@@ -269,7 +271,7 @@ public class WorkOrderManageController {
         workFlowDetail.setFlowType(flowType);
         workFlowDetail.setFlowId(flowId);
         workFlowDetail.setFlowDetail(flowDetail);
-        Integer detailId= workFlowDetailService.selectDetailId(workFlowDetail);
+        Integer detailId = workFlowDetailService.selectDetailId(workFlowDetail);
 
         //插入或更新详情
         if(detailId==null) {
@@ -348,19 +350,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(
@@ -389,6 +378,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(

operation_manager/src/main/java/com/huaxu/task/controller/PlanManageController.java

@@ -51,15 +51,6 @@ public class PlanManageController {
     @ApiOperation(value = "新增巡检计划")
     public AjaxMessage addPlan(
             @ApiParam(value = "新增巡检计划", required = true) @RequestBody PlanManage planManage
-//            @ApiParam(value = "任务名称", required = true) @RequestParam(required = true) String planName,
-//                               @ApiParam(value = "任务类型", required = true) @RequestParam(required = true) Integer taskType,
-//                               @ApiParam(value = "计划开始时间", required = true) @RequestParam(required = true) String planStartDate,
-//                               @ApiParam(value = "计划结束时间", required = true) @RequestParam(required = true) String planEndDate,
-//                               @ApiParam(value = "计划巡检人ID", required = true) @RequestParam(required = true) String userId,
-//                               @ApiParam(value = "任务内容", required = true) @RequestParam(required = true) String taskContent,
-//                               @ApiParam(value = "任务区域坐标", required = true) @RequestParam(required = true) String taskAreaShape,
-//                               @ApiParam(value = "任务区域名称", required = true) @RequestParam(required = true) String taskAreaName,
-//                               @ApiParam(value = "任务签到点", required = false) @RequestParam(required = false) String taskChecked
                                ) {
         LoginUser loginUser = UserUtil.getCurrentUser();
         String planId=DatesUtil.formatDate(new Date(),"yyyyMMddHHmmss")+String.valueOf((int) (Math.random()*(9999-1000)+1000));
@@ -69,9 +60,6 @@ public class PlanManageController {
         record.setPlanName(planManage.getPlanName());
         record.setTaskType(planManage.getTaskType());
         record.setTaskChecked(planManage.getTaskChecked());
-        //record.setPlanDate(new Date());
-//        record.setPlanStartDate(DatesUtil.parseDate( planStartDate,"yyyy-MM-dd"));
-//        record.setPlanEndDate(DatesUtil.parseDate(planEndDate,"yyyy-MM-dd"));
         record.setPlanStartDate(planManage.getPlanStartDate());
         record.setPlanEndDate(planManage.getPlanEndDate());
         record.setPlanStatus(0);
@@ -86,6 +74,12 @@ public class PlanManageController {
         if(loginUser.getTenantId() != null) {
             record.setTenantId(loginUser.getTenantId());
         }
+        if(loginUser.getCompanyId() != null){
+            record.setCompanyOrgId(loginUser.getCompanyId().toString());
+        }
+        if(loginUser.getDepartmentId() != null){
+            record.setDepartmentOrgId(loginUser.getDepartmentId().toString());
+        }
         int rows = planManageService.insertSelective(record);
         if(rows > 0) {
             return new AjaxMessage(ResultStatus.OK);