采购-计划：公司简称基础表单

@@ -1857,3 +1857,15 @@ CREATE TABLE `procurement_supplier_quotation_deal`
     KEY `idx_psqd_principal_id` (`principal_id`),
     KEY `idx_psqd_create_time` (`create_time`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='供应商报价成交表';
+
+create table if not exists base_data_company_short
+(
+    id varchar(32) primary key comment 'ID',
+    company_name varchar(200) not null comment '公司名称',
+    short_name varchar(100) not null comment '公司简称',
+    create_by_id varchar(32) not null comment '创建人ID',
+    update_by_id varchar(32) not null comment '更新人ID',
+    create_time datetime default now() comment '创建时间',
+    update_time datetime default now() comment '更新时间',
+    unique key uk_bd_company_short_company_name (company_name)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='公司简称';

+package com.lframework.xingyun.basedata.bo.company;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lframework.starter.common.constants.StringPool;
+import com.lframework.starter.web.core.bo.BaseBo;
+import com.lframework.xingyun.basedata.entity.CompanyShort;
+import io.swagger.annotations.ApiModelProperty;
+import java.time.LocalDateTime;
+import lombok.Data;
+
+@Data
+public class GetCompanyShortBo extends BaseBo<CompanyShort> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+    /**
+     * 公司名称
+     */
+    @ApiModelProperty("公司名称")
+    private String companyName;
+
+    /**
+     * 公司简称
+     */
+    @ApiModelProperty("公司简称")
+    private String shortName;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN)
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN)
+    private LocalDateTime updateTime;
+
+    public GetCompanyShortBo() {
+    }
+
+    public GetCompanyShortBo(CompanyShort dto) {
+        super(dto);
+    }
+
+    @Override
+    protected void afterInit(CompanyShort dto) {
+    }
+}
+

+package com.lframework.xingyun.basedata.bo.company;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lframework.starter.common.constants.StringPool;
+import com.lframework.starter.web.core.bo.BaseBo;
+import com.lframework.xingyun.basedata.entity.CompanyShort;
+import io.swagger.annotations.ApiModelProperty;
+import java.time.LocalDateTime;
+import lombok.Data;
+
+@Data
+public class QueryCompanyShortBo extends BaseBo<CompanyShort> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+    /**
+     * 公司名称
+     */
+    @ApiModelProperty("公司名称")
+    private String companyName;
+
+    /**
+     * 公司简称
+     */
+    @ApiModelProperty("公司简称")
+    private String shortName;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN)
+    private LocalDateTime createTime;
+
+    public QueryCompanyShortBo() {
+    }
+
+    public QueryCompanyShortBo(CompanyShort dto) {
+        super(dto);
+    }
+
+    @Override
+    protected void afterInit(CompanyShort dto) {
+    }
+}
+

+package com.lframework.xingyun.basedata.controller;
+
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import com.lframework.starter.common.utils.CollectionUtil;
+import com.lframework.starter.web.core.annotations.security.HasPermission;
+import com.lframework.starter.web.core.components.resp.InvokeResult;
+import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.controller.DefaultBaseController;
+import com.lframework.starter.web.core.utils.PageResultUtil;
+import com.lframework.xingyun.basedata.bo.company.GetCompanyShortBo;
+import com.lframework.xingyun.basedata.bo.company.QueryCompanyShortBo;
+import com.lframework.xingyun.basedata.entity.CompanyShort;
+import com.lframework.xingyun.basedata.service.company.CompanyShortService;
+import com.lframework.xingyun.basedata.vo.company.CreateCompanyShortVo;
+import com.lframework.xingyun.basedata.vo.company.QueryCompanyShortVo;
+import com.lframework.xingyun.basedata.vo.company.UpdateCompanyShortVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@Api(tags = "公司简称")
+@Validated
+@RestController
+@RequestMapping("/basedata/company/short")
+public class CompanyShortController extends DefaultBaseController {
+
+  @Resource
+  private CompanyShortService companyShortService;
+
+  @ApiOperation("公司简称列表")
+  @HasPermission({"base-data:company-short:query"})
+  @GetMapping("/query")
+  public InvokeResult<PageResult<QueryCompanyShortBo>> query(@Valid QueryCompanyShortVo vo) {
+
+    PageResult<CompanyShort> pageResult = companyShortService.query(getPageIndex(vo),
+        getPageSize(vo), vo);
+
+    List<CompanyShort> datas = pageResult.getDatas();
+    List<QueryCompanyShortBo> results = null;
+
+    if (!CollectionUtil.isEmpty(datas)) {
+      results = datas.stream().map(QueryCompanyShortBo::new).collect(Collectors.toList());
+    }
+
+    return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
+  }
+
+  @ApiOperation("查询公司简称")
+  @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true)
+  @HasPermission({"base-data:company-short:query"})
+  @GetMapping
+  public InvokeResult<GetCompanyShortBo> get(@NotBlank(message = "ID不能为空！") String id) {
+
+    CompanyShort data = companyShortService.findById(id);
+    if (data == null) {
+      throw new DefaultClientException("公司简称不存在！");
+    }
+
+    return InvokeResultBuilder.success(new GetCompanyShortBo(data));
+  }
+
+  @ApiOperation("新增公司简称")
+  @HasPermission({"base-data:company-short:add"})
+  @PostMapping
+  public InvokeResult<Void> create(@Valid @RequestBody CreateCompanyShortVo vo) {
+
+    companyShortService.create(vo);
+    return InvokeResultBuilder.success();
+  }
+
+  @ApiOperation("修改公司简称")
+  @HasPermission({"base-data:company-short:modify"})
+  @PutMapping
+  public InvokeResult<Void> update(@Valid @RequestBody UpdateCompanyShortVo vo) {
+
+    companyShortService.update(vo);
+    return InvokeResultBuilder.success();
+  }
+
+  @ApiOperation("删除公司简称")
+  @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true)
+  @HasPermission({"base-data:company-short:delete"})
+  @DeleteMapping
+  public InvokeResult<Void> deleteById(@NotBlank(message = "ID不能为空！") String id) {
+
+    companyShortService.deleteById(id);
+    return InvokeResultBuilder.success();
+  }
+}
+

+package com.lframework.xingyun.basedata.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.lframework.starter.web.core.dto.BaseDto;
+import com.lframework.starter.web.core.entity.BaseEntity;
+import java.time.LocalDateTime;
+import lombok.Data;
+
+/**
+ * <p>
+ * 公司简称
+ * </p>
+ *
+ */
+@Data
+@TableName("base_data_company_short")
+public class CompanyShort extends BaseEntity implements BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String CACHE_NAME = "CompanyShort";
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 公司名称
+     */
+    private String companyName;
+
+    /**
+     * 公司简称
+     */
+    private String shortName;
+
+    /**
+     * 创建人ID
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createById;
+
+    /**
+     * 更新人ID
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateById;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+}
+

+package com.lframework.xingyun.basedata.impl.company;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageInfo;
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import com.lframework.starter.common.utils.Assert;
+import com.lframework.starter.common.utils.ObjectUtil;
+import com.lframework.starter.common.utils.StringUtil;
+import com.lframework.starter.web.core.annotations.oplog.OpLog;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
+import com.lframework.starter.web.core.utils.IdUtil;
+import com.lframework.starter.web.core.utils.OpLogUtil;
+import com.lframework.starter.web.core.utils.PageHelperUtil;
+import com.lframework.starter.web.core.utils.PageResultUtil;
+import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.xingyun.basedata.entity.CompanyShort;
+import com.lframework.xingyun.basedata.mappers.CompanyShortMapper;
+import com.lframework.xingyun.basedata.service.company.CompanyShortService;
+import com.lframework.xingyun.basedata.vo.company.CreateCompanyShortVo;
+import com.lframework.xingyun.basedata.vo.company.QueryCompanyShortVo;
+import com.lframework.xingyun.basedata.vo.company.UpdateCompanyShortVo;
+import java.util.List;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+public class CompanyShortServiceImpl extends BaseMpServiceImpl<CompanyShortMapper, CompanyShort>
+    implements CompanyShortService {
+
+  @Override
+  public PageResult<CompanyShort> query(Integer pageIndex, Integer pageSize, QueryCompanyShortVo vo) {
+
+    Assert.greaterThanZero(pageIndex);
+    Assert.greaterThanZero(pageSize);
+
+    PageHelperUtil.startPage(pageIndex, pageSize);
+    List<CompanyShort> datas = this.query(vo);
+
+    return PageResultUtil.convert(new PageInfo<>(datas));
+  }
+
+  @Override
+  public List<CompanyShort> query(QueryCompanyShortVo vo) {
+
+    return getBaseMapper().query(vo);
+  }
+
+  @Override
+  public CompanyShort findById(String id) {
+
+    return getBaseMapper().selectById(id);
+  }
+
+  @OpLog(type = OtherOpLogType.class, name = "新增公司简称，ID：{}", params = {"#id"})
+  @Transactional(rollbackFor = Exception.class)
+  @Override
+  public String create(CreateCompanyShortVo vo) {
+
+    CompanyShort exist = getByCompanyName(vo.getCompanyName());
+    if (!ObjectUtil.isNull(exist)) {
+      throw new DefaultClientException("公司名称已存在简称，请勿重复添加！");
+    }
+
+    CompanyShort data = new CompanyShort();
+    data.setId(IdUtil.getId());
+    data.setCompanyName(vo.getCompanyName());
+    data.setShortName(vo.getShortName());
+
+    getBaseMapper().insert(data);
+
+    OpLogUtil.setVariable("id", data.getId());
+    OpLogUtil.setExtra(vo);
+
+    return data.getId();
+  }
+
+  @OpLog(type = OtherOpLogType.class, name = "修改公司简称，ID：{}", params = {"#id"})
+  @Transactional(rollbackFor = Exception.class)
+  @Override
+  public void update(UpdateCompanyShortVo vo) {
+
+    CompanyShort data = getBaseMapper().selectById(vo.getId());
+    if (ObjectUtil.isNull(data)) {
+      throw new DefaultClientException("公司简称不存在！");
+    }
+
+    CompanyShort exist = getByCompanyName(vo.getCompanyName());
+    if (!ObjectUtil.isNull(exist) && !vo.getId().equals(exist.getId())) {
+      throw new DefaultClientException("公司名称已存在简称，请勿重复添加！");
+    }
+
+    LambdaUpdateWrapper<CompanyShort> updateWrapper = Wrappers.lambdaUpdate(CompanyShort.class)
+        .set(CompanyShort::getCompanyName, vo.getCompanyName())
+        .set(CompanyShort::getShortName, vo.getShortName())
+        .eq(CompanyShort::getId, vo.getId());
+    getBaseMapper().update(updateWrapper);
+
+    OpLogUtil.setVariable("id", data.getId());
+    OpLogUtil.setExtra(vo);
+  }
+
+  @OpLog(type = OtherOpLogType.class, name = "删除公司简称，ID：{}", params = {"#id"})
+  @Transactional(rollbackFor = Exception.class)
+  @Override
+  public void deleteById(String id) {
+
+    getBaseMapper().deleteById(id);
+  }
+
+  private CompanyShort getByCompanyName(String companyName) {
+
+    if (StringUtil.isBlank(companyName)) {
+      return null;
+    }
+
+    LambdaQueryWrapper<CompanyShort> queryWrapper = Wrappers.lambdaQuery(CompanyShort.class)
+        .eq(CompanyShort::getCompanyName, companyName);
+
+    return getBaseMapper().selectOne(queryWrapper);
+  }
+}
+

+package com.lframework.xingyun.basedata.mappers;
+
+import com.lframework.starter.web.core.mapper.BaseMapper;
+import com.lframework.xingyun.basedata.entity.CompanyShort;
+import com.lframework.xingyun.basedata.vo.company.QueryCompanyShortVo;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface CompanyShortMapper extends BaseMapper<CompanyShort> {
+
+    List<CompanyShort> query(@Param("vo") QueryCompanyShortVo vo);
+}
+

+package com.lframework.xingyun.basedata.service.company;
+
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.service.BaseMpService;
+import com.lframework.xingyun.basedata.entity.CompanyShort;
+import com.lframework.xingyun.basedata.vo.company.CreateCompanyShortVo;
+import com.lframework.xingyun.basedata.vo.company.QueryCompanyShortVo;
+import com.lframework.xingyun.basedata.vo.company.UpdateCompanyShortVo;
+import java.util.List;
+
+public interface CompanyShortService extends BaseMpService<CompanyShort> {
+
+    PageResult<CompanyShort> query(Integer pageIndex, Integer pageSize, QueryCompanyShortVo vo);
+
+    List<CompanyShort> query(QueryCompanyShortVo vo);
+
+    CompanyShort findById(String id);
+
+    String create(CreateCompanyShortVo vo);
+
+    void update(UpdateCompanyShortVo vo);
+
+    void deleteById(String id);
+}
+

+package com.lframework.xingyun.basedata.vo.company;
+
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import javax.validation.constraints.NotBlank;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+@Data
+public class CreateCompanyShortVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "公司名称", required = true)
+    @NotBlank(message = "公司名称不能为空！")
+    @Length(max = 200, message = "公司名称最多允许200个字符！")
+    private String companyName;
+
+    @ApiModelProperty(value = "公司简称", required = true)
+    @NotBlank(message = "公司简称不能为空！")
+    @Length(max = 100, message = "公司简称最多允许100个字符！")
+    private String shortName;
+}
+

+package com.lframework.xingyun.basedata.vo.company;
+
+import com.lframework.starter.web.core.vo.BaseVo;
+import com.lframework.starter.web.core.vo.PageVo;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class QueryCompanyShortVo extends PageVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("公司名称")
+    private String companyName;
+
+    @ApiModelProperty("公司简称")
+    private String shortName;
+}
+

+package com.lframework.xingyun.basedata.vo.company;
+
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import javax.validation.constraints.NotBlank;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+@Data
+public class UpdateCompanyShortVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID", required = true)
+    @NotBlank(message = "ID不能为空！")
+    private String id;
+
+    @ApiModelProperty(value = "公司名称", required = true)
+    @NotBlank(message = "公司名称不能为空！")
+    @Length(max = 200, message = "公司名称最多允许200个字符！")
+    private String companyName;
+
+    @ApiModelProperty(value = "公司简称", required = true)
+    @NotBlank(message = "公司简称不能为空！")
+    @Length(max = 100, message = "公司简称最多允许100个字符！")
+    private String shortName;
+}
+

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lframework.xingyun.basedata.mappers.CompanyShortMapper">
+
+    <resultMap id="CompanyShort" type="com.lframework.xingyun.basedata.entity.CompanyShort">
+        <id column="id" property="id"/>
+        <result column="company_name" property="companyName"/>
+        <result column="short_name" property="shortName"/>
+        <result column="create_by_id" property="createById"/>
+        <result column="update_by_id" property="updateById"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+    <sql id="CompanyShortSql">
+        SELECT
+            tb.id,
+            tb.company_name,
+            tb.short_name,
+            tb.create_by_id,
+            tb.update_by_id,
+            tb.create_time,
+            tb.update_time
+        FROM base_data_company_short tb
+    </sql>
+
+    <select id="query" resultMap="CompanyShort">
+        <include refid="CompanyShortSql"/>
+        <where>
+            <if test="vo.companyName != null and vo.companyName != ''">
+                AND tb.company_name LIKE CONCAT('%', #{vo.companyName}, '%')
+            </if>
+            <if test="vo.shortName != null and vo.shortName != ''">
+                AND tb.short_name LIKE CONCAT('%', #{vo.shortName}, '%')
+            </if>
+        </where>
+        ORDER BY tb.create_time DESC, tb.id DESC
+    </select>
+</mapper>
+