|
|
@@ -856,12 +856,15 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- public Pagination<DemandListBo> listMyDemand(String name, String startDate, String endDate,
|
|
|
- Integer pageNo, Integer pageSize) {
|
|
|
+ public Pagination<DemandListBo> listMyDemand(String name, String startDate, String endDate,String createStartDate,String createEndDate,
|
|
|
+ Integer auditStatus,Integer pageNo, Integer pageSize) {
|
|
|
Map<String,Object> params = new HashMap<String,Object>();
|
|
|
if(StringUtils.isNotBlank(name)) params.put("name", name);
|
|
|
if(StringUtils.isNotBlank(startDate)) params.put("startDate", startDate);
|
|
|
- if(StringUtils.isNotBlank(endDate)) params.put("endDate", endDate);
|
|
|
+ if(StringUtils.isNotBlank(endDate)) params.put("endDate", endDate+" 23:59:59");
|
|
|
+ if(StringUtils.isNotBlank(createStartDate)) params.put("createStartDate", createStartDate);
|
|
|
+ if(StringUtils.isNotBlank(createEndDate)) params.put("createEndDate", createEndDate+" 23:59:59");
|
|
|
+ if(auditStatus!=null)params.put("auditStatus", auditStatus);
|
|
|
params.put("employerId", TokenManager.getUserId());
|
|
|
return (Pagination<DemandListBo>) findPage("selectDemandListByPage", "selectDemandListCount", params, pageNo, pageSize);
|
|
|
}
|