Browse Source

合并代码

wangbo 4 years ago
parent
commit
e96a9db374

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

@@ -316,6 +316,7 @@ public class WorkOrderManageController {
             @ApiParam(value = "页数", required = true)@RequestParam Integer pageNum,
             @ApiParam(value = "条数", required = true)@RequestParam Integer pageSize,
             @ApiParam(value = "状态(0:事件隐患;null:所有工单;1:执行中;2:完成)", required = false) @RequestParam(required = false) Integer orderStatus,
+            @ApiParam(value = "工单类型(1表务、2停通水、3抢修、4漏点定位、5测漏、6违章跑水)", required = false) @RequestParam(required = false) Integer orderTypeId,
             @ApiParam(value = "事件类型(1:运维上报,2:用户上报,3:设备告警)", required = false) @RequestParam(required = false) Integer eventType,
             @ApiParam(value = "事件隐患ID", required = false) @RequestParam(required = false) String taskNo,
             @ApiParam(value = "计划起始日期(yyyy-MM-dd)", required = false) @RequestParam(required = false) String startDate,
@@ -331,6 +332,7 @@ public class WorkOrderManageController {
         workOrderManageDto.setOrderStatus(orderStatus);
         workOrderManageDto.setEventType(eventType);
         workOrderManageDto.setTenantId(loginUser.getTenantId());
+        workOrderManageDto.setOrderTypeId(orderTypeId);
         workOrderManageDto.setProgramItems(loginUser.getProgramItemList());
         workOrderManageDto.setUserType(loginUser.getType());
         //1是公司,2是公司及以下,3部门,4部门及以下,5自定义