From 96dd359933a94835f910177e1174bee2c1302fae Mon Sep 17 00:00:00 2001 From: xvx <871843312@qq.com> Date: Wed, 7 May 2025 21:48:52 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E5=89=A5=E9=87=8F=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DicekeTotalMiningController.java | 37 ++++++++++++++++++- .../jdcproject/entity/DicekeMiningloss.java | 26 +++++++------ .../entity/VO/DicekeTotalMiningVo.java | 27 +++++++++----- .../mapper/DicekeMininglossMapper.java | 4 ++ .../impl/DicekeTotalMiningServiceImpl.java | 3 +- 5 files changed, 73 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/jdc/jdcproject/controller/DicekeTotalMiningController.java b/src/main/java/com/jdc/jdcproject/controller/DicekeTotalMiningController.java index 1133964..113fb4a 100644 --- a/src/main/java/com/jdc/jdcproject/controller/DicekeTotalMiningController.java +++ b/src/main/java/com/jdc/jdcproject/controller/DicekeTotalMiningController.java @@ -1,6 +1,8 @@ package com.jdc.jdcproject.controller; +import com.jdc.jdcproject.entity.DicekeMiningloss; import com.jdc.jdcproject.entity.VO.DicekeTotalMiningVo; +import com.jdc.jdcproject.service.IDicekeMininglossService; import com.jdc.jdcproject.service.IDicekeTotalMiningService; import com.jdc.jdcproject.utils.Result; import io.swagger.v3.oas.annotations.Operation; @@ -23,15 +25,46 @@ import java.util.List; public class DicekeTotalMiningController { @Autowired - private IDicekeTotalMiningService iDicekeTotalMiningService; + private IDicekeTotalMiningService dicekeTotalMiningService; + @Autowired + private IDicekeMininglossService dicekeMininglossService; @Operation(summary = "通过Month查询采剥量报表") @GetMapping("findTotalMiningByMonth") public Result findTotalMiningByMonth(@RequestParam(required = false) LocalDate Month){ - List totalMiningVoList = iDicekeTotalMiningService.getTotalMiningByMonth(Month); + List totalMiningVoList = dicekeTotalMiningService.getTotalMiningByMonth(Month); System.out.println(totalMiningVoList.toString()); return Result.successResult().data("totalMiningVoList",totalMiningVoList); } + @Operation(summary = "修改采剥量报表") + @PostMapping("updateTotalMining") + public Result updateTotalMining(@RequestBody DicekeTotalMiningVo dtm){ + + DicekeMiningloss dml = new DicekeMiningloss(); + + dml.setLossID(dtm.getTotalID()); + dml.setPlateID(dtm.getPlateID()); + dml.setShovelID(dtm.getShovelID()); + dml.setBeizhu(dtm.getBeizhu()); + dml.setStrippingTon(dtm.getStrippingTon()); + dml.setStrippingAndTotalMiningTon(dtm.getStrippingAndTotalMiningTon()); + dml.setMonth(dtm.getMonth()); + + boolean updateFlag = dicekeMininglossService.updateById(dml); + if (updateFlag){ + return Result.successResult(); + } else { + return Result.errorResult(); + } + + + } + + /* + * + * 删除直接删掉对应表的字段？ + * + * */ } diff --git a/src/main/java/com/jdc/jdcproject/entity/DicekeMiningloss.java b/src/main/java/com/jdc/jdcproject/entity/DicekeMiningloss.java index f2ae5dd..2991815 100644 --- a/src/main/java/com/jdc/jdcproject/entity/DicekeMiningloss.java +++ b/src/main/java/com/jdc/jdcproject/entity/DicekeMiningloss.java @@ -53,19 +53,23 @@ public class DicekeMiningloss implements Serializable { @Schema(description = "配矿配矿量（吨）") private Double allocationTon; + @Schema(description = "备注") + private String beizhu; + @Override public String toString() { return "DicekeMiningloss{" + - "lossID = " + lossID + - ", plateID = " + plateID + - ", shovelID = " + shovelID + - ", month = " + month + - ", strippingTon = " + strippingTon + - ", strippingAndTotalMiningTon = " + strippingAndTotalMiningTon + - ", wasteRockTon = " + wasteRockTon + - ", dilutionRate = " + dilutionRate + - ", lossRate = " + lossRate + - ", allocationTon = " + allocationTon + - "}"; + "lossID='" + lossID + '\'' + + ", plateID='" + plateID + '\'' + + ", shovelID='" + shovelID + '\'' + + ", month=" + month + + ", strippingTon=" + strippingTon + + ", strippingAndTotalMiningTon=" + strippingAndTotalMiningTon + + ", wasteRockTon=" + wasteRockTon + + ", dilutionRate=" + dilutionRate + + ", lossRate=" + lossRate + + ", allocationTon=" + allocationTon + + ", beizhu='" + beizhu + '\'' + + '}'; } } diff --git a/src/main/java/com/jdc/jdcproject/entity/VO/DicekeTotalMiningVo.java b/src/main/java/com/jdc/jdcproject/entity/VO/DicekeTotalMiningVo.java index 2f9ee14..e9998d0 100644 --- a/src/main/java/com/jdc/jdcproject/entity/VO/DicekeTotalMiningVo.java +++ b/src/main/java/com/jdc/jdcproject/entity/VO/DicekeTotalMiningVo.java @@ -10,11 +10,15 @@ public class DicekeTotalMiningVo { private static final long serialVersionUID = 1L; - @Schema(description = "平盘名称") - private String plateRange; + @Schema(description = "TotalID") /*传LossID,涉及修改或删除Loss表*/ + @TableId("TotalID") + private String TotalID; - @Schema(description = "铲号") - private String shovelCode; + @Schema(description = "外键关联平盘表") + private String plateID; + + @Schema(description = "外键关联铲号表") + private String shovelID; @Schema(description = "备注") private String beizhu; @@ -34,16 +38,18 @@ public class DicekeTotalMiningVo { @Schema(description = "月份") private LocalDate month; - public DicekeTotalMiningVo(String plateRange, - String shovelCode, + public DicekeTotalMiningVo(String totalID, + String plateID, + String shovelID, String beizhu, String UOM, Double oreYield, Double strippingTon, Double strippingAndTotalMiningTon, LocalDate month) { - this.plateRange = plateRange; - this.shovelCode = shovelCode; + TotalID = totalID; + this.plateID = plateID; + this.shovelID = shovelID; this.beizhu = beizhu; this.UOM = UOM; OreYield = oreYield; @@ -55,8 +61,9 @@ public class DicekeTotalMiningVo { @Override public String toString() { return "DicekeTotalMiningVo{" + - "plateRange='" + plateRange + '\'' + - ", shovelCode='" + shovelCode + '\'' + + "TotalID='" + TotalID + '\'' + + ", plateID='" + plateID + '\'' + + ", shovelID='" + shovelID + '\'' + ", beizhu='" + beizhu + '\'' + ", UOM='" + UOM + '\'' + ", OreYield=" + OreYield + diff --git a/src/main/java/com/jdc/jdcproject/mapper/DicekeMininglossMapper.java b/src/main/java/com/jdc/jdcproject/mapper/DicekeMininglossMapper.java index 237ed6f..3ed53c1 100644 --- a/src/main/java/com/jdc/jdcproject/mapper/DicekeMininglossMapper.java +++ b/src/main/java/com/jdc/jdcproject/mapper/DicekeMininglossMapper.java @@ -3,6 +3,7 @@ package com.jdc.jdcproject.mapper; import com.jdc.jdcproject.entity.DicekeMiningloss; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jdc.jdcproject.entity.VO.DicekeMininglossVo; +import com.jdc.jdcproject.entity.VO.DicekeTotalMiningVo; import org.apache.ibatis.annotations.Mapper; import java.time.LocalDate; @@ -26,4 +27,7 @@ public interface DicekeMininglossMapper extends BaseMapper { List findLossByMonth(int monthV,int year); + + + } diff --git a/src/main/java/com/jdc/jdcproject/service/impl/DicekeTotalMiningServiceImpl.java b/src/main/java/com/jdc/jdcproject/service/impl/DicekeTotalMiningServiceImpl.java index d2ca7ae..72bd996 100644 --- a/src/main/java/com/jdc/jdcproject/service/impl/DicekeTotalMiningServiceImpl.java +++ b/src/main/java/com/jdc/jdcproject/service/impl/DicekeTotalMiningServiceImpl.java @@ -30,6 +30,7 @@ public class DicekeTotalMiningServiceImpl extends ServiceImpl totalMiningList = new ArrayList<>(); //将mininglossListt赋值给totalMiningList for (DicekeMininglossVo dmlVoLItem : mininglossVoList){ + String TotalID = dmlVoLItem.getLossID(); String plateR = dmlVoLItem.getPlateRange(); String shovelC = dmlVoLItem.getShovelCode(); String beiZ = dmlVoLItem.getBeizhu(); @@ -40,7 +41,7 @@ public class DicekeTotalMiningServiceImpl extends ServiceImpl