diff --git a/src/main/java/com/xdap/self_development/controller/ResponsiblePersonController.java b/src/main/java/com/xdap/self_development/controller/ResponsiblePersonController.java index 40eb995..7128508 100644 --- a/src/main/java/com/xdap/self_development/controller/ResponsiblePersonController.java +++ b/src/main/java/com/xdap/self_development/controller/ResponsiblePersonController.java @@ -160,7 +160,7 @@ public class ResponsiblePersonController { } responsiblePersonService.updateResponsiblePerson(form); - return Response.ok().setMessage(form.toString()); + return Response.ok().setMessage("添加成功"); } // 删除部门责任人 diff --git a/src/main/java/com/xdap/self_development/controller/TemplateController.java b/src/main/java/com/xdap/self_development/controller/TemplateController.java index 34d884d..d474ea5 100644 --- a/src/main/java/com/xdap/self_development/controller/TemplateController.java +++ b/src/main/java/com/xdap/self_development/controller/TemplateController.java @@ -7,6 +7,7 @@ import com.xdap.api.moudle.department.pojo.entity.XdapDepartments; import com.xdap.runtime.service.RuntimeDatasourceService; import com.xdap.self_development.controller.form.*; import com.xdap.self_development.pojo.Template; +import com.xdap.self_development.pojo.view.TemplateImportProblemView; import com.xdap.self_development.service.TemplateService; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; @@ -23,7 +24,6 @@ public class TemplateController { @Resource private TemplateService templateService; - // 模板名的模糊搜索 @GetMapping("/getTemplateByCondition") public Response getTemplateByCondition( @@ -40,15 +40,19 @@ public class TemplateController { return Response.ok().data(page); } - // 导入模板 导入全部模板参数和单页模板参数 - @PostMapping("/import") - public Response importTemplate( - @RequestPart("file") MultipartFile file, - @RequestPart(value = "templateRowId", required = false) String templateRowId, - @RequestPart("createBy") String createBy + // 查看版本 某个模板的全部版本 + @GetMapping("getTemplateVersion") + public Response getTemplateVersion( + @Valid TemplateRowIdForm form, + BindingResult bindingResult ) { - templateService.importTemplate(file, templateRowId, createBy); - return Response.ok().setMessage("导入成功"); + if (bindingResult.hasErrors()) { + bindingResult.getFieldErrors().forEach(error -> { + throw new MpaasBusinessException(error.getDefaultMessage()); + }); + } + List