|
|
@@ -58,7 +58,7 @@ import com.goafanti.user.bo.OrgUnitNames;
|
|
|
import com.goafanti.user.service.UserService;
|
|
|
|
|
|
@Controller
|
|
|
-@RequestMapping(value = "/open/api/admin/techproject")
|
|
|
+@RequestMapping(value = "/api/admin/techproject")
|
|
|
public class AdminTechProjectApiController extends CertifyApiController {
|
|
|
@Value(value = "${aesSecretKey}")
|
|
|
private String aesSecretKey = null;
|
|
|
@@ -971,6 +971,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
|
|
|
* @param taskComment
|
|
|
* @return
|
|
|
*/
|
|
|
+ @SuppressWarnings("null")
|
|
|
@RequestMapping(value = "/updatePublishStatus",method = RequestMethod.POST)
|
|
|
public Result updateProjectTask(String taskId,String publishStatus){
|
|
|
Result res = new Result();
|
|
|
@@ -979,13 +980,10 @@ public class AdminTechProjectApiController extends CertifyApiController {
|
|
|
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, ""));
|
|
|
+ if(task.getTaskStatus() != TaskState.COMPLETE.getCode()){
|
|
|
+ res.getError().add(buildError( "任务状态","操作材料未完成"));
|
|
|
+ return res;}
|
|
|
}
|
|
|
task.setPublishStatus(Integer.valueOf(publishStatus));
|
|
|
techProjectService.updateProjectTask(task);
|