|
@@ -541,7 +541,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
@Override
|
|
@Override
|
|
|
public Pagination<TOrderNewBo> orderNewList(String aid,String name, String orderNo, String starTime, String endTime,Integer specially,Integer approval,
|
|
public Pagination<TOrderNewBo> orderNewList(String aid,String name, String orderNo, String starTime, String endTime,Integer specially,Integer approval,
|
|
|
Integer distribution,String depId,String contractNo,Integer outsource,Integer liquidationStatus, Integer amountStatus,
|
|
Integer distribution,String depId,String contractNo,Integer outsource,Integer liquidationStatus, Integer amountStatus,
|
|
|
- String contractStart, String contractEnd,String uid,Integer projectType, Integer pageNo, Integer pageSize) {
|
|
|
|
|
|
|
+ String contractStart, String contractEnd,String uid,Integer projectType,Integer processStatus, Integer pageNo, Integer pageSize) {
|
|
|
Map<String, Object> params = new HashMap<String, Object>();
|
|
Map<String, Object> params = new HashMap<String, Object>();
|
|
|
if(pageSize==null||pageSize<0)pageSize=10;
|
|
if(pageSize==null||pageSize<0)pageSize=10;
|
|
|
if(pageNo==null||pageNo<0)pageNo=1;
|
|
if(pageNo==null||pageNo<0)pageNo=1;
|
|
@@ -576,6 +576,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
if (StringUtils.isNotBlank(contractStart)) params.put("contractStart", contractStart);
|
|
if (StringUtils.isNotBlank(contractStart)) params.put("contractStart", contractStart);
|
|
|
if (StringUtils.isNotBlank(contractEnd)) params.put("contractEnd", contractEnd+" 23:59:59");
|
|
if (StringUtils.isNotBlank(contractEnd)) params.put("contractEnd", contractEnd+" 23:59:59");
|
|
|
if(null != projectType)params.put("projectType",projectType);
|
|
if(null != projectType)params.put("projectType",projectType);
|
|
|
|
|
+ if(null != processStatus)params.put("processStatus",processStatus);
|
|
|
params.put("outsource", outsource);
|
|
params.put("outsource", outsource);
|
|
|
Pagination<TOrderNewBo> p = (Pagination<TOrderNewBo>)findPage("selectOrderNewListByPage", "selectOrderNewListCount", params, pageNo, pageSize);
|
|
Pagination<TOrderNewBo> p = (Pagination<TOrderNewBo>)findPage("selectOrderNewListByPage", "selectOrderNewListCount", params, pageNo, pageSize);
|
|
|
return p;
|
|
return p;
|