|
|
@@ -4,32 +4,21 @@ import com.goafanti.RD.bo.InputRdDetails;
|
|
|
import com.goafanti.RD.bo.InputRdList;
|
|
|
import com.goafanti.RD.service.RDService;
|
|
|
import com.goafanti.common.bo.Result;
|
|
|
-import com.goafanti.common.constant.AFTConstants;
|
|
|
-import com.goafanti.common.constant.ErrorConstants;
|
|
|
import com.goafanti.common.controller.BaseApiController;
|
|
|
import com.goafanti.common.controller.PublicController;
|
|
|
-import com.goafanti.common.enums.AttachmentType;
|
|
|
-import com.goafanti.common.model.Attachment;
|
|
|
-import com.goafanti.common.model.RdDetails;
|
|
|
-import com.goafanti.common.utils.DateUtils;
|
|
|
import com.goafanti.common.utils.LoggerUtils;
|
|
|
-import com.goafanti.common.utils.ParamUtils;
|
|
|
-import com.goafanti.common.utils.StringUtils;
|
|
|
import com.goafanti.common.utils.excel.FileUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.http.MediaType;
|
|
|
import org.springframework.validation.BindingResult;
|
|
|
-import org.springframework.validation.annotation.Validated;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
import org.springframework.web.bind.annotation.RequestParam;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
-import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
-import java.util.Date;
|
|
|
|
|
|
@RestController
|
|
|
@RequestMapping(value = "/api/admin/RD")
|
|
|
@@ -43,24 +32,8 @@ public class RDContorller extends BaseApiController {
|
|
|
|
|
|
|
|
|
@RequestMapping(value="/add",method = RequestMethod.POST)
|
|
|
- public Result add(@Validated InputRdDetails in ,BindingResult bindingResult) {
|
|
|
+ public Result add( InputRdDetails in ) {
|
|
|
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(),null)){
|
|
|
- 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.add(in));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -70,22 +43,6 @@ public class RDContorller extends BaseApiController {
|
|
|
@RequestMapping(value="/update",method = RequestMethod.POST)
|
|
|
public Result update( 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;
|
|
|
}
|