From 4bda6d1df766d93d1b41619e74e91ad66de68b7b Mon Sep 17 00:00:00 2001
From: xvx <871843312@qq.com>
Date: Tue, 6 May 2025 23:00:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8D=9F=E5=A4=B1=E4=B8=8E=E8=B4=AB=E5=8C=96?=
=?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=80=BC=E4=BF=AE=E6=94=B9=EF=BC=9B=E9=87=87?=
=?UTF-8?q?=E5=89=A5=E9=87=8F=E6=8A=A5=E8=A1=A8vo;=E9=87=87=E5=89=A5?=
=?UTF-8?q?=E9=87=8F=E6=8A=A5=E8=A1=A8=E5=87=BA=E7=9F=BF=E9=87=8F=E4=B8=8D?=
=?UTF-8?q?=E6=B8=85=E6=A5=9A=E8=8E=B7=E5=8F=96=E5=93=AA=E9=87=8C=E7=9A=84?=
=?UTF-8?q?=E6=95=B0=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../DicekeMininglossController.java | 6 ---
.../DicekeTotalMiningController.java | 17 +++++++++
.../entity/VO/DicekeMininglossVo.java | 3 +-
.../entity/VO/DicekeTotalMiningVo.java | 38 +++++++++++++++++++
.../mapper/xml/DicekeMininglossMapper.xml | 5 +--
5 files changed, 57 insertions(+), 12 deletions(-)
create mode 100644 src/main/java/com/jdc/jdcproject/controller/DicekeTotalMiningController.java
create mode 100644 src/main/java/com/jdc/jdcproject/entity/VO/DicekeTotalMiningVo.java
diff --git a/src/main/java/com/jdc/jdcproject/controller/DicekeMininglossController.java b/src/main/java/com/jdc/jdcproject/controller/DicekeMininglossController.java
index 4046abf..3a6c9e2 100644
--- a/src/main/java/com/jdc/jdcproject/controller/DicekeMininglossController.java
+++ b/src/main/java/com/jdc/jdcproject/controller/DicekeMininglossController.java
@@ -1,17 +1,11 @@
package com.jdc.jdcproject.controller;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jdc.jdcproject.entity.DicekeMiningloss;
-import com.jdc.jdcproject.entity.DicekePlatearea;
-import com.jdc.jdcproject.entity.DicekeShovel;
import com.jdc.jdcproject.service.IDicekeMininglossService;
-import com.jdc.jdcproject.service.IDicekePlateareaService;
-import com.jdc.jdcproject.service.IDicekeShovelService;
import com.jdc.jdcproject.utils.Result;
import io.swagger.v3.oas.annotations.Operation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import org.springframework.stereotype.Controller;
import com.jdc.jdcproject.entity.VO.DicekeMininglossVo;
import java.time.LocalDate;
diff --git a/src/main/java/com/jdc/jdcproject/controller/DicekeTotalMiningController.java b/src/main/java/com/jdc/jdcproject/controller/DicekeTotalMiningController.java
new file mode 100644
index 0000000..ba570cb
--- /dev/null
+++ b/src/main/java/com/jdc/jdcproject/controller/DicekeTotalMiningController.java
@@ -0,0 +1,17 @@
+package com.jdc.jdcproject.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
+ * 采剥量报表; 前端控制器
+ *
+ */
+
+@RestController
+@RequestMapping("/dicekeTotalMining")
+public class DicekeTotalMiningController {
+
+
+}
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..2d4d244 100644
--- a/src/main/java/com/jdc/jdcproject/entity/VO/DicekeMininglossVo.java
+++ b/src/main/java/com/jdc/jdcproject/entity/VO/DicekeMininglossVo.java
@@ -1,11 +1,10 @@
package com.jdc.jdcproject.entity.VO;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
-import java.io.Serializable;
+
import java.time.LocalDate;
@Data
diff --git a/src/main/java/com/jdc/jdcproject/entity/VO/DicekeTotalMiningVo.java b/src/main/java/com/jdc/jdcproject/entity/VO/DicekeTotalMiningVo.java
new file mode 100644
index 0000000..570f89b
--- /dev/null
+++ b/src/main/java/com/jdc/jdcproject/entity/VO/DicekeTotalMiningVo.java
@@ -0,0 +1,38 @@
+package com.jdc.jdcproject.entity.VO;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDate;
+@Data
+public class DicekeTotalMiningVo {
+
+ private static final long serialVersionUID = 1L;
+
+ @Schema(description = "平盘名称")
+ private String plateRange;
+
+ @Schema(description = "铲号")
+ private String shovelCode;
+
+ @Schema(description = "备注")
+ private String beizhu;
+
+ @Schema(description = "计量单位")
+ private String UOM;
+
+ @Schema(description = "出矿量（吨）")
+ private Double OreYield;
+
+ @Schema(description = "剥离量（吨）")
+ private Double strippingTon;
+
+ @Schema(description = "采剥总量（吨）")
+ private Double strippingAndTotalMiningTon;
+
+ @Schema(description = "月份")
+ private LocalDate month;
+
+
+}
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 d2e5f41..5b3a090 100644
--- a/src/main/java/com/jdc/jdcproject/mapper/xml/DicekeMininglossMapper.xml
+++ b/src/main/java/com/jdc/jdcproject/mapper/xml/DicekeMininglossMapper.xml
@@ -2,12 +2,11 @@
-
+