|
|
@@ -398,7 +398,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
public Pagination<TaskListBo> selectProjectTask(String projectNo, String buyerName, String taskReceiverId, String taskReceiverName,
|
|
|
- String startDate,String endDate, Integer taskStatus, String categoryId,String deletedSign,String publishStatus, Integer pageNo, Integer pageSize) {
|
|
|
+ String startDate,String endDate, Integer taskStatus, String categoryId,String deleteSign,String publishStatus, Integer pageNo, Integer pageSize) {
|
|
|
Map<String,Object> params = new HashMap<String,Object>();
|
|
|
if(StringUtils.isNotBlank(projectNo)) params.put("projectNo", projectNo);
|
|
|
if(StringUtils.isNotBlank(buyerName)) params.put("buyerName", buyerName);
|
|
|
@@ -412,7 +412,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
|
|
|
} catch (ParseException e) {
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(categoryId)) params.put("categoryId", categoryId);
|
|
|
- if(StringUtils.isNotBlank(deletedSign)) params.put("deletedSign", deletedSign);
|
|
|
+ if(StringUtils.isNotBlank(deleteSign)) params.put("deleteSign", deleteSign);
|
|
|
if(StringUtils.isNotBlank(publishStatus)) params.put("publishStatus", publishStatus);
|
|
|
if(taskStatus != null) params.put("taskStatus", taskStatus);
|
|
|
return (Pagination<TaskListBo>)findPage("selectProjectTaskByPage", "selectProjectTaskCount", params, pageNo, pageSize);
|