|
|
@@ -169,7 +169,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
public Pagination<TOrderTaskListBo> orderTaskList(String name, String orderNo, String taskId, Integer taskStatus,
|
|
|
- String adminName,Integer specially, String depId, Integer pageNo, Integer pageSize,Integer outsource) {
|
|
|
+ String adminName,Integer specially, String depId, String contractNo,Integer projectStatus ,Integer pageNo, Integer pageSize,Integer outsource) {
|
|
|
Map<String, Object> params = new HashMap<String, Object>();
|
|
|
if(pageSize==null||pageSize<0)pageSize=10;
|
|
|
if(pageNo==null||pageNo<0)pageNo=1;
|
|
|
@@ -178,6 +178,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
if (StringUtils.isNotBlank(name)) params.put("name", name);
|
|
|
if (StringUtils.isNotBlank(depId)) params.put("depId", depId);
|
|
|
if (StringUtils.isNotBlank(orderNo)) params.put("orderNo", orderNo);
|
|
|
+ if (StringUtils.isNotBlank(contractNo)) params.put("contractNo", contractNo);
|
|
|
+ if (projectStatus !=null ) params.put("projectStatus", projectStatus);
|
|
|
if (StringUtils.isNotBlank(taskId)) params.put("taskId", taskId);
|
|
|
if (StringUtils.isNotBlank(adminName)) params.put("adminName", adminName);
|
|
|
if (null != taskStatus) params.put("taskStatus", taskStatus);
|