楚江ERP-产品品种相关接口开发

 alter table base_data_customer modify column mnemonic_code varchar(20) null;
 
+-- 厂房信息
 create table if not exists base_data_workshop (
     id varchar(32) primary key comment 'ID',
     code varchar(20) not null comment '厂房编号',
@@ -7,26 +8,28 @@ create table if not exists base_data_workshop (
     type varchar(20) not null comment '厂房类型',
     description varchar(100) comment '描述',
     create_by_id varchar(32) not null comment '创建人ID',
-    create_by varchar(32) not null comment '创建人',
+    create_by varchar(20) not null comment '创建人',
     update_by_id varchar(32) not null comment '更新人ID',
-    update_by varchar(32) not null comment '更新人',
+    update_by varchar(20) not null comment '更新人',
     create_time datetime default now() comment '创建时间',
     update_time datetime default now() comment '更新时间'
 );
 
+-- 办事处/科办
 create table if not exists base_data_office (
     id varchar(32) primary key comment 'ID',
     code varchar(20) not null comment '编号',
     name varchar(50) not null comment '名称',
     description varchar(100) comment '描述',
     create_by_id varchar(32) not null comment '创建人ID',
-    create_by varchar(32) not null comment '创建人',
+    create_by varchar(20) not null comment '创建人',
     update_by_id varchar(32) not null comment '更新人ID',
-    update_by varchar(32) not null comment '更新人',
+    update_by varchar(20) not null comment '更新人',
     create_time datetime default now() comment '创建时间',
     update_time datetime default now() comment '更新时间'
 );
 
+-- 类型数据
 create table if not exists base_data_type (
     id varchar(32) primary key comment 'ID',
     code varchar(20) not null comment '编号',
@@ -34,9 +37,23 @@ create table if not exists base_data_type (
     description varchar(100) comment '描述',
     type varchar(20) not null comment '类型：客户（CUSTOMER）',
     create_by_id varchar(32) not null comment '创建人ID',
-    create_by varchar(32) not null comment '创建人',
+    create_by varchar(20) not null comment '创建人',
     update_by_id varchar(32) not null comment '更新人ID',
-    update_by varchar(32) not null comment '更新人',
+    update_by varchar(20) not null comment '更新人',
+    create_time datetime default now() comment '创建时间',
+    update_time datetime default now() comment '更新时间'
+);
+
+-- 产品品种
+create table if not exists base_data_product_variety (
+    id varchar(32) primary key comment 'ID',
+    code varchar(20) not null comment '编号',
+    name varchar(50) not null comment '名称',
+    description varchar(100) comment '描述',
+    create_by_id varchar(32) not null comment '创建人ID',
+    create_by varchar(20) not null comment '创建人',
+    update_by_id varchar(32) not null comment '更新人ID',
+    update_by varchar(20) not null comment '更新人',
     create_time datetime default now() comment '创建时间',
     update_time datetime default now() comment '更新时间'
 );
\ No newline at end of file

+package com.lframework.xingyun.basedata.bo.product.variety;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lframework.xingyun.basedata.entity.ProductVariety;
+import com.lframework.starter.common.constants.StringPool;
+import com.lframework.starter.web.core.bo.BaseBo;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModelProperty;
+
+import lombok.Data;
+
+/**
+ * <p>
+ * 产品品种 GetBo
+ * </p>
+ *
+ */
+@Data
+public class GetProductVarietyBo extends BaseBo<ProductVariety> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+    /**
+     * 品种编号
+     */
+    @ApiModelProperty("品种编号")
+    private String code;
+
+    /**
+     * 品种名称
+     */
+    @ApiModelProperty("品种名称")
+    private String name;
+
+    /**
+     * 描述
+     */
+    @ApiModelProperty("描述")
+    private String description;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    /**
+     * 更新人
+     */
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN)
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN)
+    private LocalDateTime updateTime;
+
+    public GetProductVarietyBo() {
+
+    }
+
+    public GetProductVarietyBo(ProductVariety dto) {
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<ProductVariety> convert(ProductVariety dto) {
+        return super.convert(dto);
+    }
+}

+package com.lframework.xingyun.basedata.controller;
+
+import com.lframework.starter.web.core.annotations.security.HasPermission;
+import com.lframework.starter.web.core.controller.DefaultBaseController;
+import com.lframework.xingyun.basedata.bo.product.variety.GetProductVarietyBo;
+import com.lframework.xingyun.basedata.vo.product.variety.QueryProductVarietyVo;
+import com.lframework.xingyun.basedata.service.product.ProductVarietyService;
+import com.lframework.xingyun.basedata.vo.product.variety.CreateProductVarietyVo;
+import com.lframework.xingyun.basedata.vo.product.variety.UpdateProductVarietyVo;
+import com.lframework.xingyun.basedata.entity.ProductVariety;
+import com.lframework.starter.web.core.utils.PageResultUtil;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.components.resp.InvokeResult;
+
+import javax.annotation.Resource;
+import javax.validation.constraints.NotBlank;
+import io.swagger.annotations.ApiImplicitParam;
+import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import io.swagger.annotations.ApiOperation;
+import com.lframework.starter.common.utils.CollectionUtil;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 产品品种 Controller
+ *
+ */
+@Api(tags = "产品品种")
+@Validated
+@RestController
+@RequestMapping("/baseData/product/variety")
+public class ProductVarietyController extends DefaultBaseController {
+
+    
+    @Resource
+    private ProductVarietyService productVarietyService;
+
+    
+    /**
+     * 查询列表
+     */
+    @ApiOperation("查询列表")
+    @HasPermission({"base-data:variety:query"})
+    @GetMapping("/query")
+    public InvokeResult<PageResult<GetProductVarietyBo>> query(@Valid QueryProductVarietyVo vo) {
+        PageResult<ProductVariety> pageResult = productVarietyService.query(getPageIndex(vo), getPageSize(vo), vo);
+        List<ProductVariety> dataList = pageResult.getDatas();
+        List<GetProductVarietyBo> results = null;
+        if (!CollectionUtil.isEmpty(dataList)) {
+            results = dataList.stream().map(GetProductVarietyBo::new).collect(Collectors.toList());
+        }
+        return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
+    }
+
+    /**
+     * 根据ID查询
+     */
+    @ApiOperation("根据ID查询")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @HasPermission({"base-data:variety:query"})
+    @GetMapping
+    public InvokeResult<GetProductVarietyBo> get(@NotBlank(message = "id不能为空！") String id) {
+        ProductVariety data = productVarietyService.findById(id);
+        if (data == null) {
+            throw new DefaultClientException("产品品种不存在！");
+        }
+        GetProductVarietyBo result = new GetProductVarietyBo(data);
+
+        return InvokeResultBuilder.success(result);
+    }
+
+    /**
+     * 新增
+     */
+    @ApiOperation("新增")
+    @HasPermission({"base-data:variety:add"})
+    @PostMapping
+    public InvokeResult<Void> create(@Valid CreateProductVarietyVo vo) {
+        productVarietyService.create(vo);
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 修改
+     */
+    @ApiOperation("修改")
+    @HasPermission({"base-data:variety:modify"})
+    @PutMapping
+    public InvokeResult<Void> update(@Valid UpdateProductVarietyVo vo) {
+        productVarietyService.update(vo);
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 根据ID删除
+     */
+    @ApiOperation("根据ID删除")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @HasPermission({"base-data:variety:delete"})
+    @DeleteMapping
+    public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
+        productVarietyService.deleteById(id);
+        return InvokeResultBuilder.success();
+    }
+}

+package com.lframework.xingyun.basedata.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.lframework.starter.web.core.dto.BaseDto;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.lframework.starter.web.core.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+/**
+ * <p>
+ * 产品品种
+ * </p>
+ *
+ */
+@Data
+@TableName("base_data_product_variety")
+public class ProductVariety extends BaseEntity implements BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String CACHE_NAME = "ProductVariety";
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 品种编号
+     */
+    private String code;
+
+    /**
+     * 品种名称
+     */
+    private String name;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 创建人ID
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createById;
+
+    /**
+     * 创建人
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 更新人ID
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateById;
+
+    /**
+     * 更新人
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+
+}

+package com.lframework.xingyun.basedata.impl.product;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageInfo;
+import com.lframework.xingyun.basedata.entity.ProductVariety;
+import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
+import com.lframework.starter.web.core.utils.PageResultUtil;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.utils.OpLogUtil;
+import com.lframework.starter.common.utils.StringUtil;
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import com.lframework.starter.web.core.utils.IdUtil;
+import com.lframework.starter.common.utils.ObjectUtil;
+import com.lframework.starter.web.core.annotations.oplog.OpLog;
+import com.lframework.starter.web.core.utils.PageHelperUtil;
+import com.lframework.starter.common.utils.Assert;
+import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import org.springframework.transaction.annotation.Transactional;
+import com.lframework.xingyun.basedata.mappers.ProductVarietyMapper;
+import com.lframework.xingyun.basedata.service.product.ProductVarietyService;
+import com.lframework.xingyun.basedata.vo.product.variety.CreateProductVarietyVo;
+import com.lframework.xingyun.basedata.vo.product.variety.QueryProductVarietyVo;
+import com.lframework.xingyun.basedata.vo.product.variety.UpdateProductVarietyVo;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class ProductVarietyServiceImpl extends BaseMpServiceImpl<ProductVarietyMapper, ProductVariety> implements ProductVarietyService {
+
+    @Override
+    public PageResult<ProductVariety> query(Integer pageIndex, Integer pageSize, QueryProductVarietyVo vo) {
+        Assert.greaterThanZero(pageIndex);
+        Assert.greaterThanZero(pageSize);
+
+        PageHelperUtil.startPage(pageIndex, pageSize);
+        List<ProductVariety> dataList = this.query(vo);
+
+        return PageResultUtil.convert(new PageInfo<>(dataList));
+    }
+
+    @Override
+    public List<ProductVariety> query(QueryProductVarietyVo vo) {
+        return getBaseMapper().query(vo);
+    }
+
+    @Override
+    public ProductVariety findById(String id) {
+        return getBaseMapper().selectById(id);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "新增产品品种，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public String create(CreateProductVarietyVo vo) {
+        ProductVariety data = new ProductVariety();
+        data.setId(IdUtil.getId());
+        data.setCode(vo.getCode());
+        data.setName(vo.getName());
+        if (!StringUtil.isBlank(vo.getDescription())) {
+            data.setDescription(vo.getDescription());
+        }
+        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(UpdateProductVarietyVo vo) {
+        ProductVariety data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("产品品种不存在！");
+        }
+        LambdaUpdateWrapper<ProductVariety> updateWrapper = Wrappers.lambdaUpdate(ProductVariety.class)
+                .set(ProductVariety::getCode, data.getCode())
+                .set(ProductVariety::getName, vo.getName())
+                .set(ProductVariety::getDescription, StringUtil.isBlank(vo.getDescription()) ? null : vo.getDescription())
+                .eq(ProductVariety::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);
+    }
+}

@@ -86,6 +86,7 @@ public class WorkshopServiceImpl extends BaseMpServiceImpl<WorkshopMapper, Works
         data.setId(IdUtil.getId());
         data.setCode(vo.getCode());
         data.setName(vo.getName());
+        data.setDescription(vo.getDescription());
         data.setType(EnumUtil.getByCode(WorkshopType.class, vo.getType()));
 
         getBaseMapper().insert(data);

+package com.lframework.xingyun.basedata.mappers;
+
+import com.lframework.xingyun.basedata.entity.ProductVariety;
+import com.lframework.starter.web.core.mapper.BaseMapper;
+import com.lframework.xingyun.basedata.vo.product.variety.QueryProductVarietyVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 产品品种 Mapper 接口
+ * </p>
+ *
+ */
+public interface ProductVarietyMapper extends BaseMapper<ProductVariety> {
+
+    /**
+     * 查询列表
+     * @param vo
+     * @return
+     */
+    List<ProductVariety> query(@Param("vo") QueryProductVarietyVo vo);
+}

+package com.lframework.xingyun.basedata.service.product;
+
+import com.lframework.xingyun.basedata.vo.product.variety.CreateProductVarietyVo;
+import com.lframework.xingyun.basedata.vo.product.variety.QueryProductVarietyVo;
+import com.lframework.xingyun.basedata.vo.product.variety.UpdateProductVarietyVo;
+import com.lframework.xingyun.basedata.entity.ProductVariety;
+import com.lframework.starter.web.core.service.BaseMpService;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import java.util.List;
+
+/**
+ * 产品品种 Service
+ */
+public interface ProductVarietyService extends BaseMpService<ProductVariety> {
+
+  /**
+   * 分页查询
+   *
+   * @return  PageResult<ProductVariety>
+   */
+  PageResult<ProductVariety> query(Integer pageIndex, Integer pageSize, QueryProductVarietyVo vo);
+
+  /**
+   * 查询列表
+   *
+   * @param vo  查询条件
+   * @return  List<ProductVariety>
+   */
+  List<ProductVariety> query(QueryProductVarietyVo vo);
+
+  /**
+   * 根据ID查询
+   *
+   * @param id  主键ID
+   * @return  ProductVariety
+   */
+  ProductVariety findById(String id);
+
+  /**
+   * 新增
+   *
+   * @param vo  数据实体
+   * @return  String
+   */
+  String create(CreateProductVarietyVo vo);
+
+  /**
+   * 修改
+   *
+   * @param vo  数据实体
+   */
+  void update(UpdateProductVarietyVo vo);
+
+  /**
+   * 根据ID删除
+   *
+   * @param id  主键ID
+   */
+  void deleteById(String id);
+}

+package com.lframework.xingyun.basedata.vo.product.variety;
+
+import javax.validation.constraints.NotBlank;
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModelProperty;
+import org.hibernate.validator.constraints.Length;
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class CreateProductVarietyVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 品种编号
+     */
+    @ApiModelProperty(value = "品种编号", required = true)
+    @NotBlank(message = "请输入品种编号！")
+    @Length(message = "品种编号最多允许20个字符！")
+    private String code;
+
+    /**
+     * 品种名称
+     */
+    @ApiModelProperty(value = "品种名称", required = true)
+    @NotBlank(message = "请输入品种名称！")
+    @Length(message = "品种名称最多允许50个字符！")
+    private String name;
+
+    /**
+     * 描述
+     */
+    @ApiModelProperty("描述")
+    @Length(message = "描述最多允许100个字符！")
+    private String description;
+
+}

+package com.lframework.xingyun.basedata.vo.product.variety;
+
+import lombok.Data;
+import com.lframework.starter.web.core.vo.PageVo;
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+@Data
+public class QueryProductVarietyVo extends PageVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 品种编号
+     */
+    @ApiModelProperty("品种编号")
+    private String code;
+
+    /**
+     * 品种名称
+     */
+    @ApiModelProperty("品种名称")
+    private String name;
+
+}

+package com.lframework.xingyun.basedata.vo.product.variety;
+
+import lombok.Data;
+import javax.validation.constraints.NotBlank;
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModelProperty;
+import org.hibernate.validator.constraints.Length;
+import java.io.Serializable;
+
+@Data
+public class UpdateProductVarietyVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ApiModelProperty(value = "ID", required = true)
+    @NotBlank(message = "id不能为空！")
+    private String id;
+
+    /**
+     * 品种名称
+     */
+    @ApiModelProperty(value = "品种名称", required = true)
+    @NotBlank(message = "请输入品种名称！")
+    @Length(message = "品种名称最多允许50个字符！")
+    private String name;
+
+    /**
+     * 描述
+     */
+    @ApiModelProperty("描述")
+    @Length(message = "描述最多允许100个字符！")
+    private String description;
+
+}

+<?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.ProductVarietyMapper">
+
+    <resultMap id="ProductVariety" type="com.lframework.xingyun.basedata.entity.ProductVariety">
+        <id column="id" property="id"/>
+        <result column="code" property="code"/>
+        <result column="name" property="name"/>
+        <result column="description" property="description"/>
+        <result column="create_by_id" property="createById"/>
+        <result column="create_by" property="createBy"/>
+        <result column="update_by_id" property="updateById"/>
+        <result column="update_by" property="updateBy"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+    <sql id="ProductVariety_sql">
+        SELECT
+            tb.id,
+            tb.code,
+            tb.name,
+            tb.description,
+            tb.create_by_id,
+            tb.create_by,
+            tb.update_by_id,
+            tb.update_by,
+            tb.create_time,
+            tb.update_time
+        FROM base_data_product_variety AS tb
+    </sql>
+
+    <select id="query" resultMap="ProductVariety">
+        <include refid="ProductVariety_sql"/>
+        <where>
+            <if test="vo.code != null and vo.code != ''">
+                AND tb.code LIKE CONCAT('%', #{vo.code}, '%')
+            </if>
+            <if test="vo.name != null and vo.name != ''">
+                AND tb.name LIKE CONCAT('%', #{vo.name}, '%')
+            </if>
+        </where>
+    </select>
+</mapper>