Commit 6d41ca8e by HlQ

[add]

1.项目列表支持的项目名称支持忽略大小写的模糊查询
2.工单列表支持多个指派人查询
1 parent a79955b8
...@@ -68,6 +68,7 @@ public class TaskDTO extends BaseDTO { ...@@ -68,6 +68,7 @@ public class TaskDTO extends BaseDTO {
* 当前处理人 * 当前处理人
*/ */
private Long activeUser; private Long activeUser;
private Long[] activeUsers;
/** /**
* 截止日期 * 截止日期
*/ */
......
...@@ -25,7 +25,7 @@ public class Store { ...@@ -25,7 +25,7 @@ public class Store {
/** /**
* 门店名称 * 门店名称
*/ */
@TableField(condition = SqlCondition.LIKE) @TableField(condition = "%s ILIKE CONCAT('%%',#{%s},'%%')")
private String name; private String name;
/** /**
* 销售人 * 销售人
......
...@@ -75,6 +75,7 @@ public class TaskServiceImpl extends MPJBaseServiceImpl<TaskMapper, Task> implem ...@@ -75,6 +75,7 @@ public class TaskServiceImpl extends MPJBaseServiceImpl<TaskMapper, Task> implem
.leftJoin(Store.class, Store::getId, Task::getStoreId) .leftJoin(Store.class, Store::getId, Task::getStoreId)
.leftJoin(Account.class, Account::getId, Task::getAccountId) .leftJoin(Account.class, Account::getId, Task::getAccountId)
.leftJoin(ServiceOrder.class, ServiceOrder::getTaskId, Task::getId) .leftJoin(ServiceOrder.class, ServiceOrder::getTaskId, Task::getId)
.in(ArrayUtil.isNotEmpty(data.getActiveUsers()), Task::getActiveUser, data.getActiveUsers())
.between(ArrayUtil.isAllNotNull(data.getStartdate(), data.getEnddate()), Task::getRepairTime, data.getStartdate(), data.getEnddate()) .between(ArrayUtil.isAllNotNull(data.getStartdate(), data.getEnddate()), Task::getRepairTime, data.getStartdate(), data.getEnddate())
.isNotNull(ObjUtil.equals(data.getSource(), 1), Task::getTaskTempId) .isNotNull(ObjUtil.equals(data.getSource(), 1), Task::getTaskTempId)
.isNull(ObjUtil.equals(data.getSource(), 2), Task::getTaskTempId) .isNull(ObjUtil.equals(data.getSource(), 2), Task::getTaskTempId)
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!