From 3c30523d7c2435935253bb6bb74b1d56301b071e Mon Sep 17 00:00:00 2001 From: xvx <871843312@qq.com> Date: Tue, 13 May 2025 18:14:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8D=9F=E5=A4=B1=E5=92=8C=E8=B4=AB=E5=8C=96?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=20=E6=B7=BB=E5=8A=A0=E6=8D=9F?= =?UTF-8?q?=E5=A4=B1=E7=9F=BF=E9=87=8FLossMineralTon=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jdcproject/entity/DicekeMiningloss.java | 13 +++++-- .../entity/VO/DicekeMininglossVo.java | 35 ++++++++++--------- .../mapper/xml/DicekeMininglossMapper.xml | 6 ++-- .../impl/DicekeMininglossServiceImpl.java | 2 +- 4 files changed, 35 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/jdc/jdcproject/entity/DicekeMiningloss.java b/src/main/java/com/jdc/jdcproject/entity/DicekeMiningloss.java index 2991815..583a705 100644 --- a/src/main/java/com/jdc/jdcproject/entity/DicekeMiningloss.java +++ b/src/main/java/com/jdc/jdcproject/entity/DicekeMiningloss.java @@ -35,10 +35,14 @@ public class DicekeMiningloss implements Serializable { @Schema(description = "月份") private LocalDate month; - @Schema(description = "剥离量（吨）") + @Schema(description = "圈定矿量（吨）") + private Double DefineMineralReserves; + + @Schema(description = "剥离量(吨）") private Double strippingTon; - @Schema(description = "采剥总量(吨）") + + @Schema(description = "实采总量(吨）") private Double strippingAndTotalMiningTon; @Schema(description = "采下废石（吨）") @@ -47,6 +51,9 @@ public class DicekeMiningloss implements Serializable { @Schema(description = "贫化率（%）") private Double dilutionRate; + @Schema(description = "损失矿量(吨）") + private Double LossMineralTon; + @Schema(description = "损失率（%）") private Double lossRate; @@ -63,10 +70,12 @@ public class DicekeMiningloss implements Serializable { ", plateID='" + plateID + '\'' + ", shovelID='" + shovelID + '\'' + ", month=" + month + + ", DefineMineralReserves=" + DefineMineralReserves + ", strippingTon=" + strippingTon + ", strippingAndTotalMiningTon=" + strippingAndTotalMiningTon + ", wasteRockTon=" + wasteRockTon + ", dilutionRate=" + dilutionRate + + ", LossMineralTon=" + LossMineralTon + ", lossRate=" + lossRate + ", allocationTon=" + allocationTon + ", beizhu='" + beizhu + '\'' + diff --git a/src/main/java/com/jdc/jdcproject/entity/VO/DicekeMininglossVo.java b/src/main/java/com/jdc/jdcproject/entity/VO/DicekeMininglossVo.java index 136530b..120a906 100644 --- a/src/main/java/com/jdc/jdcproject/entity/VO/DicekeMininglossVo.java +++ b/src/main/java/com/jdc/jdcproject/entity/VO/DicekeMininglossVo.java @@ -26,10 +26,10 @@ public class DicekeMininglossVo { @Schema(description = "月份") private LocalDate month; - @Schema(description = "剥离量（吨）") - private Double strippingTon; + @Schema(description = "圈定矿量（吨）") + private Double DefineMineralReserves; - @Schema(description = "采剥总量(吨）") + @Schema(description = "实采总量(吨）") private Double strippingAndTotalMiningTon; @Schema(description = "采下废石（吨）") @@ -38,6 +38,9 @@ public class DicekeMininglossVo { @Schema(description = "贫化率（%）") private Double dilutionRate; + @Schema(description = "损失矿量(吨）") + private Double LossMineralTon; + @Schema(description = "损失率（%）") private Double lossRate; @@ -49,18 +52,18 @@ public class DicekeMininglossVo { @Override public String toString() { - return "DicekeMiningloss{" + - "lossID = " + lossID + - ", plateID = " + plateRange + - ", shovelID = " + shovelCode + - ", month = " + month + - ", strippingTon = " + strippingTon + - ", strippingAndTotalMiningTon = " + strippingAndTotalMiningTon + - ", wasteRockTon = " + wasteRockTon + - ", dilutionRate = " + dilutionRate + - ", lossRate = " + lossRate + - ", allocationTon = " + allocationTon + - ", beizhu = " + beizhu + - "}"; + return "DicekeMininglossVo{" + + "lossID='" + lossID + '\'' + + ", plateRange='" + plateRange + '\'' + + ", shovelCode='" + shovelCode + '\'' + + ", month=" + month + + ", DefineMineralReserves=" + DefineMineralReserves + + ", strippingAndTotalMiningTon=" + strippingAndTotalMiningTon + + ", wasteRockTon=" + wasteRockTon + + ", dilutionRate=" + dilutionRate + + ", lossRate=" + lossRate + + ", allocationTon=" + allocationTon + + ", beizhu='" + beizhu + '\'' + + '}'; } } diff --git a/src/main/java/com/jdc/jdcproject/mapper/xml/DicekeMininglossMapper.xml b/src/main/java/com/jdc/jdcproject/mapper/xml/DicekeMininglossMapper.xml index 0d2fde4..e2c8bac 100644 --- a/src/main/java/com/jdc/jdcproject/mapper/xml/DicekeMininglossMapper.xml +++ b/src/main/java/com/jdc/jdcproject/mapper/xml/DicekeMininglossMapper.xml @@ -7,10 +7,11 @@ select dml.LossID, dp.PlateRange, ds.ShovelCode, - dml.StrippingTon, + dml.DefineMineralReserves, dml.StrippingAndTotalMiningTon, dml.WasteRockTon, dml.DilutionRate, + dml.LossMineralTon, dml.LossRate, dml.AllocationTon, dml.Month, @@ -46,10 +47,11 @@ select dml.LossID, dp.PlateRange, ds.ShovelCode, - dml.StrippingTon, + dml.DefineMineralReserves, dml.StrippingAndTotalMiningTon, dml.WasteRockTon, dml.DilutionRate, + dml.LossMineralTon, dml.LossRate, dml.AllocationTon, dml.Month, diff --git a/src/main/java/com/jdc/jdcproject/service/impl/DicekeMininglossServiceImpl.java b/src/main/java/com/jdc/jdcproject/service/impl/DicekeMininglossServiceImpl.java index ffe883b..6cd5949 100644 --- a/src/main/java/com/jdc/jdcproject/service/impl/DicekeMininglossServiceImpl.java +++ b/src/main/java/com/jdc/jdcproject/service/impl/DicekeMininglossServiceImpl.java @@ -116,7 +116,7 @@ public class DicekeMininglossServiceImpl extends ServiceImpl