diff --git a/klp-cost/src/main/java/com/klp/cost/domain/CostProdMetric.java b/klp-cost/src/main/java/com/klp/cost/domain/CostProdMetric.java index b653c7ce..658837a3 100644 --- a/klp-cost/src/main/java/com/klp/cost/domain/CostProdMetric.java +++ b/klp-cost/src/main/java/com/klp/cost/domain/CostProdMetric.java @@ -42,9 +42,13 @@ public class CostProdMetric extends BaseEntity { */ private String metricFormula; /** - * 指标计算结果值 + * 单价 */ private BigDecimal metricValue; + /** + * 是否使用单价 0=否 1=是 + */ + private Integer usePrice; /** * 备注 */ diff --git a/klp-cost/src/main/java/com/klp/cost/domain/bo/CostProdMetricBo.java b/klp-cost/src/main/java/com/klp/cost/domain/bo/CostProdMetricBo.java index f9e17014..27847d6d 100644 --- a/klp-cost/src/main/java/com/klp/cost/domain/bo/CostProdMetricBo.java +++ b/klp-cost/src/main/java/com/klp/cost/domain/bo/CostProdMetricBo.java @@ -44,10 +44,15 @@ public class CostProdMetricBo extends BaseEntity { private String metricFormula; /** - * 指标计算结果值 + * 单价 */ private BigDecimal metricValue; + /** + * 是否使用单价 0=否 1=是 + */ + private Integer usePrice; + /** * 备注 */ diff --git a/klp-cost/src/main/java/com/klp/cost/domain/vo/CostProdMetricVo.java b/klp-cost/src/main/java/com/klp/cost/domain/vo/CostProdMetricVo.java index 7420654f..20a76861 100644 --- a/klp-cost/src/main/java/com/klp/cost/domain/vo/CostProdMetricVo.java +++ b/klp-cost/src/main/java/com/klp/cost/domain/vo/CostProdMetricVo.java @@ -52,11 +52,17 @@ public class CostProdMetricVo { private String metricFormula; /** - * 指标计算结果值 + * 单价 */ - @ExcelProperty(value = "指标计算结果值") + @ExcelProperty(value = "单价") private BigDecimal metricValue; + /** + * 是否使用单价 0=否 1=是 + */ + @ExcelProperty(value = "是否使用单价") + private Integer usePrice; + /** * 备注 */ diff --git a/klp-cost/src/main/java/com/klp/cost/service/impl/CostProdMetricServiceImpl.java b/klp-cost/src/main/java/com/klp/cost/service/impl/CostProdMetricServiceImpl.java index f9303455..a837d0d4 100644 --- a/klp-cost/src/main/java/com/klp/cost/service/impl/CostProdMetricServiceImpl.java +++ b/klp-cost/src/main/java/com/klp/cost/service/impl/CostProdMetricServiceImpl.java @@ -66,6 +66,7 @@ public class CostProdMetricServiceImpl implements ICostProdMetricService { lqw.like(StringUtils.isNotBlank(bo.getMetricName()), CostProdMetric::getMetricName, bo.getMetricName()); lqw.eq(StringUtils.isNotBlank(bo.getMetricFormula()), CostProdMetric::getMetricFormula, bo.getMetricFormula()); lqw.eq(bo.getMetricValue() != null, CostProdMetric::getMetricValue, bo.getMetricValue()); + lqw.eq(bo.getUsePrice() != null, CostProdMetric::getUsePrice, bo.getUsePrice()); return lqw; } diff --git a/klp-cost/src/main/resources/mapper/cost/CostProdMetricMapper.xml b/klp-cost/src/main/resources/mapper/cost/CostProdMetricMapper.xml index 5628ff71..1a62c69c 100644 --- a/klp-cost/src/main/resources/mapper/cost/CostProdMetricMapper.xml +++ b/klp-cost/src/main/resources/mapper/cost/CostProdMetricMapper.xml @@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + diff --git a/klp-ui/src/views/cost/metric.vue b/klp-ui/src/views/cost/metric.vue index 62a415b8..3c6682f3 100644 --- a/klp-ui/src/views/cost/metric.vue +++ b/klp-ui/src/views/cost/metric.vue @@ -33,14 +33,20 @@ @keyup.enter.native="handleQuery" /> - + + + + + + + 搜索 重置 @@ -96,7 +102,12 @@ - + + + +