From 665c0a06d0bca5a22fb42406c465d736f876b04e Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Fri, 10 Apr 2020 17:53:16 +0800
Subject: [PATCH] 添加公司管理的功能

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysCompanyController.java |   37 +++++++++++++++++++++++--------------
 1 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysCompanyController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysCompanyController.java
index fecf4da..8598c56 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysCompanyController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysCompanyController.java
@@ -1,27 +1,24 @@
 package com.kidgrow.usercenter.controller;
 
-import java.util.Map;
 import com.kidgrow.common.controller.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import com.kidgrow.common.model.PageResult;
+import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.usercenter.model.SysCompany;
+import com.kidgrow.usercenter.service.ISysCompanyService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-
-import com.kidgrow.usercenter.model.SysCompany;
-import com.kidgrow.usercenter.service.ISysCompanyService;
-import com.kidgrow.common.model.*;
-
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
+import org.springframework.validation.ObjectError;
+import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 
 /**
@@ -49,12 +46,12 @@
             @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
     })
     @GetMapping
-    public ResultBody<PageResult> list(@RequestParam Map<String, Object> params) {
+    public PageResult list(@RequestParam Map<String, Object> params) {
         if(params.size()==0){
             params.put("page",1);
             params.put("limit",10);
         }
-        return ResultBody.ok().data(sysCompanyService.findList(params));
+        return sysCompanyService.findList(params);
     }
 
     /**
@@ -83,8 +80,12 @@
     @ApiOperation(value = "保存")
     @PostMapping
     public ResultBody save(@Valid @RequestBody SysCompany sysCompany, 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 {
             boolean v= sysCompanyService.saveOrUpdate(sysCompany);
             if(v) {
@@ -110,4 +111,12 @@
             return ResultBody.failed().msg("删除失败");
         }
     }
+    /**
+     *修改状态
+     */
+    @ApiOperation(value = "修改状态")
+    @GetMapping("updateEnabled")
+    public ResultBody updateEnabled(@RequestParam Map<String, Object> params) {
+        return sysCompanyService.updateEnabled(params);
+    }
 }

--
Gitblit v1.8.0