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 @@