报价：基础表单问题修改

@@ -1630,10 +1630,10 @@ CREATE TABLE `base_data_breed_relationship`
 (
     `id`                     varchar(32)     NOT NULL COMMENT 'ID',
     `product_name`           varchar(200)    NOT NULL COMMENT '品名',
-    `code`                   varchar(200)    NOT NULL COMMENT '代号',
-    `type`                   varchar(200)    NOT NULL COMMENT '类型',
-    `attrition_rate`         decimal(18, 10) NOT NULL COMMENT '损耗率',
-    `miscellaneous_tax_rate` decimal(18, 10) NOT NULL COMMENT '杂率',
+    `code`                   varchar(200)    DEFAULT NULL COMMENT '代号',
+    `type`                   varchar(200)    DEFAULT NULL COMMENT '类型',
+    `attrition_rate`         decimal(18, 10) DEFAULT NULL COMMENT '损耗率',
+    `miscellaneous_tax_rate` decimal(18, 10) DEFAULT 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',

@@ -93,6 +93,18 @@ public class QueryBreedRelationshipBo extends BaseBo<BreedRelationship> {
     @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN)
     private LocalDateTime updateTime;
 
+    /**
+     * 是否可编辑
+     */
+    @ApiModelProperty("是否可编辑")
+    private Boolean canEdit = true;
+
+    /**
+     * 是否可删除
+     */
+    @ApiModelProperty("是否可删除")
+    private Boolean canDelete = true;
+
     public QueryBreedRelationshipBo() {
 
     }

@@ -76,6 +76,18 @@ public class QueryPriceBo extends BaseBo<Price> {
     @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN)
     private LocalDateTime updateTime;
 
+    /**
+     * 是否可编辑
+     */
+    @ApiModelProperty("是否可编辑")
+    private Boolean canEdit = true;
+
+    /**
+     * 是否可删除
+     */
+    @ApiModelProperty("是否可删除")
+    private Boolean canDelete = true;
+
 
     public QueryPriceBo() {
 

 package com.lframework.xingyun.basedata.controller;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.utils.PageResultUtil;
@@ -8,7 +9,9 @@ import com.lframework.starter.web.core.components.resp.InvokeResult;
 import javax.validation.constraints.NotBlank;
 import com.lframework.xingyun.basedata.bo.breed.QueryBreedRelationshipBo;
 import com.lframework.xingyun.basedata.entity.BreedRelationship;
+import com.lframework.xingyun.basedata.entity.PriceSubTable;
 import com.lframework.xingyun.basedata.service.breed.BreedRelationshipService;
+import com.lframework.xingyun.basedata.service.price.PriceSubTableService;
 import com.lframework.xingyun.basedata.vo.breed.CreateBreedRelationshipVo;
 import com.lframework.xingyun.basedata.vo.breed.QueryBreedRelationshipVo;
 import com.lframework.xingyun.basedata.vo.breed.UpdateBreedRelationshipVo;
@@ -23,7 +26,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -39,6 +45,9 @@ public class BreedRelationshipController extends DefaultBaseController {
     @Autowired
     private BreedRelationshipService breedRelationshipService;
 
+    @Autowired
+    private PriceSubTableService priceSubTableService;
+
     /**
      * 查询列表
      */
@@ -54,6 +63,7 @@ public class BreedRelationshipController extends DefaultBaseController {
 
         if (!CollectionUtil.isEmpty(datas)) {
             results = datas.stream().map(QueryBreedRelationshipBo::new).collect(Collectors.toList());
+            fillCanOperate(results);
         }
 
         return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
@@ -74,6 +84,7 @@ public class BreedRelationshipController extends DefaultBaseController {
         }
 
         QueryBreedRelationshipBo result = new QueryBreedRelationshipBo(data);
+        fillCanOperate(Collections.singletonList(result));
 
         return InvokeResultBuilder.success(result);
     }
@@ -117,4 +128,24 @@ public class BreedRelationshipController extends DefaultBaseController {
 
         return InvokeResultBuilder.success();
     }
+
+    private void fillCanOperate(List<QueryBreedRelationshipBo> results) {
+        if (CollectionUtil.isEmpty(results)) {
+            return;
+        }
+
+        List<String> ids = results.stream().map(QueryBreedRelationshipBo::getId).collect(Collectors.toList());
+        Set<String> referencedIds = priceSubTableService.list(Wrappers.lambdaQuery(PriceSubTable.class)
+                        .select(PriceSubTable::getProductId)
+                        .in(PriceSubTable::getProductId, ids))
+                .stream()
+                .map(PriceSubTable::getProductId)
+                .collect(Collectors.toCollection(HashSet::new));
+
+        results.forEach(item -> {
+            boolean referenced = referencedIds.contains(item.getId());
+            item.setCanEdit(!referenced);
+            item.setCanDelete(!referenced);
+        });
+    }
 }

@@ -29,7 +29,9 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 @Service
@@ -72,6 +74,7 @@ public class PriceServiceImpl extends BaseMpServiceImpl<PriceMapper, Price> impl
     @Override
     public String create(CreatePriceVo vo) {
         checkCodeUnique(vo.getCode(), null);
+        checkPriceSubTableDuplicateCreate(vo.getPriceSubTableList());
 
         Price data = new Price();
         data.setId(IdUtil.getId());
@@ -104,6 +107,7 @@ public class PriceServiceImpl extends BaseMpServiceImpl<PriceMapper, Price> impl
             throw new DefaultClientException("价格表不存在！");
         }
         checkCodeUnique(vo.getCode(), vo.getId());
+        checkPriceSubTableDuplicateUpdate(vo.getPriceSubTableList());
 
         LambdaUpdateWrapper<Price> updateWrapper = Wrappers.lambdaUpdate(Price.class)
                 .set(Price::getCode, vo.getCode())
@@ -193,6 +197,32 @@ public class PriceServiceImpl extends BaseMpServiceImpl<PriceMapper, Price> impl
         }
     }
 
+    private void checkPriceSubTableDuplicateCreate(List<CreatePriceSubTableVo> priceSubTableList) {
+        if (CollectionUtils.isEmpty(priceSubTableList)) {
+            return;
+        }
+
+        Set<String> productIds = new HashSet<>(priceSubTableList.size());
+        for (CreatePriceSubTableVo priceSubTableVo : priceSubTableList) {
+            if (!productIds.add(priceSubTableVo.getProductId())) {
+                throw new DefaultClientException("不允许重复选择同一个品种！");
+            }
+        }
+    }
+
+    private void checkPriceSubTableDuplicateUpdate(List<UpdatePriceSubTableVo> priceSubTableList) {
+        if (CollectionUtils.isEmpty(priceSubTableList)) {
+            return;
+        }
+
+        Set<String> productIds = new HashSet<>(priceSubTableList.size());
+        for (UpdatePriceSubTableVo priceSubTableVo : priceSubTableList) {
+            if (!productIds.add(priceSubTableVo.getProductId())) {
+                throw new DefaultClientException("不允许重复选择同一个品种！");
+            }
+        }
+    }
+
     @Override
     public void cleanCacheByKey(Serializable key) {
 

@@ -27,24 +27,21 @@ public class CreateBreedRelationshipVo implements BaseVo, Serializable {
     /**
      * 代号
      */
-    @ApiModelProperty(value = "代号", required = true)
-    @NotBlank(message = "请输入代号！")
+    @ApiModelProperty("代号")
     @Length(message = "代号最多允许200个字符！")
     private String code;
 
     /**
      * 类型
      */
-    @ApiModelProperty(value = "类型", required = true)
-    @NotBlank(message = "请输入类型！")
+    @ApiModelProperty("类型")
     @Length(message = "类型最多允许200个字符！")
     private String type;
 
     /**
      * 损耗率
      */
-    @ApiModelProperty(value = "损耗率", required = true)
-    @NotNull(message = "请输入损耗率！")
+    @ApiModelProperty("损耗率")
     @TypeMismatch(message = "损耗率格式有误！")
     @IsNumberPrecision(message = "损耗率最多允许10位小数！", value = 10)
     private BigDecimal attritionRate;
@@ -52,8 +49,7 @@ public class CreateBreedRelationshipVo implements BaseVo, Serializable {
     /**
      * 杂率
      */
-    @ApiModelProperty(value = "杂率", required = true)
-    @NotNull(message = "请输入杂率！")
+    @ApiModelProperty("杂率")
     @TypeMismatch(message = "杂率格式有误！")
     @IsNumberPrecision(message = "杂率最多允许10位小数！", value = 10)
     private BigDecimal miscellaneousTaxRate;

@@ -34,34 +34,30 @@ public class UpdateBreedRelationshipVo implements BaseVo, Serializable {
     /**
      * 代号
      */
-    @ApiModelProperty(value = "代号", required = true)
-    @NotBlank(message = "请输入代号！")
+    @ApiModelProperty("代号")
     @Length(message = "代号最多允许200个字符！")
     private String code;
 
     /**
      * 类型
      */
-    @ApiModelProperty(value = "类型", required = true)
-    @NotBlank(message = "请输入类型！")
+    @ApiModelProperty("类型")
     @Length(message = "类型最多允许200个字符！")
     private String type;
 
     /**
      * 损耗率
      */
-    @ApiModelProperty(value = "损耗率", required = true)
+    @ApiModelProperty("损耗率")
     @TypeMismatch(message = "损耗率格式有误！")
-    @NotNull(message = "请输入损耗率！")
     @IsNumberPrecision(message = "损耗率最多允许10位小数！", value = 10)
     private BigDecimal attritionRate;
 
     /**
      * 杂率
      */
-    @ApiModelProperty(value = "杂率", required = true)
+    @ApiModelProperty("杂率")
     @TypeMismatch(message = "杂率格式有误！")
-    @NotNull(message = "请输入杂率！")
     @IsNumberPrecision(message = "杂率最多允许10位小数！", value = 10)
     private BigDecimal miscellaneousTaxRate;
 

@@ -2,7 +2,7 @@
 <!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">
+    <resultMap id="Price" type="com.lframework.xingyun.basedata.entity.Price">
         <id column="id" property="id"/>
         <result column="code" property="code"/>
         <result column="create_by_id" property="createById"/>
@@ -13,7 +13,7 @@
         <result column="update_time" property="updateTime"/>
     </resultMap>
 
-    <sql id="PriceSubTable_sql">
+    <sql id="Price_sql">
         SELECT
             tb.id,
             tb.code,
@@ -23,14 +23,14 @@
             tb.update_by,
             tb.create_time,
             tb.update_time
-        FROM base_data_price_sub_table AS tb
+        FROM base_data_price AS tb
     </sql>
 
-    <select id="query" resultMap="PriceSubTable">
-        <include refid="PriceSubTable_sql"/>
+    <select id="query" resultMap="Price">
+        <include refid="Price_sql"/>
         <where>
             <if test="vo.code != null and vo.code != ''">
-                AND tb.code =LIKE CONCAT('%', #{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},'%')