|
|
@@ -225,7 +225,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 ,
|
|
|
- String contractNo,Integer projectStatus ,Integer approval,Integer outsource,Integer outsourceStatus,Integer pageNo,Integer pageSize) {
|
|
|
+ String contractNo,Integer projectStatus ,Integer approval,Integer outsource,Integer outsourceStatus,String startSignTime,String endSignTime,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;
|
|
|
@@ -239,6 +239,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
if (StringUtils.isNotBlank(taskId)) params.put("taskId", taskId);
|
|
|
if (approval !=null) params.put("approval", approval);
|
|
|
if (StringUtils.isNotBlank(adminName)) params.put("adminName", adminName);
|
|
|
+ if (StringUtils.isNotBlank(startSignTime)) params.put("startSignTime", startSignTime);
|
|
|
+ if (StringUtils.isNotBlank(endSignTime)) params.put("endSignTime", endSignTime);
|
|
|
if (null != taskStatus) params.put("taskStatus", taskStatus);
|
|
|
params.put("outsource", outsource==null?0:outsource);
|
|
|
if (outsourceStatus !=null) params.put("outsourceStatus", outsourceStatus);
|