From 0928fba7cd5576d2932859b1d4942464c720d92f Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Fri, 17 Apr 2020 19:03:08 +0800
Subject: [PATCH] 1.组织数据功能分离独立成模块 2.组织,医院,科室添加/修改功能 3.本周整理制作了3类JS通用插件(字典分类加载下来列表通用组件,省市区联动通用组件,文本框按输入内容自动搜索提示数据通用组件)

---
 kidgrow-business/kidgrow-code-generator/src/main/resources/template/Controller.java.vm |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/kidgrow-business/kidgrow-code-generator/src/main/resources/template/Controller.java.vm b/kidgrow-business/kidgrow-code-generator/src/main/resources/template/Controller.java.vm
index a0a5f7a..3491a40 100644
--- a/kidgrow-business/kidgrow-code-generator/src/main/resources/template/Controller.java.vm
+++ b/kidgrow-business/kidgrow-code-generator/src/main/resources/template/Controller.java.vm
@@ -15,6 +15,7 @@
 import com.kidgrow.common.model.*;
 
 import org.springframework.validation.BindingResult;
+import org.springframework.validation.ObjectError;
 import javax.validation.Valid;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -83,11 +84,20 @@
     @ApiOperation(value = "保存")
     @PostMapping
     public ResultBody save(@Valid @RequestBody ${className} ${classname}, BindingResult bindingResult) {
+        List<String> errMsg= new ArrayList<>();
         if (bindingResult.hasErrors()) {
-            return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
+            for (ObjectError error : bindingResult.getAllErrors()) {
+                errMsg.add(error.getDefaultMessage());
+            }
+            return ResultBody.failed().msg(errMsg.toString());
         } else {
-            ${classname}Service.saveOrUpdate(${classname});
-            return ResultBody.ok().data(${classname}).msg("保存成功");
+            boolean v= ${classname}Service.saveOrUpdate(${classname});
+            if(v) {
+                return ResultBody.ok().data(${classname}).msg("保存成功");
+            }
+            else {
+                return ResultBody.failed().msg("保存失败");
+            }
         }
     }
 
@@ -97,7 +107,12 @@
     @ApiOperation(value = "删除")
     @DeleteMapping("/{id}")
     public ResultBody delete(@PathVariable Long ${pk.attrname}) {
-        ${classname}Service.removeById(${pk.attrname});
-        return ResultBody.ok().msg("删除成功");
+        boolean v= ${classname}Service.removeById(${pk.attrname});
+        if(v) {
+            return ResultBody.ok().msg("删除成功");
+        }
+        else {
+            return ResultBody.failed().msg("删除失败");
+        }
     }
 }

--
Gitblit v1.8.0