|
|
@@ -780,7 +780,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
|
|
|
Integer pageNo, Integer pageSize){
|
|
|
Result res = new Result();
|
|
|
res.setData(techProjectService.selectProjectTask(projectNo, buyerName, TokenManager.getAdminId(), "",
|
|
|
- startDate, endDate, taskStatus, categoryId, pageNo, pageSize));
|
|
|
+ startDate, endDate, taskStatus, categoryId,null, pageNo, pageSize));
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
@@ -799,10 +799,10 @@ public class AdminTechProjectApiController extends CertifyApiController {
|
|
|
*/
|
|
|
@RequestMapping(value = "/listTask",method = RequestMethod.POST)
|
|
|
public Result listTask(String projectNo,String buyerName,String taskReceiverName, String startDate,String endDate,
|
|
|
- Integer taskStatus,String categoryId,Integer pageNo, Integer pageSize){
|
|
|
+ Integer taskStatus,String categoryId,String deletedSign,Integer pageNo, Integer pageSize){
|
|
|
Result res = new Result();
|
|
|
res.setData(techProjectService.selectProjectTask(projectNo, buyerName, "", taskReceiverName, startDate, endDate,
|
|
|
- taskStatus, categoryId, pageNo, pageSize));
|
|
|
+ taskStatus, categoryId,deletedSign, pageNo, pageSize));
|
|
|
return res;
|
|
|
}
|
|
|
|