From f6d390988b1c9b5695338214e95ff0d6da70b300 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Wed, 25 Nov 2020 16:34:41 +0800
Subject: [PATCH] 完善功能

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorAnswerController.java |   35 +++++++++++++++++++++++++----------
 1 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorAnswerController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorAnswerController.java
index 5ec97f5..a1bc29d 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorAnswerController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorAnswerController.java
@@ -3,6 +3,7 @@
 import java.util.Map;
 import com.kidgrow.common.controller.BaseController;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.ObjectError;
 import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -27,8 +28,8 @@
 /**
  * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
  * @Description: 医答医生信息表-未完待续
- * @Project: 用户中心
- * @CreateDate: Created in 2020-04-01 09:37:05 <br>
+ * @Project: 运营中心
+ * @CreateDate: Created in 2020-04-02 18:25:34 <br>
  * @Author: <a href="4345453@kidgrow.com">liuke</a>
  * @version: 1.0
  */
@@ -49,12 +50,12 @@
             @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
     })
     @GetMapping
-    public PageResult list(@RequestParam Map<String, Object> params) {
+    public ResultBody<PageResult> list(@RequestParam Map<String, Object> params) {
         if(params.size()==0){
             params.put("page",1);
             params.put("limit",10);
         }
-        return doctorAnswerService.findList(params);
+        return ResultBody.ok().data(doctorAnswerService.findList(params));
     }
 
     /**
@@ -83,11 +84,20 @@
     @ApiOperation(value = "保存")
     @PostMapping
     public ResultBody save(@Valid @RequestBody DoctorAnswer doctorAnswer, BindingResult bindingResult) {
+        List<String> errMsg= new ArrayList<>();
         if (bindingResult.hasErrors()) {
-            return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
-        } else {
-            doctorAnswerService.saveOrUpdate(doctorAnswer);
-            return ResultBody.ok().data(doctorAnswer).msg("保存成功");
+            for (ObjectError error : bindingResult.getAllErrors()) {
+                errMsg.add(error.getDefaultMessage());
+            }
+            return ResultBody.failed().msg(errMsg.toString());
+        }  else {
+            boolean v= doctorAnswerService.saveOrUpdate(doctorAnswer);
+            if(v) {
+                return ResultBody.ok().data(doctorAnswer).msg("保存成功");
+            }
+            else {
+                return ResultBody.failed().msg("保存失败");
+            }
         }
     }
 
@@ -97,7 +107,12 @@
     @ApiOperation(value = "删除")
     @DeleteMapping("/{id}")
     public ResultBody delete(@PathVariable Long id) {
-        doctorAnswerService.removeById(id);
-        return ResultBody.ok().msg("删除成功");
+        boolean v= doctorAnswerService.removeById(id);
+        if(v) {
+            return ResultBody.ok().msg("删除成功");
+        }
+        else {
+            return ResultBody.failed().msg("删除失败");
+        }
     }
 }

--
Gitblit v1.8.0