损失和贫化实体类 添加损失矿量LossMineralTon，

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 + '\'' +

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 + '\'' +
+                '}';
     }
 }

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,

src/main/java/com/jdc/jdcproject/service/impl/DicekeMininglossServiceImpl.java

@@ -116,7 +116,7 @@ public class DicekeMininglossServiceImpl extends ServiceImpl<DicekeMininglossMap
         dml.setShovelID(ds.getShovelID());
         dml.setPlateID(dp.getPlateID());
         dml.setMonth(dicekeMininglossVo.getMonth());
-        dml.setStrippingTon(dicekeMininglossVo.getStrippingTon());
+        dml.setDefineMineralReserves(dicekeMininglossVo.getDefineMineralReserves());
         dml.setStrippingAndTotalMiningTon(dicekeMininglossVo.getStrippingAndTotalMiningTon());
         dml.setWasteRockTon(dicekeMininglossVo.getWasteRockTon());
         dml.setDilutionRate(dicekeMininglossVo.getDilutionRate());