From cced2ff4aa1f1cbc2d2b55f807b2c5b9c35f9523 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Sat, 13 Jun 2026 16:16:30 +0800 Subject: [PATCH] =?UTF-8?q?feat(cost):=20=E6=B7=BB=E5=8A=A0=E5=8D=95?= =?UTF-8?q?=E4=BB=B7=E5=AD=97=E6=AE=B5=E5=92=8C=E4=BD=BF=E7=94=A8=E5=8D=95?= =?UTF-8?q?=E4=BB=B7=E6=A0=87=E8=AF=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在CostProdMetric实体类中添加usePrice字段，用于标识是否使用单价 - 更新CostProdMetricBo、CostProdMetricVo数据传输对象，增加单价相关属性 - 修改CostProdMetricMapper.xml映射文件，添加usePrice字段映射配置 - 扩展CostProdMetricServiceImpl查询逻辑，支持按是否使用单价进行筛选 - 更新前端metric.vue页面，添加单价输入框和是否使用单价下拉选择组件 - 实现表格中单价列的显示和编辑功能，并增加条件查询支持 --- .../com/klp/cost/domain/CostProdMetric.java | 6 +++- .../klp/cost/domain/bo/CostProdMetricBo.java | 7 ++++- .../klp/cost/domain/vo/CostProdMetricVo.java | 10 +++++-- .../impl/CostProdMetricServiceImpl.java | 1 + .../mapper/cost/CostProdMetricMapper.xml | 1 + klp-ui/src/views/cost/metric.vue | 29 +++++++++++++++---- 6 files changed, 45 insertions(+), 9 deletions(-) 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 @@ - + + + +