添加公司管理的功能

zhaoxiaohao

2020-04-10 665c0a06d0bca5a22fb42406c465d736f876b04e

添加公司管理的功能

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysCompany.java

@@ -8,6 +8,8 @@
import lombok.NoArgsConstructor;
import org.hibernate.validator.constraints.NotEmpty;

import javax.validation.constraints.NotNull;

/**
 * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
 *
@@ -28,7 +30,7 @@
    /**
     * 组织id
     */
    @NotEmpty(message = "组织id不能为空")
    @NotNull(message = "组织id不能为空")
    private Long orgId;
    /**
     * 公司名称

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/vo/SysCompanyVo.java

New file
@@ -0,0 +1,14 @@
package com.kidgrow.usercenter.vo;

import com.kidgrow.usercenter.model.SysCompany;
import lombok.Data;

@Data
public class SysCompanyVo extends SysCompany {
    private String sheng;
    private Long shengId;
    private String shi;
    private Long shiId;
    private String xian;
    private Long xianId;
}

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysAreaService.java

@@ -37,5 +37,7 @@
     * @return
     */
    ResultBody updateEnabled(Map<String, Object> params);

    ResultBody getListByMap(Map<String, Object> params);
}


 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysCompanyService.java

@@ -1,8 +1,10 @@
package com.kidgrow.usercenter.service;

import com.kidgrow.common.model.ResultBody;
import com.kidgrow.usercenter.model.SysCompany;
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.service.ISuperService;
import com.kidgrow.usercenter.vo.SysCompanyVo;

import java.util.Map;

@@ -20,7 +22,7 @@
     * @param params
     * @return
     */
    PageResult<SysCompany> findList(Map<String, Object> params);
    PageResult<SysCompanyVo> findList(Map<String, Object> params);


    /**
@@ -29,5 +31,12 @@
    * @return SysCompany对象
    */
    SysCompany findByObject(SysCompany sysCompany);

    /**
     * 更新公司的状态
     * @param params
     * @return
     */
    ResultBody updateEnabled(Map<String, Object> params);
}


 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysOrganizationService.java

@@ -1,6 +1,7 @@
package com.kidgrow.usercenter.service;

import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
import com.kidgrow.common.model.SysOrganization;
import com.kidgrow.common.service.ISuperService;

@@ -38,5 +39,7 @@
     * @return
     */
    List<SysOrganization> findListByUserId(Long userId);

    ResultBody getListByMap(Map<String, Object> params);
}


 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysAreaServiceImpl.java

@@ -63,4 +63,10 @@
        int i = baseMapper.updateById(area);
        return i > 0 ? ResultBody.ok().data(area).msg("更新成功") : ResultBody.failed("更新失败");
    }

    @Override
    public ResultBody getListByMap(Map<String, Object> params) {
        List<SysArea> sysAreas = baseMapper.selectByMap(params);
        return ResultBody.ok().data(sysAreas);
    }
}

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysCompanyServiceImpl.java

@@ -1,10 +1,17 @@
package com.kidgrow.usercenter.service.impl;

import com.kidgrow.common.model.ResultBody;
import com.kidgrow.usercenter.model.SysArea;
import com.kidgrow.usercenter.service.ISysAreaService;
import com.kidgrow.usercenter.vo.SysCompanyVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cglib.beans.BeanCopier;
import org.springframework.stereotype.Service;
import com.kidgrow.common.model.PageResult;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kidgrow.common.service.impl.SuperServiceImpl;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.apache.commons.collections4.MapUtils;
@@ -25,16 +32,58 @@
@Slf4j
@Service
public class SysCompanyServiceImpl extends SuperServiceImpl<SysCompanyMapper, SysCompany> implements ISysCompanyService {
    @Autowired
    private ISysAreaService sysAreaService;
    private final  Integer SHENG=1;
    private final  Integer SHI=2;
    private final  Integer XIAN=3;
    /**
     * 列表
     * @param params
     * @return
     */
    @Override
    public PageResult<SysCompany> findList(Map<String, Object> params){
    public PageResult<SysCompanyVo> findList(Map<String, Object> params){
        Page<SysCompany> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
        List<SysCompany> list  =  baseMapper.findList(page, params);
        return PageResult.<SysCompany>builder().data(list).code(0).count(page.getTotal()).build();
        List<SysCompanyVo> listVo=new ArrayList<>();
        list.forEach(e -> {
            SysCompanyVo vo=new SysCompanyVo();
            BeanCopier beanCopier = BeanCopier.create(SysCompany.class, SysCompanyVo.class, false);
            beanCopier.copy(e,vo,null);
            if(vo.getCompanyArea()!=null){
                SysArea byId = sysAreaService.getById(vo.getCompanyArea());
                if(byId.getAreaLeveltype()==XIAN){
                    vo.setXianId(byId.getId());
                    vo.setXian(byId.getAreaName());
                    SysArea shi = sysAreaService.getById(byId.getAreaParentId());
                    if(shi!=null){
                        vo.setShi(shi.getAreaName());
                        vo.setShiId(shi.getId());
                        SysArea sheng = sysAreaService.getById(shi.getAreaParentId());
                        if (sheng != null) {
                            vo.setSheng(sheng.getAreaName());
                            vo.setShengId(sheng.getId());
                        }
                    }
                }
                if(byId.getAreaLeveltype()==SHI){
                    vo.setShi(byId.getAreaName());
                    vo.setShiId(byId.getId());
                    SysArea sheng = sysAreaService.getById(byId.getAreaParentId());
                    if (sheng != null) {
                        vo.setSheng(sheng.getAreaName());
                        vo.setShengId(sheng.getId());
                    }
                }
                if(byId.getAreaLeveltype()==SHENG){
                    vo.setSheng(byId.getAreaName());
                    vo.setShengId(byId.getId());
                }
            }
            listVo.add(vo);
        });
        return PageResult.<SysCompanyVo>builder().data(listVo).code(0).count(page.getTotal()).build();
    }

    /**
@@ -46,4 +95,20 @@
    public SysCompany findByObject(SysCompany sysCompany){
        return baseMapper.findByObject(sysCompany);
    }

    @Override
    public ResultBody updateEnabled(Map<String, Object> params) {
        Long id = MapUtils.getLong(params, "id");
        if (id != null) {
            SysCompany sysCompany = baseMapper.selectById(id);
            if (sysCompany != null) {
                Boolean enabled = MapUtils.getBoolean(params, "enabled");
                sysCompany.setEnabled(enabled);
                baseMapper.updateById(sysCompany);
            }
        }else {
            return ResultBody.failed("请选择一条数据");
        }
        return ResultBody.ok();
    }
}

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysOrganizationServiceImpl.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
import com.kidgrow.common.model.SysOrganization;
import com.kidgrow.common.service.impl.SuperServiceImpl;
import com.kidgrow.usercenter.mapper.SysOrganizationMapper;
@@ -50,4 +51,10 @@
    public List<SysOrganization> findListByUserId(Long userId) {
        return baseMapper.findListByUserId(userId);
    }

    @Override
    public ResultBody getListByMap(Map<String, Object> params) {
        List<SysOrganization> sysOrganizations = baseMapper.selectByMap(params);
        return ResultBody.ok().data(sysOrganizations);
    }
}

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysCompanyMapper.xml

@@ -19,7 +19,7 @@
                and org_id = #{p.orgId}
            </if>
            <if test="p.companyName != null and p.companyName !=''">
                and company_name = #{p.companyName}
                and company_name like  '%${p.companyName}%'
            </if>
            <if test="p.companyArea != null and p.companyArea !=''">
                and company_area = #{p.companyArea}

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

@@ -45,6 +45,11 @@
    public PageResult<SysArea> findAlls(@RequestParam Map<String, Object> params) {
        return sysAreaService.findList(params);
    }
    @ApiOperation(value = "查询列表")
    @GetMapping("/getListByMap")
    public ResultBody getListByMap(@RequestParam Map<String, Object> params) {
        return sysAreaService.getListByMap(params);
    }

    /**
     * 查询

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

@@ -46,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);
    }

    /**
@@ -111,4 +111,12 @@
            return ResultBody.failed().msg("删除失败");
        }
    }
    /**
     *修改状态
     */
    @ApiOperation(value = "修改状态")
    @GetMapping("updateEnabled")
    public ResultBody updateEnabled(@RequestParam Map<String, Object> params) {
        return sysCompanyService.updateEnabled(params);
    }
}

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

New file
@@ -0,0 +1,118 @@
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 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.service.ISysOrganizationService;
import com.kidgrow.common.model.*;

import org.springframework.validation.BindingResult;
import org.springframework.validation.ObjectError;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List;


/**
 * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
 * @Description: 组织架构表
 * @Project: 用户中心
 * @CreateDate: Created in 2020-04-10 15:21:10 <br>
 * @Author: <a href="4345453@kidgrow.com">liuke</a>
 * @version: 1.0
 */
@Slf4j
@RestController
@RequestMapping("/sysorganization")
@Api(tags = "组织架构表")
public class SysOrganizationController  extends BaseController{
    @Autowired
    private ISysOrganizationService sysOrganizationService;

    /**
     * 列表
     */
    @ApiOperation(value = "查询列表")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "page", value = "分页起始位置", required = true, dataType = "Integer"),
            @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
    })
    @GetMapping
    public ResultBody<PageResult> list(@RequestParam Map<String, Object> params) {
        if(params.size()==0){
            params.put("page",1);
            params.put("limit",10);
        }
        return ResultBody.ok().data(sysOrganizationService.findList(params));
    }
    @ApiOperation(value = "查询列表by MAP")
    @GetMapping("getListByMap")
    public ResultBody getListByMap(@RequestParam Map<String, Object> params) {
        return sysOrganizationService.getListByMap(params);
    }

    /**
     * 查询
     */
    @ApiOperation(value = "查询")
    @GetMapping("/{id}")
    public ResultBody findById(@PathVariable Long id) {
        SysOrganization model = sysOrganizationService.getById(id);
        return ResultBody.ok().data(model).msg("查询成功");
    }

    /**
     * 根据SysOrganization当做查询条件进行查询
     */
    @ApiOperation(value = "根据SysOrganization当做查询条件进行查询")
    @PostMapping("/query")
    public ResultBody findByObject(@RequestBody SysOrganization sysOrganization) {
        SysOrganization model = sysOrganizationService.findByObject(sysOrganization);
        return ResultBody.ok().data(model).msg("查询成功");
    }

    /**
     * 新增or更新
     */
    @ApiOperation(value = "保存")
    @PostMapping
    public ResultBody save(@Valid @RequestBody SysOrganization sysOrganization, BindingResult bindingResult) {
        List<String> errMsg= new ArrayList<>();
        if (bindingResult.hasErrors()) {
            for (ObjectError error : bindingResult.getAllErrors()) {
                errMsg.add(error.getDefaultMessage());
            }
            return ResultBody.failed().msg(errMsg.toString());
        } else {
            boolean v= sysOrganizationService.saveOrUpdate(sysOrganization);
            if(v) {
                return ResultBody.ok().data(sysOrganization).msg("保存成功");
            }
            else {
                return ResultBody.failed().msg("保存失败");
            }
        }
    }

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

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/resources/application.yml

@@ -70,6 +70,7 @@
      - sys_doctor
      - sys_department
      - sys_area
      - sys_company
    ignoreSqls:
      - com.kidgrow.usercenter.mapper.SysRoleMapper.findAll


 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html

@@ -293,18 +293,6 @@
        var admin = layui.admin;
        var upload = layui.upload;


        //执行实例
        var uploadInst = upload.render({
            elem: '#phonto' //绑定元素
            , url: '/upload/' //上传接口
            , done: function (res) {
                //上传完毕回调
            }
            , error: function () {
                //请求异常回调
            }
        });
        //医院数据绑定在弹框里
        var hospital = "";