#公司查询 新增修改

jiaosong

2023-09-11 9873e926fde8a52d3928dbae9649100b887b22a0

#公司查询 新增修改

 server/platform/src/main/java/com/doumee/api/business/CompanyController.java

@@ -7,12 +7,15 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.dto.CompanyCreatOrUpdateRequest;
import com.doumee.service.business.CompanyService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;

/**
 * @author AA
@@ -30,7 +33,7 @@
    @ApiOperation("新建")
    @PostMapping("/create")
    @RequiresPermissions("company:company:create")
    public ApiResponse create(@RequestBody Company company) {
    public ApiResponse create(@RequestBody @Valid CompanyCreatOrUpdateRequest company) {
        return ApiResponse.success(companyService.create(company));
    }


 server/service/src/main/java/com/doumee/dao/business/join/CompanyJoinMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
package com.doumee.dao.business.join;

import com.doumee.dao.business.model.BaseGoods;
import com.doumee.dao.business.model.Company;
import com.github.yulichang.base.mapper.MPJJoinMapper;
import org.springframework.stereotype.Repository;

/**
 * @author T14
 */
@Repository
public interface CompanyJoinMapper extends MPJJoinMapper<Company> {
}

 server/service/src/main/java/com/doumee/dao/business/model/Company.java

@@ -1,6 +1,7 @@
package com.doumee.dao.business.model;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -21,19 +22,19 @@
public class Company {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
    @ApiModelProperty(value = "主键")
    private Integer id;

    @ApiModelProperty(value = "是否已删除 0未删除 1已删除", example = "1")
    @ApiModelProperty(value = "是否已删除 0未删除 1已删除")
    private Byte deleted;

    @ApiModelProperty(value = "创建人编码", example = "1")
    @ApiModelProperty(value = "创建人编码")
    private Integer createUser;

    @ApiModelProperty(value = "创建时间")
    private Date createTime;

    @ApiModelProperty(value = "更新人编码", example = "1")
    @ApiModelProperty(value = "更新人编码")
    private Integer updateUser;

    @ApiModelProperty(value = "更新时间")
@@ -48,8 +49,12 @@
    @ApiModelProperty(value = "备注")
    private String remark;

    @ApiModelProperty(value = "管理员账号（关联system_user表)", example = "1")
    @ApiModelProperty(value = "管理员账号（关联system_user表)")
    private Integer managerId;

    @ApiModelProperty(value = "管理员账号")
    @TableField(exist = false)
    private String managerUserName;

    @ApiModelProperty(value = "联系人")
    private String linkname;
@@ -60,17 +65,48 @@
    @ApiModelProperty(value = "统一社会信用代码，不可重复")
    private String creditCode;

    @ApiModelProperty(value = "主播数量限制", example = "1")
    @ApiModelProperty(value = "主播数量限制")
    private Integer userNum;

    @ApiModelProperty(value = "系统使用有效期")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date oepnValidDate;

    @ApiModelProperty(value = "账户开通类型 0试用账户 1正式账户", example = "1")
    @ApiModelProperty(value = "账户开通类型 0试用账户 1正式账户")
    private Integer oepnType;

    @ApiModelProperty(value = "销售人员编码（关联system_user表)", example = "1")
    @ApiModelProperty(value = "销售人员编码（关联system_user表)")
    private Integer salesmanId;

    @ApiModelProperty(value = "状态 0启用 1禁用")
    private Byte status;

    @ApiModelProperty(value = "销售人员姓名")
    @TableField(exist = false)
    private String salesmanRealName;


    @ApiModelProperty(value = "主播人员数量")
    @TableField(exist = false)
    private Integer anchorUserNum;


    @ApiModelProperty(value = "员工人员数量")
    @TableField(exist = false)
    private Integer empUserNum;

    @ApiModelProperty(value = "商品数量")
    @TableField(exist = false)
    private Integer goodsNum;


    @ApiModelProperty(value = "系统使用有效期起始")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @TableField(exist = false)
    private Date oepnValidDateStart;

    @ApiModelProperty(value = "系统使用有效期终止")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @TableField(exist = false)
    private Date oepnValidDateEnd;
}

 server/service/src/main/java/com/doumee/dao/business/model/dto/CompanyCreatOrUpdateRequest.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,61 @@
package com.doumee.dao.business.model.dto;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.Size;
import java.util.Date;

/**
 * @author T14
 */
@Data
@ApiModel("创建或者修改公司")
public class CompanyCreatOrUpdateRequest {

    @ApiModelProperty(value = "主键", example = "1")
    private Integer id;

    @ApiModelProperty(value = "名称")
    @NotBlank(message = "客户名称企业全称不允许为空")
    @Size(max = 30,message = "客户名称企业全称不允许超过30字")
    private String name;

    @ApiModelProperty(value = "企业简称")
    private String shortName;

    @ApiModelProperty(value = "备注")
    private String remark;

    @ApiModelProperty(value = "管理员账号（关联system_user表)", example = "1")
    private Integer managerId;

    @ApiModelProperty(value = "联系人")
    private String linkname;

    @ApiModelProperty(value = "联系人电话")
    private String linkephone;

    @ApiModelProperty(value = "统一社会信用代码，不可重复")
    private String creditCode;

    @ApiModelProperty(value = "主播数量限制", example = "1")
    private Integer userNum;

    @ApiModelProperty(value = "系统使用有效期")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date oepnValidDate;

    @ApiModelProperty(value = "账户开通类型 0试用账户 1正式账户", example = "1")
    private Integer oepnType;

    @ApiModelProperty(value = "销售人员编码（关联system_user表)", example = "1")
    private Integer salesmanId;
}

 server/service/src/main/java/com/doumee/service/business/CompanyService.java

@@ -4,6 +4,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.dto.CompanyCreatOrUpdateRequest;

import java.util.List;

@@ -20,7 +21,7 @@
     * @param company å®žä½“对象
     * @return Integer
     */
    Integer create(Company company);
    Integer create(CompanyCreatOrUpdateRequest company);

    /**
     * ä¸»é”®åˆ é™¤
@@ -42,6 +43,15 @@
     * @param ids ä¸»é”®é›†
     */
    void deleteByIdInBatch(List<Integer> ids);



    /**
     * ä¸»é”®æ›´æ–°
     *
     * @param company å®žä½“对象
     */
    void updateById(CompanyCreatOrUpdateRequest company);

    /**
     * ä¸»é”®æ›´æ–°
@@ -89,6 +99,15 @@
     */
    PageData<Company> findPage(PageWrap<Company> pageWrap);


    /**
     * åˆ†é¡µæŸ¥è¯¢
     *
     * @param pageWrap åˆ†é¡µå¯¹è±¡
     * @return PageData<Company>
     */
    PageData<Company> findPlatformPage(PageWrap<Company> pageWrap);

    /**
     * æ¡ä»¶ç»Ÿè®¡
     *

 server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java

@@ -5,17 +5,29 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.CompanyMapper;
import com.doumee.dao.business.join.CompanyJoinMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.dto.CompanyCreatOrUpdateRequest;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.CompanyService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.Date;
import java.util.List;
import java.util.Objects;

/**
 * ç³»ç»Ÿ-企业信息表Service实现
@@ -28,9 +40,41 @@
    @Autowired
    private CompanyMapper companyMapper;

    @Autowired
    private CompanyJoinMapper companyJoinMapper;

    @Override
    public Integer create(Company company) {
        companyMapper.insert(company);
    public Integer create(CompanyCreatOrUpdateRequest company) {
        LoginUserInfo userInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        Company insert = new Company();

        if (Objects.isNull(company.getManagerId())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"登录账号不允许为空");
        }
        if (Objects.isNull(company.getOepnValidDate())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"有效期不允许为空");
        }
        if (Objects.isNull(company.getUserNum())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"主播账号数量不允许为空");
        }

        insert.setDeleted((byte)Constants.ZERO);
        insert.setCreateUser(userInfo.getId());
        insert.setCreateTime(new Date());
        insert.setUpdateUser(userInfo.getId());
        insert.setUpdateTime(new Date());
        insert.setName(company.getName());
        insert.setShortName(company.getShortName());
        insert.setRemark(company.getRemark());
        insert.setManagerId(company.getManagerId());
        insert.setLinkname(company.getLinkname());
        insert.setLinkephone(company.getLinkephone());
        insert.setCreditCode(company.getCreditCode());
        insert.setUserNum(company.getUserNum());
        insert.setOepnValidDate(company.getOepnValidDate());
        insert.setOepnType(company.getOepnType());
        insert.setSalesmanId(company.getSalesmanId());
        companyMapper.insert(insert);
        return company.getId();
    }

@@ -51,6 +95,19 @@
            return;
        }
        companyMapper.deleteBatchIds(ids);
    }

    @Override
    public void updateById(CompanyCreatOrUpdateRequest company) {
        UpdateWrapper<Company> wrapper = new UpdateWrapper<>();
        wrapper.lambda().eq(Company::getId,company.getId())
                        .set(Company::getName,company.getName())
                        .set(Company::getShortName,company.getShortName())
                        .set(Company::getCreditCode,company.getCreditCode())
                        .set(Company::getSalesmanId,company.getSalesmanId())
                        .set(Company::getLinkname,company.getLinkname())
                        .set(Company::getLinkephone,company.getLinkephone());
        companyMapper.update(null,wrapper);
    }

    @Override
@@ -122,6 +179,28 @@
        return PageData.from(companyMapper.selectPage(page, queryWrapper));
    }


    @Override
    public PageData<Company> findPlatformPage(PageWrap<Company> pageWrap) {
        IPage<Company> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<Company> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Company::getManagerId);
        queryWrapper.selectAll(Company.class)
                    .selectAs(SystemUser::getUsername,Company::getManagerUserName);
        queryWrapper.select(
                "(select su1.USERNAME from system_user su1 where  su1.id = company.MANAGER_ID) as managerUserName," +
                "(select su2.REALNAME from system_user su2 where  su2.id = company.SALESMAN_ID) as salesmanRealName," +
                "(select count(su3.id) from system_user su3 where  su3.COMPANY_ID = company.ID and su3.TYPE = 2) as anchorUserNum," +
                "(select count(su4.id) from system_user su4 where  su4.COMPANY_ID = company.ID and su3.TYPE = 1) as empUserNum," +
                "(select count(goods.id) from goods   where  g.COMPANY_ID = company.ID )goodsNum");
        queryWrapper.eq(Company::getName,pageWrap.getModel().getName())
                    .like(SystemUser::getUsername,pageWrap.getModel().getManagerUserName())
                    .eq(Company::getStatus,pageWrap.getModel().getStatus())
                    .between(Company::getOepnValidDate,pageWrap.getModel().getOepnValidDateStart(),pageWrap.getModel().getOepnValidDateEnd());
        return PageData.from(companyMapper.selectPage(page, queryWrapper));
    }

    @Override
    public long count(Company company) {
        QueryWrapper<Company> wrapper = new QueryWrapper<>(company);