From 40c26fce2913f1385bb4aabd19d4b8ef3279840d Mon Sep 17 00:00:00 2001 From: syruan <15555146157@163.com> Date: Tue, 21 Oct 2025 18:00:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=AF=BC=E5=87=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SltAgreementInfoController.java | 115 +++++++++--------- .../settlement/domain/vo/SltLeaseInfo.java | 1 + 2 files changed, 59 insertions(+), 57 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java index d50a5c89..a5d80f0e 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java @@ -465,9 +465,7 @@ public class SltAgreementInfoController extends BaseController { // 创建一个SimpleDateFormat对象，定义日期格式 SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); Map maps = new LinkedHashMap<>(); - if(type==1){ -// maps.put("unitName", bean.getUnitName()); -// maps.put("projectName", bean.getProjectName()); + if (type == 1) { if (flag==0){ maps.put("typeName", bean.getTypeName()); maps.put("modelName", bean.getModelName()); @@ -490,17 +488,19 @@ public class SltAgreementInfoController extends BaseController { maps.put("costs", bean.getCosts().setScale(2, RoundingMode.HALF_UP)); maps.put("t1", ""); } - }else if(type==2) { + } else if(type == 2) { if(flag==0){ maps.put("typeName", bean.getTypeName()); maps.put("modelName", bean.getModelName()); maps.put("mtUnitName", bean.getMtUnitName()); + maps.put("buyPrice", bean.getBuyPrice()); maps.put("num", bean.getNum()); maps.put("costs", bean.getCosts()); }else{ maps.put("typeName", bean.getTypeName()); maps.put("modelName", bean.getModelName()); maps.put("mtUnitName", bean.getMtUnitName()); + maps.put("buyPrice", bean.getBuyPrice()); maps.put("num", bean.getNum()); maps.put("costs", bean.getCosts()); maps.put("t1", ""); @@ -509,57 +509,59 @@ public class SltAgreementInfoController extends BaseController { maps.put("t4", ""); maps.put("t5", ""); } - }else if(type==3){ - if(flag==0){ + } else if (type == 3) { + if (flag==0) { maps.put("typeName", bean.getTypeName()); maps.put("modelName", bean.getModelName()); maps.put("mtUnitName", bean.getMtUnitName()); maps.put("num", bean.getNum()); maps.put("partType", bean.getPartType()); maps.put("costs", bean.getCosts()); - }else{ - maps.put("typeName", bean.getTypeName()); - maps.put("modelName", bean.getModelName()); - maps.put("mtUnitName", bean.getMtUnitName()); - maps.put("num", bean.getNum()); - maps.put("partType", bean.getPartType()); - maps.put("costs", bean.getCosts()); - maps.put("t1", ""); - maps.put("t2", ""); - maps.put("t3", ""); - maps.put("t4", ""); + } else { + maps.put("typeName", bean.getTypeName()); + maps.put("modelName", bean.getModelName()); + maps.put("mtUnitName", bean.getMtUnitName()); + maps.put("num", bean.getNum()); + maps.put("partType", bean.getPartType()); + maps.put("costs", bean.getCosts()); + maps.put("t1", ""); + maps.put("t2", ""); + maps.put("t3", ""); + maps.put("t4", ""); } - }else if(type==4){ - if(flag==0){ - maps.put("typeName", bean.getTypeName()); - maps.put("modelName", bean.getModelName()); - maps.put("mtUnitName", bean.getMtUnitName()); - maps.put("num", bean.getNum()); - maps.put("partType", bean.getPartType()); - maps.put("costs", bean.getCosts()); - }else{ - maps.put("typeName", bean.getTypeName()); - maps.put("modelName", bean.getModelName()); - maps.put("mtUnitName", bean.getMtUnitName()); - maps.put("num", bean.getNum()); - maps.put("partType", bean.getPartType()); - maps.put("costs", bean.getCosts()); - maps.put("t1", ""); - maps.put("t2", ""); - maps.put("t3", ""); - maps.put("t4", ""); - } - } else if(type==5){ - maps.put("typeName", bean.getTypeName()); - maps.put("modelName", bean.getModelName()); - maps.put("mtUnitName", bean.getUnitName()); - maps.put("leasePrice", bean.getLeasePrice()); - maps.put("num", bean.getReduceNum()); - maps.put("startTime", bean.getStartTime()==null ? null:dateFormat.format(bean.getStartTime())); - maps.put("endTime", bean.getEndTime()==null ? null:dateFormat.format(bean.getEndTime())); - maps.put("leaseDays", bean.getDays()); - maps.put("remark", bean.getRemark()); - maps.put("costs", bean.getLeaseMoney().setScale(2, RoundingMode.HALF_UP)); + } else if (type == 4) { + if (flag == 0) { + maps.put("typeName", bean.getTypeName()); + maps.put("modelName", bean.getModelName()); + maps.put("mtUnitName", bean.getMtUnitName()); + maps.put("buyPrice", bean.getBuyPrice()); + maps.put("num", bean.getNum()); + maps.put("partType", bean.getPartType()); + maps.put("costs", bean.getCosts()); + } else { + maps.put("typeName", bean.getTypeName()); + maps.put("modelName", bean.getModelName()); + maps.put("mtUnitName", bean.getMtUnitName()); + maps.put("buyPrice", bean.getBuyPrice()); + maps.put("num", bean.getNum()); + maps.put("partType", bean.getPartType()); + maps.put("costs", bean.getCosts()); + maps.put("t1", ""); + maps.put("t2", ""); + maps.put("t3", ""); + maps.put("t4", ""); + } + } else if (type == 5) { + maps.put("typeName", bean.getTypeName()); + maps.put("modelName", bean.getModelName()); + maps.put("mtUnitName", bean.getUnitName()); + maps.put("leasePrice", bean.getLeasePrice()); + maps.put("num", bean.getReduceNum()); + maps.put("startTime", bean.getStartTime()==null ? null:dateFormat.format(bean.getStartTime())); + maps.put("endTime", bean.getEndTime()==null ? null:dateFormat.format(bean.getEndTime())); + maps.put("leaseDays", bean.getDays()); + maps.put("remark", bean.getRemark()); + maps.put("costs", bean.getLeaseMoney().setScale(2, RoundingMode.HALF_UP)); } return maps; } @@ -571,9 +573,6 @@ public class SltAgreementInfoController extends BaseController { private List receiveDetailsHeader(int type,int flag) { ArrayList list = new ArrayList(); if(type==1){ -// list.add("结算单位"); -// list.add("结算工程"); - if (flag==0){ list.add("设备名称"); list.add("规格型号"); @@ -601,12 +600,14 @@ public class SltAgreementInfoController extends BaseController { list.add("设备名称"); list.add("规格型号"); list.add("计量单位"); + list.add("扣款单价"); list.add("丢失数量"); list.add("丢失费用（元）"); }else{ list.add("设备名称"); list.add("规格型号"); list.add("计量单位"); + list.add("扣款单价"); list.add("丢失数量"); list.add("丢失费用（元）"); list.add(" "); @@ -641,6 +642,7 @@ public class SltAgreementInfoController extends BaseController { list.add("设备名称"); list.add("规格型号"); list.add("计量单位"); + list.add("扣款单价"); list.add("报废数量"); list.add("是否收费"); list.add("报废费用（元）"); @@ -648,6 +650,7 @@ public class SltAgreementInfoController extends BaseController { list.add("设备名称"); list.add("规格型号"); list.add("计量单位"); + list.add("扣款单价"); list.add("报废数量"); list.add("是否收费"); list.add("报废费用（元）"); @@ -747,21 +750,19 @@ public class SltAgreementInfoController extends BaseController { } String projectName = handleData(projectNames); String unitName = handleData(unitNames); - BigDecimal totalCost = BigDecimal.valueOf(0.00); + BigDecimal totalCost = BigDecimal.ZERO; for (SltAgreementInfo bean : loseList) { if (null == bean.getBuyPrice()) { - bean.setBuyPrice(BigDecimal.valueOf(0.00)); + bean.setBuyPrice(BigDecimal.ZERO); } if (null == bean.getNum()) { - bean.setNum(BigDecimal.valueOf(0L)); + bean.setNum(BigDecimal.ZERO); } BigDecimal buyPrice = bean.getBuyPrice(); BigDecimal num = bean.getNum(); // 原价 x 数量 BigDecimal costs = buyPrice.multiply(num); - if(costs!=null){ - totalCost = totalCost.add(costs); - } + totalCost = totalCost.add(costs); //计算租赁费用 bean.setCosts(costs); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/vo/SltLeaseInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/vo/SltLeaseInfo.java index 385436ff..fcdd1f9d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/vo/SltLeaseInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/vo/SltLeaseInfo.java @@ -135,6 +135,7 @@ public class SltLeaseInfo extends BaseEntity { /** 原值 */ @ApiModelProperty(value = "原值") + @Excel(name = "扣款单价") private BigDecimal buyPrice; private BigDecimal reduceNum;