diff --git a/src/main/java/com/jdc/jdcproject/controller/DicekeMininglossController.java b/src/main/java/com/jdc/jdcproject/controller/DicekeMininglossController.java index 3a6c9e2..4046abf 100644 --- a/src/main/java/com/jdc/jdcproject/controller/DicekeMininglossController.java +++ b/src/main/java/com/jdc/jdcproject/controller/DicekeMininglossController.java @@ -1,11 +1,17 @@ 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 deleted file mode 100644 index ba570cb..0000000 --- a/src/main/java/com/jdc/jdcproject/controller/DicekeTotalMiningController.java +++ /dev/null @@ -1,17 +0,0 @@ -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 2d4d244..136530b 100644 --- a/src/main/java/com/jdc/jdcproject/entity/VO/DicekeMininglossVo.java +++ b/src/main/java/com/jdc/jdcproject/entity/VO/DicekeMininglossVo.java @@ -1,10 +1,11 @@ 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 deleted file mode 100644 index 570f89b..0000000 --- a/src/main/java/com/jdc/jdcproject/entity/VO/DicekeTotalMiningVo.java +++ /dev/null @@ -1,38 +0,0 @@ -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 5b3a090..d2e5f41 100644 --- a/src/main/java/com/jdc/jdcproject/mapper/xml/DicekeMininglossMapper.xml +++ b/src/main/java/com/jdc/jdcproject/mapper/xml/DicekeMininglossMapper.xml @@ -2,11 +2,12 @@