Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

- 在CrmOrderItem实体类中新增widthTolerance和thicknessTolerance字段
- 在CrmOrderItemBo业务对象中添加对应的公差字段定义
- 更新CrmOrderItemMapper.xml映射文件中的结果映射和查询字段
- 在服务实现类中添加公差字段的查询条件支持
- 在CrmOrderItemVo视图对象中增加Excel导出支持的公差字段

klp-crm/src/main/java/com/klp/crm/domain/CrmOrderItem.java

@@ -69,6 +69,14 @@ public class CrmOrderItem extends BaseEntity {
      * 重量
      */
     private BigDecimal weight;
+    /**
+     * 宽度公差
+     */
+    private BigDecimal widthTolerance;
+    /**
+     * 厚度公差
+     */
+    private BigDecimal thicknessTolerance;
     /**
      * 合同定价
      */

klp-crm/src/main/java/com/klp/crm/domain/bo/CrmOrderItemBo.java

@@ -78,6 +78,16 @@ public class CrmOrderItemBo extends BaseEntity {
      */
     private BigDecimal weight;
 
+    /**
+     * 宽度公差
+     */
+    private BigDecimal widthTolerance;
+
+    /**
+     * 厚度公差
+     */
+    private BigDecimal thicknessTolerance;
+
     /**
      * 合同定价
      */

klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderItemVo.java

@@ -95,6 +95,18 @@ public class CrmOrderItemVo {
     @ExcelProperty(value = "重量")
     private BigDecimal weight;
 
+    /**
+     * 宽度公差
+     */
+    @ExcelProperty(value = "宽度公差")
+    private BigDecimal widthTolerance;
+
+    /**
+     * 厚度公差
+     */
+    @ExcelProperty(value = "厚度公差")
+    private BigDecimal thicknessTolerance;
+
     /**
      * 合同定价
      */

klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderItemServiceImpl.java

@@ -71,6 +71,8 @@ public class CrmOrderItemServiceImpl implements ICrmOrderItemService {
         lqw.eq(StringUtils.isNotBlank(bo.getMaterial()), CrmOrderItem::getMaterial, bo.getMaterial());
         lqw.eq(StringUtils.isNotBlank(bo.getGrade()), CrmOrderItem::getGrade, bo.getGrade());
         lqw.eq(bo.getWeight() != null, CrmOrderItem::getWeight, bo.getWeight());
+        lqw.eq(bo.getWidthTolerance() != null, CrmOrderItem::getWidthTolerance, bo.getWidthTolerance());
+        lqw.eq(bo.getThicknessTolerance() != null, CrmOrderItem::getThicknessTolerance, bo.getThicknessTolerance());
         lqw.eq(bo.getContractPrice() != null, CrmOrderItem::getContractPrice, bo.getContractPrice());
         lqw.eq(StringUtils.isNotBlank(bo.getCustomizer()), CrmOrderItem::getCustomizer, bo.getCustomizer());
         lqw.eq(StringUtils.isNotBlank(bo.getShipper()), CrmOrderItem::getShipper, bo.getShipper());

klp-crm/src/main/resources/mapper/CrmOrderItemMapper.xml

@@ -17,6 +17,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="material" column="material"/>
         <result property="grade" column="grade"/>
         <result property="weight" column="weight"/>
+        <result property="widthTolerance" column="width_tolerance"/>
+        <result property="thicknessTolerance" column="thickness_tolerance"/>
         <result property="contractPrice" column="contract_price"/>
         <result property="customizer" column="customizer"/>
         <result property="shipper" column="shipper"/>
@@ -42,6 +44,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         material,
         grade,
         weight,
+        width_tolerance,
+        thickness_tolerance,
         contract_price,
         customizer,
         shipper,