|
|
@@ -50,7 +50,7 @@ public class RDContorller extends BaseApiController {
|
|
|
ParamUtils.getParamName(in,bindingResult.getFieldError().getField())));
|
|
|
return res;
|
|
|
}
|
|
|
- if (rdService.checkRdNo(in.getRdNo())){
|
|
|
+ if (rdService.checkRdNo(in.getRdNo(),null)){
|
|
|
res.getError().add(buildErrorMessageParams(ErrorConstants.PARAM_BEING_ERROR,"研发活动编号"));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -65,6 +65,31 @@ public class RDContorller extends BaseApiController {
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+
|
|
|
+ @RequestMapping(value="/update",method = RequestMethod.POST)
|
|
|
+ public Result update(@Validated InputRdDetails in ,BindingResult bindingResult) {
|
|
|
+ Result res= new Result();
|
|
|
+ if (bindingResult.hasErrors()) {
|
|
|
+ res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
|
|
|
+ ParamUtils.getParamName(in,bindingResult.getFieldError().getField())));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ if (rdService.checkRdNo(in.getRdNo(),in.getId())){
|
|
|
+ res.getError().add(buildErrorMessageParams(ErrorConstants.PARAM_BEING_ERROR,"研发活动编号"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ if (StringUtils.isNotBlank(in.getRdStartStr())){
|
|
|
+ in.setRdStart(DateUtils.StringToDate(in.getRdStartStr(), AFTConstants.YYYYMMDD));
|
|
|
+ }
|
|
|
+ if (StringUtils.isNotBlank(in.getRdEndStr())){
|
|
|
+ in.setRdEnd(DateUtils.StringToDate(in.getRdEndStr(),AFTConstants.YYYYMMDD));
|
|
|
+ }
|
|
|
+
|
|
|
+ res.data(rdService.update(in));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
@RequestMapping(value = "/details",method = RequestMethod.GET)
|
|
|
public Result details(Long id){
|
|
|
Result res =new Result();
|
|
|
@@ -126,4 +151,5 @@ public class RDContorller extends BaseApiController {
|
|
|
LoggerUtils.error(PublicController.class,"下载文件失败", e);
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
}
|