|
|
@@ -23,7 +23,7 @@ import com.goafanti.common.bo.Result;
|
|
|
import com.goafanti.common.constant.AFTConstants;
|
|
|
import com.goafanti.common.constant.ErrorConstants;
|
|
|
import com.goafanti.common.controller.CertifyApiController;
|
|
|
-import com.goafanti.common.enums.CopyrightFields;
|
|
|
+import com.goafanti.common.enums.TechProjectFields;
|
|
|
import com.goafanti.common.model.TechProject;
|
|
|
import com.goafanti.common.model.TechProjectLog;
|
|
|
import com.goafanti.common.model.TechWebsite;
|
|
|
@@ -32,7 +32,6 @@ import com.goafanti.common.utils.AesUtils;
|
|
|
import com.goafanti.common.utils.StringUtils;
|
|
|
import com.goafanti.core.mybatis.page.Pagination;
|
|
|
import com.goafanti.techproject.bo.InputTechProject;
|
|
|
-import com.goafanti.techproject.bo.InputTechProjectLog;
|
|
|
import com.goafanti.techproject.bo.InputTechWebsite;
|
|
|
import com.goafanti.techproject.bo.TechProjectManageListBo;
|
|
|
import com.goafanti.techproject.bo.TechWebsiteDetailBo;
|
|
|
@@ -106,7 +105,7 @@ public class AdminTechProjectController extends CertifyApiController {
|
|
|
Result res = new Result();
|
|
|
if (bindingResult.hasErrors()) {
|
|
|
res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
|
|
|
- CopyrightFields.getFieldDesc(bindingResult.getFieldError().getField())));
|
|
|
+ TechProjectFields.getFieldDesc(bindingResult.getFieldError().getField())));
|
|
|
return res;
|
|
|
}
|
|
|
if (!checkAdminLogin(res)) {
|
|
|
@@ -177,12 +176,12 @@ public class AdminTechProjectController extends CertifyApiController {
|
|
|
* @throws ParseException
|
|
|
*/
|
|
|
@RequestMapping(value = "/updateTechProject", method = RequestMethod.POST)
|
|
|
- public Result updateTechProject(@Valid InputTechProject techProject, @Valid InputTechProjectLog log,
|
|
|
+ public Result updateTechProject(@Valid InputTechProject techProject,
|
|
|
BindingResult bindingResult, String recordTimeFormattedDate) {
|
|
|
Result res = new Result();
|
|
|
if (bindingResult.hasErrors()) {
|
|
|
res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
|
|
|
- CopyrightFields.getFieldDesc(bindingResult.getFieldError().getField())));
|
|
|
+ TechProjectFields.getFieldDesc(bindingResult.getFieldError().getField())));
|
|
|
return res;
|
|
|
}
|
|
|
if (!checkAdminLogin(res)) {
|
|
|
@@ -212,7 +211,7 @@ public class AdminTechProjectController extends CertifyApiController {
|
|
|
TechProjectLog tpl = new TechProjectLog();
|
|
|
tp.setId(techProject.getId());
|
|
|
BeanUtils.copyProperties(techProject, tp);
|
|
|
- BeanUtils.copyProperties(log, tpl);
|
|
|
+ BeanUtils.copyProperties(techProject, tpl);
|
|
|
res.setData(techProjectService.updateTechProject(tp, tpl, recordTime));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -337,7 +336,7 @@ public class AdminTechProjectController extends CertifyApiController {
|
|
|
Result res = new Result();
|
|
|
if (bindingResult.hasErrors()) {
|
|
|
res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
|
|
|
- CopyrightFields.getFieldDesc(bindingResult.getFieldError().getField())));
|
|
|
+ TechProjectFields.getFieldDesc(bindingResult.getFieldError().getField())));
|
|
|
return res;
|
|
|
}
|
|
|
if (!checkAdminLogin(res)) {
|