采购：价格表基础表单

@@ -115,7 +115,7 @@ CREATE TABLE IF NOT EXISTS `customer_credit`
     `credit_limit`                    varchar(20)  DEFAULT NULL COMMENT '授信额度（万元）',
     `credit_limit`                    varchar(20)  DEFAULT NULL COMMENT '授信额度（万元）',
     `investigator`                    varchar(50)  DEFAULT NULL COMMENT '调查人',
     `investigator`                    varchar(50)  DEFAULT NULL COMMENT '调查人',
     `supervisor_review`               varchar(50)  DEFAULT NULL COMMENT '主管审核',
     `supervisor_review`               varchar(50)  DEFAULT NULL COMMENT '主管审核',
-    `annual_total_sales`              varchar(20)  DEFAULT NULL COMMENT '年度总销量（万元）',
+    `annual_total_sales`              varchar(100)  DEFAULT NULL COMMENT '年度总销量（万元）',
     `main_industry`                   varchar(100) DEFAULT NULL COMMENT '主要行业',
     `main_industry`                   varchar(100) DEFAULT NULL COMMENT '主要行业',
     `annual_material_overview`        text COMMENT '年度款料概况',
     `annual_material_overview`        text COMMENT '年度款料概况',
     `company_settlement_period`       varchar(100) DEFAULT NULL COMMENT '结算期限',
     `company_settlement_period`       varchar(100) DEFAULT NULL COMMENT '结算期限',
@@ -198,7 +198,7 @@ CREATE TABLE IF NOT EXISTS `customer_credit_history`
     `credit_limit`                 varchar(20)  DEFAULT NULL COMMENT '授信额度（万元）',
     `credit_limit`                 varchar(20)  DEFAULT NULL COMMENT '授信额度（万元）',
     `investigator`                 varchar(50)  DEFAULT NULL COMMENT '调查人',
     `investigator`                 varchar(50)  DEFAULT NULL COMMENT '调查人',
     `supervisor_review`            varchar(50)  DEFAULT NULL COMMENT '主管审核',
     `supervisor_review`            varchar(50)  DEFAULT NULL COMMENT '主管审核',
-    `annual_total_sales`           varchar(20)  DEFAULT NULL COMMENT '年度总销量（万元）',
+    `annual_total_sales`           varchar(100)  DEFAULT NULL COMMENT '年度总销量（万元）',
     `main_industry`                varchar(100) DEFAULT NULL COMMENT '主要行业',
     `main_industry`                varchar(100) DEFAULT NULL COMMENT '主要行业',
     `annual_material_overview`     text COMMENT '年度款料概况',
     `annual_material_overview`     text COMMENT '年度款料概况',
     `company_settlement_period`    varchar(100) DEFAULT NULL COMMENT '结算期限',
     `company_settlement_period`    varchar(100) DEFAULT NULL COMMENT '结算期限',
@@ -1610,3 +1610,36 @@ CREATE TABLE `base_data_breed_relationship`
     KEY                      `idx_bdbr_code` (`code`),
     KEY                      `idx_bdbr_code` (`code`),
     KEY                      `idx_bdbr_create_time` (`create_time`)
     KEY                      `idx_bdbr_create_time` (`create_time`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='品种关系表';
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='品种关系表';
+
+CREATE TABLE `base_data_price`
+(
+    `id`           varchar(32)  NOT NULL COMMENT 'ID',
+    `code`         varchar(200) NOT NULL COMMENT '编号',
+    `create_by_id` varchar(32) DEFAULT NULL COMMENT '创建人ID',
+    `create_by`    varchar(64) DEFAULT NULL COMMENT '创建人',
+    `update_by_id` varchar(32) DEFAULT NULL COMMENT '更新人ID',
+    `update_by`    varchar(64) DEFAULT NULL COMMENT '更新人',
+    `create_time`  datetime    DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_time`  datetime    DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `uk_bdp_code` (`code`),
+    KEY            `idx_bdp_create_time` (`create_time`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='价格表';
+
+CREATE TABLE `base_data_price_sub_table`
+(
+    `id`           varchar(32)     NOT NULL COMMENT 'ID',
+    `price_id`     varchar(32)     NOT NULL COMMENT '价格表id',
+    `product_id`   varchar(32)     NOT NULL COMMENT '品名id',
+    `price`        decimal(18, 10) NOT NULL COMMENT '价格',
+    `item_id`      varchar(32)     NOT NULL COMMENT '前端用ID',
+    `create_by_id` varchar(32) DEFAULT NULL COMMENT '创建人ID',
+    `create_by`    varchar(64) DEFAULT NULL COMMENT '创建人',
+    `update_by_id` varchar(32) DEFAULT NULL COMMENT '更新人ID',
+    `update_by`    varchar(64) DEFAULT NULL COMMENT '更新人',
+    `create_time`  datetime    DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_time`  datetime    DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    PRIMARY KEY (`id`),
+    KEY            `idx_bdpst_product_id` (`product_id`),
+    KEY            `idx_bdpst_create_time` (`create_time`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='价格表子表';

+package com.lframework.xingyun.basedata.bo.price;
+
+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.Price;
+import com.lframework.xingyun.basedata.entity.PriceSubTable;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 价格表 QueryBo
+ * </p>
+ *
+ */
+@Data
+public class QueryPriceBo extends BaseBo<Price> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+
+    /**
+     * 编号
+     */
+    @ApiModelProperty("编号")
+    private String code;
+
+    /**
+     * 价格表子表
+     */
+    @ApiModelProperty("价格表子表")
+    private List<PriceSubTable> priceSubTableList;
+
+    /**
+     * 创建人ID
+     */
+    @ApiModelProperty("创建人ID")
+    private String createById;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    /**
+     * 更新人ID
+     */
+    @ApiModelProperty("更新人ID")
+    private String updateById;
+
+    /**
+     * 更新人
+     */
+    @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 QueryPriceBo() {
+
+    }
+
+    public QueryPriceBo(Price dto) {
+
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<Price> convert(Price dto) {
+        return super.convert(dto);
+    }
+
+    @Override
+    protected void afterInit(Price dto) {
+
+    }
+}

+package com.lframework.xingyun.basedata.bo.price;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.math.BigDecimal;
+import com.lframework.starter.common.constants.StringPool;
+import java.time.LocalDateTime;
+import com.lframework.starter.web.core.bo.BaseBo;
+import com.lframework.xingyun.basedata.entity.PriceSubTable;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 价格表子表 QueryBo
+ * </p>
+ *
+ */
+@Data
+public class QueryPriceSubTableBo extends BaseBo<PriceSubTable> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+    /**
+     * 品名id
+     */
+    @ApiModelProperty("品名id")
+    private String productId;
+
+    /**
+     * 品名
+     */
+    @ApiModelProperty("品名")
+    private String productName;
+
+    /**
+     * 代号
+     */
+    @ApiModelProperty("代号")
+    private String code;
+
+    /**
+     * 类型
+     */
+    @ApiModelProperty("类型")
+    private String type;
+
+
+    /**
+     * 价格
+     */
+    @ApiModelProperty("价格")
+    private BigDecimal price;
+
+    /**
+     * 创建人ID
+     */
+    @ApiModelProperty("创建人ID")
+    private String createById;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    /**
+     * 更新人ID
+     */
+    @ApiModelProperty("更新人ID")
+    private String updateById;
+
+    /**
+     * 更新人
+     */
+    @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 QueryPriceSubTableBo() {
+
+    }
+
+    public QueryPriceSubTableBo(PriceSubTable dto) {
+
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<PriceSubTable> convert(PriceSubTable dto) {
+        return super.convert(dto);
+    }
+
+    @Override
+    protected void afterInit(PriceSubTable 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.price.QueryPriceBo;
+import com.lframework.xingyun.basedata.entity.Price;
+import com.lframework.xingyun.basedata.service.price.PriceService;
+import com.lframework.xingyun.basedata.vo.price.CreatePriceVo;
+import com.lframework.xingyun.basedata.vo.price.QueryPriceVo;
+import com.lframework.xingyun.basedata.vo.price.UpdatePriceVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 价格表 Controller
+ *
+ */
+@Api(tags = "价格表")
+@Validated
+@RestController
+@RequestMapping("/baseData/price")
+public class PriceController extends DefaultBaseController {
+
+    @Autowired
+    private PriceService priceService;
+
+    /**
+     * 查询列表
+     */
+    @ApiOperation("查询列表")
+    @HasPermission({"base-data:price-table:query"})
+    @GetMapping("/query")
+    public InvokeResult<PageResult<QueryPriceBo>> query(@Valid QueryPriceVo vo) {
+
+        PageResult<Price> pageResult = priceService.query(getPageIndex(vo), getPageSize(vo), vo);
+
+        List<Price> datas = pageResult.getDatas();
+        List<QueryPriceBo> results = null;
+
+        if (!CollectionUtil.isEmpty(datas)) {
+            results = datas.stream().map(QueryPriceBo::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:price-table:query"})
+    @GetMapping
+    public InvokeResult<QueryPriceBo> get(@NotBlank(message = "id不能为空！") String id) {
+
+        Price data = priceService.findById(id);
+        if (data == null) {
+            throw new DefaultClientException("价格表不存在！");
+        }
+
+        QueryPriceBo result = new QueryPriceBo(data);
+
+        return InvokeResultBuilder.success(result);
+    }
+
+    /**
+     * 新增
+     */
+    @ApiOperation("新增")
+    @HasPermission({"base-data:price-table:add"})
+    @PostMapping
+    public InvokeResult<Void> create(@RequestBody @Valid CreatePriceVo vo) {
+
+        priceService.create(vo);
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 修改
+     */
+    @ApiOperation("修改")
+    @HasPermission({"base-data:price-table:modify"})
+    @PutMapping
+    public InvokeResult<Void> update(@RequestBody @Valid UpdatePriceVo vo) {
+
+        priceService.update(vo);
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 根据ID删除
+     */
+    @ApiOperation("根据ID删除")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @HasPermission({"base-data:price-table:delete"})
+    @DeleteMapping
+    public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
+
+        priceService.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.entity.BaseEntity;
+import com.lframework.starter.web.core.dto.BaseDto;
+import java.time.LocalDateTime;
+import java.util.List;
+
+import com.lframework.xingyun.basedata.bo.price.QueryPriceSubTableBo;
+import com.lframework.xingyun.basedata.vo.price.UpdatePriceSubTableVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 价格表
+ */
+@Data
+@TableName("base_data_price")
+public class Price extends BaseEntity implements BaseDto {
+
+    public static final String CACHE_NAME = "Price";
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 编号
+     */
+    private String code;
+
+
+    /**
+     * 价格表子表
+     */
+    @TableField(exist = false)
+    private List<PriceSubTable> priceSubTableList;
+
+    /**
+     * 创建人ID 新增时赋值
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createById;
+
+    /**
+     * 创建人 新增时赋值
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 创建时间 新增时赋值
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 修改人 新增和修改时赋值
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /**
+     * 修改人ID 新增和修改时赋值
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateById;
+
+    /**
+     * 修改时间 新增和修改时赋值
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+}

+package com.lframework.xingyun.basedata.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.math.BigDecimal;
+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 io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 价格表子表
+ * </p>
+ *
+ */
+@Data
+@TableName("base_data_price_sub_table")
+public class PriceSubTable extends BaseEntity implements BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String CACHE_NAME = "PriceSubTable";
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 价格表id
+     */
+    private String priceId;
+
+    /**
+     * 品名id
+     */
+    private String productId;
+
+    /**
+     * 品名
+     * 非持久化字段
+     */
+    @TableField(exist = false)
+    private String productName;
+
+    /**
+     * 代号
+     * 非持久化字段
+     */
+    @TableField(exist = false)
+    private String code;
+
+    /**
+     * 类型
+     * 非持久化字段
+     */
+    @TableField(exist = false)
+    private String type;
+
+    /**
+     * 价格
+     */
+    private BigDecimal price;
+
+    /**
+     * 前端用ID
+     */
+    private String itemId;
+
+    /**
+     * 创建人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.price;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+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.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.Price;
+import com.lframework.xingyun.basedata.entity.PriceSubTable;
+import com.lframework.xingyun.basedata.mappers.PriceMapper;
+import com.lframework.xingyun.basedata.service.price.PriceService;
+import com.lframework.xingyun.basedata.service.price.PriceSubTableService;
+import com.lframework.xingyun.basedata.vo.price.*;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+public class PriceServiceImpl extends BaseMpServiceImpl<PriceMapper, Price> implements PriceService {
+
+    @Resource
+    private PriceSubTableService priceSubTableService;
+
+    @Override
+    public PageResult<Price> query(Integer pageIndex, Integer pageSize, QueryPriceVo vo) {
+
+        Assert.greaterThanZero(pageIndex);
+        Assert.greaterThanZero(pageSize);
+
+        PageHelperUtil.startPage(pageIndex, pageSize);
+        List<Price> datas = this.query(vo);
+
+        return PageResultUtil.convert(new PageInfo<>(datas));
+    }
+
+    @Override
+    public List<Price> query(QueryPriceVo vo) {
+
+        return getBaseMapper().query(vo);
+    }
+
+    @Override
+    public Price findById(String id) {
+        Price data = getBaseMapper().selectById(id);
+        QueryPriceSubTableVo vo = new QueryPriceSubTableVo();
+        vo.setPriceId(id);
+        List<PriceSubTable> query = priceSubTableService.query(vo);
+        data.setPriceSubTableList(query);
+
+        return data;
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "新增价格表，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public String create(CreatePriceVo vo) {
+        checkCodeUnique(vo.getCode(), null);
+
+        Price data = new Price();
+        data.setId(IdUtil.getId());
+        data.setCode(vo.getCode());
+
+        getBaseMapper().insert(data);
+
+        //新增价格表子表
+        List<CreatePriceSubTableVo> priceSubTableList = vo.getPriceSubTableList();
+        if (CollectionUtils.isNotEmpty(priceSubTableList)) {
+            for (CreatePriceSubTableVo createPriceSubTableVo : priceSubTableList) {
+                createPriceSubTableVo.setPriceId(data.getId());
+                priceSubTableService.create(createPriceSubTableVo);
+            }
+        }
+
+        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(UpdatePriceVo vo) {
+
+        Price data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("价格表不存在！");
+        }
+        checkCodeUnique(vo.getCode(), vo.getId());
+
+        LambdaUpdateWrapper<Price> updateWrapper = Wrappers.lambdaUpdate(Price.class)
+                .set(Price::getCode, vo.getCode())
+                .eq(Price::getId, vo.getId());
+
+        getBaseMapper().update(updateWrapper);
+
+        //修改价格表子表
+        if (CollectionUtils.isNotEmpty(vo.getPriceSubTableList())) {
+            dealWithPriceSubTable(data, vo);
+        }
+
+        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);
+
+        //删除子表
+        QueryPriceSubTableVo vo = new QueryPriceSubTableVo();
+        vo.setPriceId(id);
+        List<PriceSubTable> query = priceSubTableService.query(vo);
+        if (CollectionUtils.isNotEmpty(query)) {
+            List<String> needDeleteIdList = query.stream()
+                    .map(PriceSubTable::getId)
+                    .collect(Collectors.toList());
+            if (CollectionUtils.isNotEmpty(needDeleteIdList)) {
+                priceSubTableService.removeByIds(needDeleteIdList);
+            }
+        }
+    }
+
+    /**
+     * 校验编码唯一性
+     *
+     * @param code 编码
+     * @param excludeId   排除的价格表ID
+     */
+    private void checkCodeUnique(String code, String excludeId) {
+        LambdaQueryWrapper<Price> queryWrapper =
+                Wrappers.lambdaQuery(Price.class)
+                        .eq(Price::getCode, code);
+        if (StringUtils.isNotBlank(excludeId)) {
+            queryWrapper.ne(Price::getId, excludeId);
+        }
+
+        Integer count = getBaseMapper().selectCount(queryWrapper);
+        if (count != null && count > 0) {
+            throw new DefaultClientException("价格表编号已存在，请重新输入！");
+        }
+    }
+
+    private void dealWithPriceSubTable(Price data, UpdatePriceVo vo) {
+        Wrapper<PriceSubTable> lineWrapper = Wrappers.lambdaQuery(PriceSubTable.class)
+                .eq(PriceSubTable::getPriceId, data.getId());
+        List<PriceSubTable> oldPriceSubTableList = priceSubTableService.list(lineWrapper);
+        List<String> oldIdList = CollectionUtils.emptyIfNull(oldPriceSubTableList)
+                .stream()
+                .map(PriceSubTable::getId).collect(Collectors.toList());
+        List<String> existIdList = new ArrayList<>(oldIdList.size());
+        for (int i = 0; i < vo.getPriceSubTableList().size(); i++) {
+            UpdatePriceSubTableVo updatePriceSubTableVo = vo.getPriceSubTableList().get(i);
+            if (StringUtils.isNotBlank(updatePriceSubTableVo.getId())) {
+                existIdList.add(updatePriceSubTableVo.getId());
+                priceSubTableService.update(updatePriceSubTableVo);
+            } else {
+                CreatePriceSubTableVo createPriceSubTableVo = new CreatePriceSubTableVo();
+                createPriceSubTableVo.setPriceId(data.getId());
+                createPriceSubTableVo.setProductId(updatePriceSubTableVo.getProductId());
+                createPriceSubTableVo.setPrice(updatePriceSubTableVo.getPrice());
+                createPriceSubTableVo.setItemId(updatePriceSubTableVo.getItemId());
+
+                priceSubTableService.create(createPriceSubTableVo);
+            }
+        }
+
+        List<String> needDeleteIdList = oldIdList.stream()
+                .filter(oldLineId -> !existIdList.contains(oldLineId))
+                .collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(needDeleteIdList)) {
+            priceSubTableService.removeByIds(needDeleteIdList);
+        }
+    }
+
+    @Override
+    public void cleanCacheByKey(Serializable key) {
+
+    }
+}

+package com.lframework.xingyun.basedata.impl.price;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageInfo;
+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.exceptions.impl.DefaultClientException;
+import java.io.Serializable;
+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 com.lframework.xingyun.basedata.entity.PriceSubTable;
+import com.lframework.xingyun.basedata.mappers.PriceSubTableMapper;
+import com.lframework.xingyun.basedata.service.price.PriceSubTableService;
+import com.lframework.xingyun.basedata.vo.price.CreatePriceSubTableVo;
+import com.lframework.xingyun.basedata.vo.price.QueryPriceSubTableVo;
+import com.lframework.xingyun.basedata.vo.price.UpdatePriceSubTableVo;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.stereotype.Service;
+import java.util.List;
+
+@Service
+public class PriceSubTableServiceImpl extends BaseMpServiceImpl<PriceSubTableMapper, PriceSubTable> implements PriceSubTableService {
+
+    @Override
+    public PageResult<PriceSubTable> query(Integer pageIndex, Integer pageSize, QueryPriceSubTableVo vo) {
+
+        Assert.greaterThanZero(pageIndex);
+        Assert.greaterThanZero(pageSize);
+
+        PageHelperUtil.startPage(pageIndex, pageSize);
+        List<PriceSubTable> datas = this.query(vo);
+
+        return PageResultUtil.convert(new PageInfo<>(datas));
+    }
+
+    @Override
+    public List<PriceSubTable> query(QueryPriceSubTableVo vo) {
+
+        return getBaseMapper().query(vo);
+    }
+
+    @Override
+    public PriceSubTable findById(String id) {
+
+        return getBaseMapper().selectById(id);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "新增价格表子表，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public String create(CreatePriceSubTableVo vo) {
+
+        PriceSubTable data = new PriceSubTable();
+        data.setId(IdUtil.getId());
+        data.setPriceId(vo.getPriceId());
+        data.setProductId(vo.getProductId());
+        data.setPrice(vo.getPrice());
+        data.setItemId(vo.getItemId());
+
+        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(UpdatePriceSubTableVo vo) {
+
+        PriceSubTable data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("价格表子表不存在！");
+        }
+
+        LambdaUpdateWrapper<PriceSubTable> updateWrapper = Wrappers.lambdaUpdate(PriceSubTable.class)
+                .set(PriceSubTable::getProductId, vo.getProductId())
+                .set(PriceSubTable::getPrice, vo.getPrice())
+                .set(PriceSubTable::getItemId, vo.getPrice())
+                .eq(PriceSubTable::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);
+    }
+
+    @Override
+    public void cleanCacheByKey(Serializable key) {
+
+    }
+}

+package com.lframework.xingyun.basedata.mappers;
+
+import com.lframework.starter.web.core.mapper.BaseMapper;
+import com.lframework.xingyun.basedata.entity.Price;
+import com.lframework.xingyun.basedata.vo.price.QueryPriceVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 价格表 Mapper 接口
+ * </p>
+ *
+ */
+public interface PriceMapper extends BaseMapper<Price> {
+
+	/**
+     * 查询列表
+     * @param vo
+     * @return
+     */
+    List<Price> query(@Param("vo") QueryPriceVo vo);
+}

+package com.lframework.xingyun.basedata.mappers;
+
+import com.lframework.starter.web.core.mapper.BaseMapper;
+import com.lframework.xingyun.basedata.entity.PriceSubTable;
+import com.lframework.xingyun.basedata.vo.price.QueryPriceSubTableVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 价格表子表 Mapper 接口
+ * </p>
+ *
+ */
+public interface PriceSubTableMapper extends BaseMapper<PriceSubTable> {
+
+	/**
+     * 查询列表
+     * @param vo
+     * @return
+     */
+    List<PriceSubTable> query(@Param("vo") QueryPriceSubTableVo vo);
+}

+package com.lframework.xingyun.basedata.service.price;
+
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.service.BaseMpService;
+import com.lframework.xingyun.basedata.entity.Price;
+import com.lframework.xingyun.basedata.vo.price.CreatePriceVo;
+import com.lframework.xingyun.basedata.vo.price.QueryPriceVo;
+import com.lframework.xingyun.basedata.vo.price.UpdatePriceVo;
+
+import java.util.List;
+
+/**
+ * 价格表 Service
+ */
+public interface PriceService extends BaseMpService<Price> {
+
+    /**
+     * 查询列表
+     * @return
+     */
+    PageResult<Price> query(Integer pageIndex, Integer pageSize, QueryPriceVo vo);
+
+    /**
+     * 查询列表
+     * @param vo
+     * @return
+     */
+    List<Price> query(QueryPriceVo vo);
+
+    /**
+     * 根据ID查询
+     * @param id
+     * @return
+     */
+    Price findById(String id);
+
+    /**
+     * 创建
+     * @param vo
+     * @return
+     */
+    String create(CreatePriceVo vo);
+
+    /**
+     * 修改
+     * @param vo
+     */
+    void update(UpdatePriceVo vo);
+
+    /**
+     * 根据ID删除
+     * @param id
+     * @return
+     */
+    void deleteById(String id);
+}

+package com.lframework.xingyun.basedata.service.price;
+
+import com.lframework.starter.web.core.service.BaseMpService;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.xingyun.basedata.entity.PriceSubTable;
+import com.lframework.xingyun.basedata.vo.price.CreatePriceSubTableVo;
+import com.lframework.xingyun.basedata.vo.price.QueryPriceSubTableVo;
+import com.lframework.xingyun.basedata.vo.price.UpdatePriceSubTableVo;
+import java.util.List;
+
+/**
+ * 价格表子表 Service
+ */
+public interface PriceSubTableService extends BaseMpService<PriceSubTable> {
+
+    /**
+     * 查询列表
+     * @return
+     */
+    PageResult<PriceSubTable> query(Integer pageIndex, Integer pageSize, QueryPriceSubTableVo vo);
+
+    /**
+     * 查询列表
+     * @param vo
+     * @return
+     */
+    List<PriceSubTable> query(QueryPriceSubTableVo vo);
+
+    /**
+     * 根据ID查询
+     * @param id
+     * @return
+     */
+    PriceSubTable findById(String id);
+
+    /**
+     * 创建
+     * @param vo
+     * @return
+     */
+    String create(CreatePriceSubTableVo vo);
+
+    /**
+     * 修改
+     * @param vo
+     */
+    void update(UpdatePriceSubTableVo vo);
+
+    /**
+     * 根据ID删除
+     * @param id
+     * @return
+     */
+    void deleteById(String id);
+}

+package com.lframework.xingyun.basedata.vo.price;
+
+import com.lframework.starter.web.core.components.validation.IsNumberPrecision;
+import java.math.BigDecimal;
+import javax.validation.constraints.NotBlank;
+import com.lframework.starter.web.core.vo.BaseVo;
+import javax.validation.constraints.NotNull;
+import io.swagger.annotations.ApiModelProperty;
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import org.hibernate.validator.constraints.Length;
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class CreatePriceSubTableVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 价格表id
+     */
+    @ApiModelProperty("价格表id")
+    @Length(message = "品名id最多允许32个字符！")
+    private String priceId;
+
+    /**
+     * 品名id
+     */
+    @ApiModelProperty(value = "品名id", required = true)
+    @NotBlank(message = "请输入品名id！")
+    @Length(message = "品名id最多允许32个字符！")
+    private String productId;
+
+    /**
+     * 价格
+     */
+    @ApiModelProperty(value = "价格", required = true)
+    @NotNull(message = "请输入价格！")
+    @TypeMismatch(message = "价格格式有误！")
+    @IsNumberPrecision(message = "价格最多允许10位小数！", value = 10)
+    private BigDecimal price;
+
+    /**
+     * 前端用ID
+     */
+    @ApiModelProperty(value = "前端用ID")
+    private String itemId;
+
+
+}

+package com.lframework.xingyun.basedata.vo.price;
+
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class CreatePriceVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @ApiModelProperty(value = "编号", required = true)
+    @NotBlank(message = "请输入编号！")
+    @Length(message = "编号最多允许200个字符！")
+    private String code;
+
+    /**
+     * 价格表子表
+     */
+    @ApiModelProperty("价格表子表")
+    private List<CreatePriceSubTableVo> priceSubTableList;
+
+}

+package com.lframework.xingyun.basedata.vo.price;
+
+import lombok.Data;
+import com.lframework.starter.web.core.vo.PageVo;
+import com.lframework.starter.web.core.vo.BaseVo;
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import io.swagger.annotations.ApiModelProperty;
+import org.hibernate.validator.constraints.Length;
+
+import java.io.Serializable;
+
+@Data
+public class QueryPriceSubTableVo extends PageVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 价格表id
+     */
+    @ApiModelProperty("价格表id")
+    private String priceId;
+
+}

+package com.lframework.xingyun.basedata.vo.price;
+
+import com.lframework.starter.web.core.vo.BaseVo;
+import com.lframework.starter.web.core.vo.PageVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class QueryPriceVo extends PageVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @ApiModelProperty("编号")
+    private String code;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    private String createTimeStart;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    private String createTimeEnd;
+
+
+}

+package com.lframework.xingyun.basedata.vo.price;
+
+import lombok.Data;
+import com.lframework.starter.web.core.components.validation.IsNumberPrecision;
+import java.math.BigDecimal;
+import javax.validation.constraints.NotBlank;
+import com.lframework.starter.web.core.vo.BaseVo;
+import javax.validation.constraints.NotNull;
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import io.swagger.annotations.ApiModelProperty;
+import org.hibernate.validator.constraints.Length;
+import java.io.Serializable;
+
+@Data
+public class UpdatePriceSubTableVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ApiModelProperty(value = "ID")
+    private String id;
+
+
+    /**
+     * 品名id
+     */
+    @ApiModelProperty(value = "品名id", required = true)
+    @NotBlank(message = "请输入品名id！")
+    @Length(message = "品名id最多允许32个字符！")
+    private String productId;
+
+    /**
+     * 价格
+     */
+    @ApiModelProperty(value = "价格", required = true)
+    @TypeMismatch(message = "价格格式有误！")
+    @NotNull(message = "请输入价格！")
+    @IsNumberPrecision(message = "价格最多允许10位小数！", value = 10)
+    private BigDecimal price;
+
+    /**
+     * 前端用ID
+     */
+    @ApiModelProperty(value = "前端用ID")
+    private String itemId;
+
+
+}

+package com.lframework.xingyun.basedata.vo.price;
+
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class UpdatePriceVo 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 = "编号最多允许200个字符！")
+    private String code;
+
+    /**
+     * 价格表子表
+     */
+    @ApiModelProperty("价格表子表")
+    private List<UpdatePriceSubTableVo> priceSubTableList;
+
+
+}

+<?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.PriceMapper">
+
+    <resultMap id="PriceSubTable" type="com.lframework.xingyun.basedata.entity.Price">
+        <id column="id" property="id"/>
+        <result column="code" property="code"/>
+        <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="PriceSubTable_sql">
+        SELECT
+            tb.id,
+            tb.code,
+            tb.create_by_id,
+            tb.create_by,
+            tb.update_by_id,
+            tb.update_by,
+            tb.create_time,
+            tb.update_time
+        FROM base_data_price_sub_table AS tb
+    </sql>
+
+    <select id="query" resultMap="PriceSubTable">
+        <include refid="PriceSubTable_sql"/>
+        <where>
+            <if test="vo.code != null and vo.code != ''">
+                AND tb.code =LIKE CONCAT('%', #{vo.code},'%')
+            </if>
+            <if test="vo.createBy != null and vo.createBy != ''">
+                AND tb.create_by LIKE CONCAT('%', #{vo.createBy},'%')
+            </if>
+            <if test="vo.createTimeStart != null">
+                AND tb.create_time >= #{vo.createTimeStart}
+            </if>
+            <if test="vo.createTimeEnd != null">
+                <![CDATA[
+               AND tb.create_time <= #{vo.createTimeEnd}
+                ]]>
+            </if>
+        </where>
+    </select>
+</mapper>

+<?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.PriceSubTableMapper">
+
+    <resultMap id="PriceSubTable" type="com.lframework.xingyun.basedata.entity.PriceSubTable">
+        <id column="id" property="id"/>
+        <result column="price_id" property="priceId"/>
+        <result column="product_id" property="productId"/>
+        <result column="product_name" property="productName"/>
+        <result column="code" property="code"/>
+        <result column="type" property="type"/>
+        <result column="price" property="price"/>
+        <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="PriceSubTable_sql">
+        SELECT
+            tb.id,
+            tb.price_id,
+            tb.product_id,
+            br.product_name as product_name,
+            br.code as code,
+            br.type as type,
+            tb.price,
+            tb.create_by_id,
+            tb.create_by,
+            tb.update_by_id,
+            tb.update_by,
+            tb.create_time,
+            tb.update_time
+        FROM base_data_price_sub_table AS tb
+        LEFT JOIN base_data_breed_relationship br on br.id=tb.product_id
+    </sql>
+
+    <select id="query" resultMap="PriceSubTable">
+        <include refid="PriceSubTable_sql"/>
+        <where>
+            <if test="vo.priceId != null and vo.priceId != ''">
+                AND tb.price_id = #{vo.priceId}
+            </if>
+        </where>
+    </select>
+</mapper>