|
|
@@ -104,7 +104,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO |
|
|
|
//工单编号 XJGD+日期+随机 |
|
|
|
String code = DateUtils.generateCode("XJGD"); |
|
|
|
workOrder.setCode(code); |
|
|
|
workOrder.setStatus(WorkOrderStatusEnum.STATUS_ASSIGNED.getCode()); |
|
|
|
workOrder.setStatus(WorkOrderStatusEnum.STATUS_ALLOCATED.getCode()); |
|
|
|
workOrder.setAssignDeptId(deptId); |
|
|
|
workOrder.setAssignUser(user.getId()); |
|
|
|
workOrder.setAssignContact(user.getMobile()); |
|
|
@@ -189,7 +189,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO |
|
|
|
//获取当前分配人对应的工单分页数据 |
|
|
|
IPage<WorkOrder> workPageData = workOrderMapper.selectPage(page, Wrappers.<WorkOrder>lambdaQuery() |
|
|
|
.eq(WorkOrder::getAssignDeptId, deptId) |
|
|
|
.eq(WorkOrder::getStatus, 10) |
|
|
|
.in(WorkOrder::getStatus, 5,10) |
|
|
|
.like(StringUtils.isNotEmpty(user.getId()), WorkOrder::getAssignUser, user.getId()) |
|
|
|
.eq(WorkOrder::getTenantId, tenantId) |
|
|
|
.between(null != query.getOrderStartTime() && null != query.getOrderEndTime(), WorkOrder::getCreateTime, query.getOrderStartTime(), query.getOrderEndTime()) |