1.组织，医院，科室的编辑业务调整，增加了联动编辑功能（创建医院自动创建组织数据，修改同理） 2.重新优化，调整了医院/科室编辑过程中对名称的检查，数...

侯瑞军

2020-04-21 ec0f2528f83ee7c6ec64537d561a697ffff5b5c3

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysOrganizationController.java

@@ -12,9 +12,12 @@
import lombok.extern.slf4j.Slf4j;
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 java.util.ArrayList;
import java.util.List;
import java.util.Map;


@@ -22,7 +25,7 @@
 * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
 * @Description: 组织架构表
 * @Project: 用户中心
 * @CreateDate: Created in 2020-03-31 11:01:35 <br>
 * @CreateDate: Created in 2020-04-10 15:21:10 <br>
 * @Author: <a href="4345453@kidgrow.com">liuke</a>
 * @version: 1.0
 */
@@ -43,12 +46,50 @@
            @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 sysOrganizationService.findList(params);
        return ResultBody.ok().data(sysOrganizationService.findList(params));
    }
    /**
     * 列表
     */
    @ApiOperation(value = "模糊查询列表")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "page", value = "分页起始位置", required = true, dataType = "Integer"),
            @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
    })
    @GetMapping("/listByName")
    public ResultBody listByName(@RequestParam Map<String, Object> params) {
        if(params.size()==0){
            params.put("page",1);
            params.put("limit",10);
        }
        if (params.get("orgName")!=null) {
            return ResultBody.ok().data(sysOrganizationService.findList(params).getData());
        }
        else
        {
            return ResultBody.ok().data(null);
        }
    }
    @ApiOperation(value = "查询列表by MAP")
    @GetMapping("getListByMap")
    public ResultBody getListByMap(@RequestParam Map<String, Object> params) {
        return sysOrganizationService.getListByMap(params);
    }

    @ApiOperation(value = "获取tree")
    @GetMapping("getTree")
    public ResultBody getTree(@RequestParam Map<String, Object> params) {
        return sysOrganizationService.getTree(params);
    }
    @ApiOperation(value = "更新状态")
    @GetMapping("updateEnabled")
    public ResultBody updateEnabled(@RequestParam Map<String, Object> params) {
        return sysOrganizationService.updateEnabled(params);
    }

    /**
@@ -77,11 +118,20 @@
    @ApiOperation(value = "保存")
    @PostMapping
    public ResultBody save(@Valid @RequestBody SysOrganization sysOrganization, 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 {
            sysOrganizationService.saveOrUpdate(sysOrganization);
            return ResultBody.ok().data(sysOrganization).msg("保存成功");
            boolean v= sysOrganizationService.saveOrUpdate(sysOrganization);
            if(v) {
                return ResultBody.ok().data(sysOrganization).msg("保存成功");
            }
            else {
                return ResultBody.failed().msg("保存失败");
            }
        }
    }

@@ -91,7 +141,12 @@
    @ApiOperation(value = "删除")
    @DeleteMapping("/{id}")
    public ResultBody delete(@PathVariable Long id) {
        sysOrganizationService.removeById(id);
        return ResultBody.ok().msg("删除成功");
        boolean v= sysOrganizationService.removeById(id);
        if(v) {
            return ResultBody.ok().msg("删除成功");
        }
        else {
            return ResultBody.failed().msg("删除失败");
        }
    }
}