|
|
@ -242,7 +242,10 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl<WorkTicketInfoMap |
|
|
|
if (ObjectUtil.isNotEmpty(req.getCreateDept())) { |
|
|
|
if (ObjectUtil.isNotEmpty(req.getCreateDept())) { |
|
|
|
lqw.eq(WorkTicketInfoEntity::getCreateDept, req.getCreateDept()); |
|
|
|
lqw.eq(WorkTicketInfoEntity::getCreateDept, req.getCreateDept()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
//已完成的工作票
|
|
|
|
|
|
|
|
if (StringUtils.isNotEmpty(req.getFlowTaskName())) { |
|
|
|
|
|
|
|
lqw.eq(WorkTicketInfoEntity::getFlowTaskName,req.getFlowTaskName()); |
|
|
|
|
|
|
|
} |
|
|
|
lqw.orderByDesc(WorkTicketInfoEntity::getCreateTime).orderByDesc(WorkTicketInfoEntity::getUpdateTime); |
|
|
|
lqw.orderByDesc(WorkTicketInfoEntity::getCreateTime).orderByDesc(WorkTicketInfoEntity::getUpdateTime); |
|
|
|
IPage<WorkTicketInfoEntity> pages = this.page(Condition.getPage(query), lqw); |
|
|
|
IPage<WorkTicketInfoEntity> pages = this.page(Condition.getPage(query), lqw); |
|
|
|
//数据转换
|
|
|
|
//数据转换
|
|
|
|