损失与贫化返回值修改;采剥量报表vo;采剥量报表出矿量不清楚获取哪里的数值
This commit is contained in:
parent
a71ef52c00
commit
4bda6d1df7
@ -1,17 +1,11 @@
|
|||||||
package com.jdc.jdcproject.controller;
|
package com.jdc.jdcproject.controller;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
||||||
import com.jdc.jdcproject.entity.DicekeMiningloss;
|
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.IDicekeMininglossService;
|
||||||
import com.jdc.jdcproject.service.IDicekePlateareaService;
|
|
||||||
import com.jdc.jdcproject.service.IDicekeShovelService;
|
|
||||||
import com.jdc.jdcproject.utils.Result;
|
import com.jdc.jdcproject.utils.Result;
|
||||||
import io.swagger.v3.oas.annotations.Operation;
|
import io.swagger.v3.oas.annotations.Operation;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import com.jdc.jdcproject.entity.VO.DicekeMininglossVo;
|
import com.jdc.jdcproject.entity.VO.DicekeMininglossVo;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
|
@ -0,0 +1,17 @@
|
|||||||
|
package com.jdc.jdcproject.controller;
|
||||||
|
|
||||||
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* <p>
|
||||||
|
* 采剥量报表; 前端控制器
|
||||||
|
* </p>
|
||||||
|
*/
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/dicekeTotalMining")
|
||||||
|
public class DicekeTotalMiningController {
|
||||||
|
|
||||||
|
|
||||||
|
}
|
@ -1,11 +1,10 @@
|
|||||||
package com.jdc.jdcproject.entity.VO;
|
package com.jdc.jdcproject.entity.VO;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import java.io.Serializable;
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
|
@ -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;
|
||||||
|
|
||||||
|
|
||||||
|
}
|
@ -2,12 +2,11 @@
|
|||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="com.jdc.jdcproject.mapper.DicekeMininglossMapper">
|
<mapper namespace="com.jdc.jdcproject.mapper.DicekeMininglossMapper">
|
||||||
|
|
||||||
<!-- 表结构 平盘-电铲号-剥离量-采剥总量-采下废石-贫化率-损失率-配矿配矿量-备注-月份 -->
|
<!-- 表结构 平盘-电铲号-采剥总量-采下废石-贫化率-损失率-配矿配矿量-备注-月份 -->
|
||||||
<select id="findAllLoss" resultType="com.jdc.jdcproject.entity.VO.DicekeMininglossVo">
|
<select id="findAllLoss" resultType="com.jdc.jdcproject.entity.VO.DicekeMininglossVo">
|
||||||
select dml.LossID,
|
select dml.LossID,
|
||||||
dp.PlateRange,
|
dp.PlateRange,
|
||||||
ds.ShovelCode,
|
ds.ShovelCode,
|
||||||
dml.StrippingTon,
|
|
||||||
dml.StrippingAndTotalMiningTon,
|
dml.StrippingAndTotalMiningTon,
|
||||||
dml.WasteRockTon,
|
dml.WasteRockTon,
|
||||||
dml.DilutionRate,
|
dml.DilutionRate,
|
||||||
@ -24,7 +23,6 @@
|
|||||||
select dml.LossID,
|
select dml.LossID,
|
||||||
dp.PlateRange,
|
dp.PlateRange,
|
||||||
ds.ShovelCode,
|
ds.ShovelCode,
|
||||||
dml.StrippingTon,
|
|
||||||
dml.StrippingAndTotalMiningTon,
|
dml.StrippingAndTotalMiningTon,
|
||||||
dml.WasteRockTon,
|
dml.WasteRockTon,
|
||||||
dml.DilutionRate,
|
dml.DilutionRate,
|
||||||
@ -44,7 +42,6 @@
|
|||||||
select dml.LossID,
|
select dml.LossID,
|
||||||
dp.PlateRange,
|
dp.PlateRange,
|
||||||
ds.ShovelCode,
|
ds.ShovelCode,
|
||||||
dml.StrippingTon,
|
|
||||||
dml.StrippingAndTotalMiningTon,
|
dml.StrippingAndTotalMiningTon,
|
||||||
dml.WasteRockTon,
|
dml.WasteRockTon,
|
||||||
dml.DilutionRate,
|
dml.DilutionRate,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user