|
|
@@ -776,11 +776,11 @@ public class AdminTechProjectApiController extends CertifyApiController {
|
|
|
* @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/listMyTask",method = RequestMethod.POST)
|
|
|
- public Result listMyTask(String projectNo,String buyerName,String startDate,String endDate, Integer taskStatus,String categoryId,
|
|
|
+ public Result listMyTask(String projectNo,String buyerName,String startDate,String endDate,String publishStatus, Integer taskStatus,String categoryId,
|
|
|
Integer pageNo, Integer pageSize){
|
|
|
Result res = new Result();
|
|
|
res.setData(techProjectService.selectProjectTask(projectNo, buyerName, TokenManager.getAdminId(), "",
|
|
|
- startDate, endDate, taskStatus, categoryId,null, pageNo, pageSize));
|
|
|
+ startDate, endDate, taskStatus, categoryId,null,publishStatus, 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,String deletedSign,Integer pageNo, Integer pageSize){
|
|
|
+ Integer taskStatus,String categoryId,String deletedSign,String publishStatus, Integer pageNo, Integer pageSize){
|
|
|
Result res = new Result();
|
|
|
res.setData(techProjectService.selectProjectTask(projectNo, buyerName, "", taskReceiverName, startDate, endDate,
|
|
|
- taskStatus, categoryId,deletedSign, pageNo, pageSize));
|
|
|
+ taskStatus, categoryId,deletedSign,publishStatus, pageNo, pageSize));
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
@@ -962,4 +962,34 @@ public class AdminTechProjectApiController extends CertifyApiController {
|
|
|
techProjectService.updateProjectTask(contractId,signDate,signComment,completeDate,completeComment);
|
|
|
return res;
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 项目任务公示修改
|
|
|
+ * @param taskId
|
|
|
+ * @param commodityId
|
|
|
+ * @param commodityMode
|
|
|
+ * @param taskComment
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/updatePublishStatus",method = RequestMethod.POST)
|
|
|
+ public Result updateProjectTask(String taskId,String publishStatus){
|
|
|
+ Result res = new Result();
|
|
|
+ if(StringUtils.isBlank(taskId)){
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "任务编号"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ ContractTask task = techProjectService.selectTaskById(taskId);
|
|
|
+ if (task.getTaskStatus()!=3) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "任务状态"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ if(task != null){
|
|
|
+ if(task.getTaskStatus() != TaskState.UN_DISTRIBUTION.getCode())
|
|
|
+ res.getError().add(buildError(ErrorConstants.NOT_ACCORD_WITH_NEXT, ""));
|
|
|
+ }
|
|
|
+ task.setPublishStatus(Integer.valueOf(publishStatus));
|
|
|
+ techProjectService.updateProjectTask(task);
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
}
|