|
|
@@ -1029,7 +1029,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
public Pagination<TOrderTaskListBo> selectTaskList(String name, String orderNo, String taskId, Integer taskStatus,
|
|
|
- String adminName, Integer specially,String depId,String thchId , Integer pageNo, Integer pageSize) {
|
|
|
+ String adminName, Integer specially,String depId,String thchId ,String type , Integer pageNo, Integer pageSize) {
|
|
|
Map<String, Object> params = new HashMap<String, Object>();
|
|
|
if(pageSize==null||pageSize<0)pageSize=10;
|
|
|
if(pageNo==null||pageNo<0)pageNo=1;
|
|
|
@@ -1041,6 +1041,9 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
if (StringUtils.isNotBlank(thchId)) params.put("thchId", thchId);
|
|
|
if (StringUtils.isNotBlank(adminName)) params.put("adminName", adminName);
|
|
|
if (null != taskStatus) params.put("taskStatus", taskStatus);
|
|
|
+ if (StringUtils.isNotBlank(type)){
|
|
|
+ params.put("type", type.split(","));
|
|
|
+ }
|
|
|
Pagination<TOrderTaskListBo> p = (Pagination<TOrderTaskListBo>)findPage("selectTaskListByPage", "selectTaskListCount", params, pageNo, pageSize);
|
|
|
return p;
|
|
|
}
|