Merge remote-tracking branch 'origin/master'

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

@@ -348,6 +348,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("/pending")
     @ApiOperation(value = "查询待处理工单")
     public AjaxMessage<Pagination<WorkOrderManageDto>> selectPendingOrder(
@@ -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);

operation_manager/src/main/resources/mapper/order/WorkOrderManageMapper.xml

@@ -106,6 +106,7 @@
         from sc_work_flow_log t3
         where t3.flow_id= #{flowId,jdbcType=INTEGER} and t3.flow_type=2
   </select>
+
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from sc_work_order_manage
     where id = #{id,jdbcType=INTEGER}
@@ -558,6 +559,9 @@
       <if test="order.taskNo != null and order.taskNo != ''">
         and t1.task_no like CONCAT('%',#{order.taskNo},'%')
       </if>
+      <if test="order.orderPid != null">
+        and t1.order_pid = #{order.orderPid,jdbcType=INTEGER}
+      </if>
       <if test="order.userType!=null and order.userType!=-999 and order.userType!=-9999 and  order.programItems != null and order.programItems.size() > 0">
         <if test="order.permissonType == 5 or order.permissonType == 2">
           and ( t1.department_org_id in