From 8cbccd557aae2f057f8dde50e78d21789cb501d6 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Mon, 2 Sep 2024 17:48:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=B8=AD=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E3=80=81=E6=95=B0=E9=87=8F=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/base/api/domain/LeaseOutDetails.java | 6 +- .../sgzb/base/api/domain/MaInputRecord.java | 6 +- .../bonus/sgzb/base/api/domain/MaType.java | 368 +----------------- .../base/api/domain/SltAgreementDetails.java | 3 +- .../base/api/domain/SltAgreementInfo.java | 18 +- .../sgzb/app/domain/InputApplyDetails.java | 6 +- .../sgzb/app/domain/PurchaseCheckDetails.java | 6 +- .../sgzb/app/mapper/PurchaseInputMapper.java | 2 +- .../impl/LeaseOutDetailsServiceImpl.java | 14 +- .../impl/PurchaseInputServiceImpl.java | 10 +- .../bonus/sgzb/base/domain/MaPartType.java | 3 +- .../com/bonus/sgzb/base/domain/MapType.java | 3 +- .../sgzb/base/domain/RepairApplyRecord.java | 3 +- .../sgzb/base/domain/RepairPartDetails.java | 6 +- .../bonus/sgzb/base/mapper/RepairMapper.java | 2 +- .../base/service/impl/ExcelServiceImpl.java | 3 +- .../base/service/impl/RepairServiceImpl.java | 14 +- .../sgzb/material/domain/AgreementInfo.java | 3 +- .../material/domain/InputApplyDetails.java | 6 +- .../material/domain/LeaseApplyDetails.java | 8 +- .../material/domain/ProjectMonthCosts.java | 3 +- .../material/domain/ProjectMonthDetail.java | 13 +- .../material/domain/PurchaseCheckDetails.java | 24 +- .../material/domain/PurchasePartDetails.java | 24 +- .../material/domain/PurchasePartInfo.java | 19 +- .../mapper/PurchaseAccessoryMapper.java | 2 +- .../mapper/PurchaseCheckDetailsMapper.java | 2 +- .../remind/service/CalcMonthlyServiceImp.java | 16 +- .../impl/PurchaseMacodeInfoServiceImpl.java | 35 +- .../impl/SltAgreementInfoServiceImpl.java | 104 ++--- .../mapper/base/MaTypeHisPriceMapper.xml | 2 +- .../resources/mapper/base/RepairMapper.xml | 4 +- 32 files changed, 195 insertions(+), 543 deletions(-) diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java index 40c2e99..8cbede7 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java @@ -90,19 +90,19 @@ public class LeaseOutDetails implements Serializable { * 预领数量 */ @ApiModelProperty(value = "预领数量") - private Double preNum; + private Integer preNum; /** * 审批数量 */ @ApiModelProperty(value = "审批数量") - private Double auditNum; + private Integer auditNum; /** * 出库数量 */ @ApiModelProperty(value = "出库数量") - private Double outNum; + private Integer outNum; /** * 出库类型 diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaInputRecord.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaInputRecord.java index 79046c6..03d4f3e 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaInputRecord.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaInputRecord.java @@ -49,7 +49,7 @@ public class MaInputRecord extends BaseEntity /** 入库数量 */ @ApiModelProperty(value = "入库数量") - private BigDecimal inputNum; + private Integer inputNum; /** 状态（0删除，1正常） */ @ApiModelProperty(value = "状态 0=删除，1正常") @@ -125,12 +125,12 @@ public class MaInputRecord extends BaseEntity this.num = num; } - public void setInputNum(BigDecimal inputNum) + public void setInputNum(Integer inputNum) { this.inputNum = inputNum; } - public BigDecimal getInputNum() + public Integer getInputNum() { return inputNum; } diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java index 4d1755c..6d2f790 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java @@ -52,7 +52,7 @@ public class MaType extends BaseEntity { /** 实时库存 */ @ApiModelProperty(value = "实时库存") - private BigDecimal num; + private Integer num; /** 计量单位id */ @ApiModelProperty(value = "计量单位id") @@ -70,7 +70,7 @@ public class MaType extends BaseEntity { /** 租赁单价 */ @ApiModelProperty(value = "租赁单价") @Excel(name = "租赁价格") - private String leasePrice; + private BigDecimal leasePrice; /** 租赁单价 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @@ -78,18 +78,18 @@ public class MaType extends BaseEntity { private Date effTime; @ApiModelProperty(value = "外部价格") - private String rentPrice; - private String finalPrice; + private BigDecimal rentPrice; + private BigDecimal finalPrice; /** 原价 */ @ApiModelProperty(value = "原价") @Excel(name = "原值") - private String buyPrice; + private BigDecimal buyPrice; /** 丢失赔偿价 */ @ApiModelProperty(value = "丢失|赔偿价") @Excel(name = "丢失赔偿价") - private String payPrice; + private BigDecimal payPrice; /** 层级 */ @ApiModelProperty(value = "层级") @@ -208,360 +208,4 @@ public class MaType extends BaseEntity { */ @ApiModelProperty(value = "厂家规格型号") private String facModel; - - - - public Long getTypeId() { - return typeId; - } - - public void setTypeId(Long typeId) { - this.typeId = typeId; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - - public Long getParentId() { - return parentId; - } - - public void setParentId(Long parentId) { - this.parentId = parentId; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public BigDecimal getNum() { - return num; - } - - public void setNum(BigDecimal num) { - this.num = num; - } - - public String getUnitId() { - return unitId; - } - - public void setUnitId(String unitId) { - this.unitId = unitId; - } - - public String getManageType() { - return manageType; - } - - public void setManageType(String manageType) { - this.manageType = manageType; - } - - public String getLeasePrice() { - return leasePrice; - } - - public void setLeasePrice(String leasePrice) { - this.leasePrice = leasePrice; - } - - public String getBuyPrice() { - return buyPrice; - } - - public void setBuyPrice(String buyPrice) { - this.buyPrice = buyPrice; - } - - public String getPayPrice() { - return payPrice; - } - - public String getRentPrice() { - return rentPrice; - } - - public void setRentPrice(String rentPrice) { - this.rentPrice = rentPrice; - } - - public void setPayPrice(String payPrice) { - this.payPrice = payPrice; - } - - public String getLevel() { - return level; - } - - public void setLevel(String level) { - this.level = level; - } - - public String getRatedLoad() { - return ratedLoad; - } - - public void setRatedLoad(String ratedLoad) { - this.ratedLoad = ratedLoad; - } - - public String getTestLoad() { - return testLoad; - } - - public void setTestLoad(String testLoad) { - this.testLoad = testLoad; - } - - public String getHoldingTime() { - return holdingTime; - } - - public void setHoldingTime(String holdingTime) { - this.holdingTime = holdingTime; - } - - public String getWarnNum() { - return warnNum; - } - - public void setWarnNum(String warnNum) { - this.warnNum = warnNum; - } - - public String getDelFlag() { - return delFlag; - } - - public void setDelFlag(String delFlag) { - this.delFlag = delFlag; - } - - @Override - public String getCreateBy() { - return createBy; - } - - @Override - public void setCreateBy(String createBy) { - this.createBy = createBy; - } - - @Override - public Date getCreateTime() { - return createTime; - } - - @Override - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - @Override - public String getUpdateBy() { - return updateBy; - } - - @Override - public void setUpdateBy(String updateBy) { - this.updateBy = updateBy; - } - - @Override - public Date getUpdateTime() { - return updateTime; - } - - @Override - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } - - @Override - public String getRemark() { - return remark; - } - - @Override - public void setRemark(String remark) { - this.remark = remark; - } - - public String getCompanyId() { - return companyId; - } - - public void setCompanyId(String companyId) { - this.companyId = companyId; - } - - public String getPhotoName() { - return photoName; - } - - public void setPhotoName(String photoName) { - this.photoName = photoName; - } - - public String getPhotoUrl() { - return photoUrl; - } - - public void setPhotoUrl(String photoUrl) { - this.photoUrl = photoUrl; - } - - public String getDocumentName() { - return documentName; - } - - public void setDocumentName(String documentName) { - this.documentName = documentName; - } - - public String getDocumentUrl() { - return documentUrl; - } - - public void setDocumentUrl(String documentUrl) { - this.documentUrl = documentUrl; - } - - public String getIsPlan() { - return isPlan; - } - - public void setIsPlan(String isPlan) { - this.isPlan = isPlan; - } - - public String getIsAncuo() { - return isAncuo; - } - - public void setIsAncuo(String isAncuo) { - this.isAncuo = isAncuo; - } - - public long getKeeperUserId() { - return keeperUserId; - } - - public void setKeeperUserId(long keeperUserId) { - this.keeperUserId = keeperUserId; - } - - public String getKeeperUserName() { - return keeperUserName; - } - - public void setKeeperUserName(String keeperUserName) { - this.keeperUserName = keeperUserName; - } - - public long getRepairUserId() { - return repairUserId; - } - - public void setRepairUserId(long repairUserId) { - this.repairUserId = repairUserId; - } - - public String getRepairUserName() { - return repairUserName; - } - - public void setRepairUserName(String repairUserName) { - this.repairUserName = repairUserName; - } - - public long getPropId() { - return propId; - } - - public void setPropId(long propId) { - this.propId = propId; - } - - public String getPropName() { - return propName; - } - - public void setPropName(String propName) { - this.propName = propName; - } - - public List getChildren() { - return children; - } - - public void setChildren(List children) { - this.children = children; - } - - public String getUnitName() { - return unitName; - } - - public void setUnitName(String unitName) { - this.unitName = unitName; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - - public Date getEffTime() { - return effTime; - } - - public void setEffTime(Date effTime) { - this.effTime = effTime; - } - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code; - } - - public String getFinalPrice() { - return finalPrice; - } - - public void setFinalPrice(String finalPrice) { - this.finalPrice = finalPrice; - } - - public String getFacModel() { - return facModel; - } - - public void setFacModel(String facModel) { - this.facModel = facModel; - } } diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementDetails.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementDetails.java index 49054f4..6068152 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementDetails.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementDetails.java @@ -2,6 +2,7 @@ package com.bonus.sgzb.base.api.domain; import lombok.Data; +import java.math.BigDecimal; import java.util.List; /** @@ -45,7 +46,7 @@ public class SltAgreementDetails { /** *单价 */ - private String price; + private BigDecimal price; /** *金额 */ diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java index 5bd3751..9e75789 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java @@ -48,13 +48,13 @@ public class SltAgreementInfo { /** * 配件单价 */ - private String partPrice; + private BigDecimal partPrice; /** * 领料数量 */ // @Excel(name = "数量",sort = 4) @ExcelProperty(index = 4, value = "数量") - private String num; + private Integer num; /** * 领料时间 */ @@ -78,7 +78,7 @@ public class SltAgreementInfo { /** * 配件数量 */ - private String partNum; + private Integer partNum; /** * 退料id */ @@ -88,11 +88,11 @@ public class SltAgreementInfo { */ // @Excel(name = "台班费单价（元/天）",sort = 5) @ExcelProperty(index = 5, value = "台班费单价（元/天）") - private String leasePrice; + private BigDecimal leasePrice; /** * 原值 */ - private String buyPrice; + private BigDecimal buyPrice; /** * */ @@ -138,21 +138,21 @@ public class SltAgreementInfo { */ // @Excel(name = "结算金额",sort = 9) @ExcelProperty(index = 9, value = "结算金额") - private String costs; + private BigDecimal costs; /** * 配件总价 */ - private String partAllCosts; + private BigDecimal partAllCosts; /** * 总价 */ - private String allCosts; + private BigDecimal allCosts; /** * 真实租赁费用 */ // @Excel(name = "本月暂计金额",sort = 10) @ExcelProperty(index = 10, value = "本月暂计金额") - private String realCosts; + private BigDecimal realCosts; /** * 类型（0不收费，1收费） */ diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/InputApplyDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/InputApplyDetails.java index 8d86b31..f0221c5 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/InputApplyDetails.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/InputApplyDetails.java @@ -38,7 +38,7 @@ public class InputApplyDetails extends BaseEntity /** 入库数量 */ @Excel(name = "入库数量") - private BigDecimal inputNum; + private Integer inputNum; /** 入库类型（1新购，2退料，3修试后，4盘点） */ @Excel(name = "入库类型", readConverterExp = "1=新购，2退料，3修试后，4盘点") @@ -93,12 +93,12 @@ public class InputApplyDetails extends BaseEntity { return parentId; } - public void setInputNum(BigDecimal inputNum) + public void setInputNum(Integer inputNum) { this.inputNum = inputNum; } - public BigDecimal getInputNum() + public Integer getInputNum() { return inputNum; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/PurchaseCheckDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/PurchaseCheckDetails.java index f8dd498..1c7694b 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/PurchaseCheckDetails.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/PurchaseCheckDetails.java @@ -69,7 +69,7 @@ public class PurchaseCheckDetails extends BaseEntity /** 入库数量 */ @ApiModelProperty(value = "入库数量") - private BigDecimal inputNum; + private Integer inputNum; /** 验收图片 */ @ApiModelProperty(value = "验收图片") @@ -267,11 +267,11 @@ public class PurchaseCheckDetails extends BaseEntity this.machineTypeName = machineTypeName; } - public BigDecimal getInputNum() { + public Integer getInputNum() { return inputNum; } - public void setInputNum(BigDecimal inputNum) { + public void setInputNum(Integer inputNum) { this.inputNum = inputNum; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/PurchaseInputMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/PurchaseInputMapper.java index 5ec2667..3535ce7 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/PurchaseInputMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/PurchaseInputMapper.java @@ -71,7 +71,7 @@ public interface PurchaseInputMapper { * @param typeId 查询条件 * @return 结果 */ - BigDecimal selectInputNumByTypeId(@Param("taskId") Long taskId, @Param("typeId") Long typeId); + Integer selectInputNumByTypeId(@Param("taskId") Long taskId, @Param("typeId") Long typeId); /** * 修改 diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java index b52742a..cec8cd3 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java @@ -153,7 +153,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { record.setPreStoreNum(getStorageNum(record)); if (res > 0) { if ((record.getManageType() == 1 || record.getManageType() == 2) && record.getInputNum() != null) { - record.setOutNum(record.getInputNum().doubleValue()); + record.setOutNum(record.getInputNum()); } //2、判断成套机具出库库存是否足够 if (record.getManageType() == 2) { @@ -274,7 +274,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { } if (record.getOutNum() == null || record.getOutNum() < outNum) { - record.setOutNum(0.00); + record.setOutNum(0); } //判断(ma_type 设备规格表)中的库存够不够出库的 MaType maType = leaseOutDetailsMapper.selectByTypeId(record); @@ -285,7 +285,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { return 0; } } else if ("1".equals(maType.getManageType())) { - if (maType.getNum() == null || maType.getNum().compareTo(BigDecimal.valueOf(record.getOutNum())) < 0) { + if (maType.getNum() == null || maType.getNum().compareTo(record.getOutNum()) < 0) { return 0; } } @@ -301,7 +301,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { } if (record.getOutNum() == null || record.getOutNum() < outNum) { - record.setOutNum(0.00); + record.setOutNum(0); } //先判断成套机具的库存是否足够 int num = leaseOutDetailsMapper.getmaChineByCt(record); @@ -350,9 +350,9 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { int res = 0; SltAgreementInfo sltAgreementInfo = leaseOutDetailsMapper.getSltAgreementInfo(record); if (sltAgreementInfo != null) { - double num = Double.parseDouble(sltAgreementInfo.getNum()); - double outNum = record.getOutNum(); - sltAgreementInfo.setNum(String.valueOf(num + outNum)); + Integer num = sltAgreementInfo.getNum(); + Integer outNum = record.getOutNum(); + sltAgreementInfo.setNum(num + outNum); res = leaseOutDetailsMapper.updSltInfo(sltAgreementInfo); } else { String agreementId = leaseOutDetailsMapper.getAgreementId(taskId); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/PurchaseInputServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/PurchaseInputServiceImpl.java index 2cb4dd3..87ac4c9 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/PurchaseInputServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/PurchaseInputServiceImpl.java @@ -70,15 +70,15 @@ public class PurchaseInputServiceImpl implements PurchaseInputService { // 修改编码管理的入库状态 MaType maType = purchaseInputMapper.selectTypeByTypeId(typeId); // 库存添加 - maType.setNum((maInputRecord.getInputNum() == null ? new BigDecimal(0) : maInputRecord.getInputNum()) - .add(maType.getNum() == null ? new BigDecimal(0) : maType.getNum())); + maType.setNum((maInputRecord.getInputNum() == null ? 0 : maInputRecord.getInputNum()) + + (maType.getNum() == null ? 0 : maType.getNum())); purchaseInputMapper.updateTypeByTypeId(maType); - BigDecimal inputNum = purchaseInputMapper.selectInputNumByTypeId(taskId, typeId); + Integer inputNum = purchaseInputMapper.selectInputNumByTypeId(taskId, typeId); PurchaseCheckDetails purchaseCheckDetails = new PurchaseCheckDetails(); purchaseCheckDetails.setTaskId(taskId); purchaseCheckDetails.setTypeId(typeId); - purchaseCheckDetails.setInputNum(inputNum.add(maInputRecord.getInputNum() == null ? new BigDecimal(0) : maInputRecord.getInputNum())); + purchaseCheckDetails.setInputNum(inputNum + (maInputRecord.getInputNum() == null ? 0 : maInputRecord.getInputNum())); purchaseCheckDetails.setStatus(4); purchaseInputMapper.updateByTaskIdTypeId(purchaseCheckDetails); @@ -86,7 +86,7 @@ public class PurchaseInputServiceImpl implements PurchaseInputService { InputApplyDetails applyDetails = new InputApplyDetails(); applyDetails.setTaskId(taskId); applyDetails.setTypeId(typeId); - applyDetails.setInputNum(maInputRecord.getInputNum() == null ? new BigDecimal(0) : maInputRecord.getInputNum()); + applyDetails.setInputNum(maInputRecord.getInputNum() == null ? 0 : maInputRecord.getInputNum()); applyDetails.setMaId(maInputRecord.getMaId()); applyDetails.setInputType("1"); applyDetails.setCreateTime(new Date()); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/MaPartType.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/MaPartType.java index 495c464..d5696f1 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/MaPartType.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/MaPartType.java @@ -4,6 +4,7 @@ import com.bonus.sgzb.common.core.annotation.Excel; import com.bonus.sgzb.common.core.web.domain.BaseEntity; import lombok.Data; +import java.math.BigDecimal; import java.util.Date; /** @@ -44,7 +45,7 @@ public class MaPartType extends BaseEntity { //原值 @Excel(name = "原值") - private String buyPrice; + private BigDecimal buyPrice; //层级 @Excel(name = "层级") diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/MapType.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/MapType.java index c26b5b3..4866a98 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/MapType.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/MapType.java @@ -4,6 +4,7 @@ import com.bonus.sgzb.common.core.annotation.Excel; import com.bonus.sgzb.common.core.web.domain.BaseEntity; import lombok.Data; +import java.math.BigDecimal; import java.util.Objects; /** @@ -26,7 +27,7 @@ public class MapType extends BaseEntity { //原值 @Excel(name = "原值") - private String buyPrice; + private BigDecimal buyPrice; public boolean equals(Object o) { diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/RepairApplyRecord.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/RepairApplyRecord.java index ab0931a..8242fde 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/RepairApplyRecord.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/RepairApplyRecord.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; +import java.math.BigDecimal; import java.util.List; /** @@ -95,7 +96,7 @@ public class RepairApplyRecord implements Serializable { * 配件单价 */ @ApiModelProperty(value = "配件单价") - private String partPrice; + private BigDecimal partPrice; /** * 维修内容 */ diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/RepairPartDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/RepairPartDetails.java index f7d0fad..48d08aa 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/RepairPartDetails.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/RepairPartDetails.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * @author c liu * @date 2023/12/11 @@ -50,12 +52,12 @@ public class RepairPartDetails { * 配件费用 */ @ApiModelProperty(value = "配件费用") - private String partCost; + private BigDecimal partCost; /** * 配件单价 */ @ApiModelProperty(value = "配件单价") - private String partPrice; + private BigDecimal partPrice; /** * 类型（0不收费，1收费） */ diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java index 666bed5..53b1de4 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java @@ -162,5 +162,5 @@ public interface RepairMapper { int addRepairCost(@Param("bean") RepairApplyRecord bean, @Param("costs") BigDecimal costs,@Param("partType") String partType); - String selectPartPrice(Long partId); + BigDecimal selectPartPrice(Long partId); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/ExcelServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/ExcelServiceImpl.java index e2fae7d..de72d16 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/ExcelServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/ExcelServiceImpl.java @@ -12,6 +12,7 @@ import org.springframework.stereotype.Service; import java.io.File; import java.io.FileInputStream; import java.io.IOException; +import java.math.BigDecimal; import java.util.*; @Service @@ -90,7 +91,7 @@ public class ExcelServiceImpl implements ExcelService { MapType thirdLevel = new MapType(); thirdLevel.setPaName(getCellValueAsString(thirdLevelCell)); thirdLevel.setUnitId(getCellValueAsString(fourthLevelCell)); - thirdLevel.setBuyPrice(getCellValueAsString(fifthLevelCell)); + thirdLevel.setBuyPrice(new BigDecimal(getCellValueAsString(fifthLevelCell))); // 检查是否所有三个级别都是空白 if (firstLevel.isEmpty() || secondLevel.isEmpty() || thirdLevel == null) { diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java index 6055677..8a96fbf 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java @@ -102,8 +102,8 @@ public class RepairServiceImpl implements RepairService { for (RepairPartDetails partDetails : partList) { if (partDetails.getPartId() != null) { // 有维修配件时 - if (partDetails.getPartCost() == null || partDetails.getPartCost().isEmpty()) { - partDetails.setPartCost("0"); + if (partDetails.getPartCost() == null) { + partDetails.setPartCost(new BigDecimal(0)); } partDetails.setTaskId(bean.getTaskId()); partDetails.setMaId(bean.getMaId()); @@ -111,7 +111,7 @@ public class RepairServiceImpl implements RepairService { partDetails.setCreateBy(loginUser.getUserid()); partDetails.setCompanyId(bean.getCompanyId()); // 根据partid 找到配件单价 - String partPrice = mapper.selectPartPrice(partDetails.getPartId()); + BigDecimal partPrice = mapper.selectPartPrice(partDetails.getPartId()); partDetails.setPartCost(partPrice); mapper.addPart(partDetails); bean.setPartPrice(partDetails.getPartCost()); @@ -135,8 +135,8 @@ public class RepairServiceImpl implements RepairService { } else { bean.setSupplierId(partList.get(0).getSupplierId()); } - if (partList.get(0).getPartPrice() == null || partList.get(0).getPartPrice().isEmpty()) { - bean.setPartPrice("0"); + if (partList.get(0).getPartPrice() == null) { + bean.setPartPrice(new BigDecimal(0)); } else { bean.setPartPrice(partList.get(0).getPartPrice()); } @@ -144,8 +144,8 @@ public class RepairServiceImpl implements RepairService { mapper.addRecord(bean); } for (RepairPartDetails partDetails : partList) { - if (StringUtils.isNotBlank(partDetails.getPartCost())) { - BigDecimal partCost = new BigDecimal(partDetails.getPartCost()); + if (partDetails.getPartCost() != null) { + BigDecimal partCost = partDetails.getPartCost(); BigDecimal partNumber = new BigDecimal(partDetails.getPartNum()); sfCosts = sfCosts.add(partCost.multiply(partNumber)); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/AgreementInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/AgreementInfo.java index 89dedb1..4f0e44c 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/AgreementInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/AgreementInfo.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -133,7 +134,7 @@ public class AgreementInfo extends BaseEntity { @ApiModelProperty(value = "协议类型(1内部单位 2外部单位)") private Integer protocol; @ApiModelProperty(value = "结算总费用") - private String cost; + private BigDecimal cost; @ApiModelProperty(value = "费用承担方(01项目,03分包)") private String costBearingParty; private String codeNum; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/InputApplyDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/InputApplyDetails.java index 97d431f..2fcb38b 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/InputApplyDetails.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/InputApplyDetails.java @@ -37,7 +37,7 @@ public class InputApplyDetails extends BaseEntity /** 入库数量 */ @Excel(name = "入库数量") - private BigDecimal inputNum; + private Integer inputNum; /** 入库类型（1新购，2退料，3修试后，4盘点） */ @Excel(name = "入库类型", readConverterExp = "1=新购，2退料，3修试后，4盘点") @@ -92,12 +92,12 @@ public class InputApplyDetails extends BaseEntity { return parentId; } - public void setInputNum(BigDecimal inputNum) + public void setInputNum(Integer inputNum) { this.inputNum = inputNum; } - public BigDecimal getInputNum() + public Integer getInputNum() { return inputNum; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseApplyDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseApplyDetails.java index be73efd..d9732d6 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseApplyDetails.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseApplyDetails.java @@ -59,23 +59,23 @@ public class LeaseApplyDetails implements Serializable { * 预领料数 */ @ApiModelProperty(value = "预领料数") - private Double preNum; + private Integer preNum; /** * 已领数量 */ @ApiModelProperty(value = "已领数量") - private Double alNum; + private Integer alNum; /** * 此数量是剩余需要出库的数量（preNum - alNum） */ @ApiModelProperty(value = "剩余最大出库数量") - private Double outNum; + private Integer outNum; /** 审批数量 */ @ApiModelProperty(value = "审批数量") - private Double auditNum; + private Integer auditNum; /** * 状态（待审批，进行中，已出库） diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ProjectMonthCosts.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ProjectMonthCosts.java index f9de886..eae35a7 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ProjectMonthCosts.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ProjectMonthCosts.java @@ -2,6 +2,7 @@ package com.bonus.sgzb.material.domain; import lombok.Data; +import java.math.BigDecimal; import java.util.List; /** @@ -46,7 +47,7 @@ public class ProjectMonthCosts { /** * 结算金额 */ - private String costs; + private BigDecimal costs; private List node; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ProjectMonthDetail.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ProjectMonthDetail.java index 3ac12f2..1576e31 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ProjectMonthDetail.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ProjectMonthDetail.java @@ -2,6 +2,7 @@ package com.bonus.sgzb.material.domain; import lombok.Data; +import java.math.BigDecimal; import java.util.Date; /** @@ -41,11 +42,11 @@ public class ProjectMonthDetail { /** * 结算金额 */ - private String sltCosts; + private BigDecimal sltCosts; /** * 本月暂计金额 */ - private String monthTemporarilyCosts; + private BigDecimal monthTemporarilyCosts; /** * 月结算关联id */ @@ -53,7 +54,7 @@ public class ProjectMonthDetail { /** * 数量 */ - private String num; + private Integer num; /** * 结算月份 */ @@ -61,13 +62,13 @@ public class ProjectMonthDetail { /** * 单价 */ - private String leasePrice; + private BigDecimal leasePrice; /** * 费用承担方(01项目,03分包) */ private String costBearingParty; private String leaseDays; private String nuitName; - private String costs; - private String realCosts; + private BigDecimal costs; + private BigDecimal realCosts; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseCheckDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseCheckDetails.java index f99b3da..f505746 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseCheckDetails.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseCheckDetails.java @@ -33,15 +33,15 @@ public class PurchaseCheckDetails extends BaseEntity /** 采购单价 */ @ApiModelProperty(value = "采购单价") - private String purchasePrice; + private BigDecimal purchasePrice; /** 采购数量 */ @ApiModelProperty(value = "采购数量") - private Long purchaseNum; + private Integer purchaseNum; /** 验收数量 */ @ApiModelProperty(value = "验收数量") - private BigDecimal checkNum; + private Integer checkNum; /** 绑定数量 */ @ApiModelProperty(value = "绑定数量") @@ -70,7 +70,7 @@ public class PurchaseCheckDetails extends BaseEntity /** 入库数量 */ @ApiModelProperty(value = "入库数量") - private BigDecimal inputNum; + private Integer inputNum; /** 验收图片 */ @ApiModelProperty(value = "验收图片") @@ -134,21 +134,21 @@ public class PurchaseCheckDetails extends BaseEntity { return typeId; } - public void setPurchasePrice(String purchasePrice) + public void setPurchasePrice(BigDecimal purchasePrice) { this.purchasePrice = purchasePrice; } - public String getPurchasePrice() + public BigDecimal getPurchasePrice() { return purchasePrice; } - public void setPurchaseNum(Long purchaseNum) + public void setPurchaseNum(Integer purchaseNum) { this.purchaseNum = purchaseNum; } - public Long getPurchaseNum() + public Integer getPurchaseNum() { return purchaseNum; } @@ -204,11 +204,11 @@ public class PurchaseCheckDetails extends BaseEntity this.supplier = supplier; } - public BigDecimal getCheckNum() { + public Integer getCheckNum() { return checkNum; } - public void setCheckNum(BigDecimal checkNum) { + public void setCheckNum(Integer checkNum) { this.checkNum = checkNum; } @@ -268,11 +268,11 @@ public class PurchaseCheckDetails extends BaseEntity this.machineTypeName = machineTypeName; } - public BigDecimal getInputNum() { + public Integer getInputNum() { return inputNum; } - public void setInputNum(BigDecimal inputNum) { + public void setInputNum(Integer inputNum) { this.inputNum = inputNum; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java index 301d04e..ba8d00c 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java @@ -86,16 +86,16 @@ public class PurchasePartDetails extends BaseEntity /** 采购单价 */ @ApiModelProperty(value = "采购单价") - private String purchasePrice; + private BigDecimal purchasePrice; /** 采购数量 */ @ApiModelProperty(value = "采购数量") - private Long purchaseNum; + private Integer purchaseNum; /** 验收数量 */ @ApiModelProperty(value = "验收数量") @Excel(name = "数量") - private BigDecimal checkNum; + private Integer checkNum; /** 绑定数量 */ @ApiModelProperty(value = "绑定数量") @@ -129,7 +129,7 @@ public class PurchasePartDetails extends BaseEntity /** 入库数量 */ @ApiModelProperty(value = "入库数量") - private BigDecimal inputNum; + private Integer inputNum; /** 入库时间 */ @ApiModelProperty(value = "入库时间") @@ -194,21 +194,21 @@ public class PurchasePartDetails extends BaseEntity this.partId = partId; } - public void setPurchasePrice(String purchasePrice) + public void setPurchasePrice(BigDecimal purchasePrice) { this.purchasePrice = purchasePrice; } - public String getPurchasePrice() + public BigDecimal getPurchasePrice() { return purchasePrice; } - public void setPurchaseNum(Long purchaseNum) + public void setPurchaseNum(Integer purchaseNum) { this.purchaseNum = purchaseNum; } - public Long getPurchaseNum() + public Integer getPurchaseNum() { return purchaseNum; } @@ -264,11 +264,11 @@ public class PurchasePartDetails extends BaseEntity this.supplier = supplier; } - public BigDecimal getCheckNum() { + public Integer getCheckNum() { return checkNum; } - public void setCheckNum(BigDecimal checkNum) { + public void setCheckNum(Integer checkNum) { this.checkNum = checkNum; } @@ -336,11 +336,11 @@ public class PurchasePartDetails extends BaseEntity this.machineTypeName = machineTypeName; } - public BigDecimal getInputNum() { + public Integer getInputNum() { return inputNum; } - public void setInputNum(BigDecimal inputNum) { + public void setInputNum(Integer inputNum) { this.inputNum = inputNum; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartInfo.java index 1dab06e..6f1b999 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartInfo.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import java.math.BigDecimal; import java.util.List; /** @@ -65,12 +66,12 @@ public class PurchasePartInfo extends BaseEntity /** 采购单价 */ @ApiModelProperty(value = "采购单价") @Excel(name = "采购单价") - private String purchasePrice; + private BigDecimal purchasePrice; /** 采购数量 */ @ApiModelProperty(value = "采购数量") @Excel(name = "采购数量") - private String purchaseNum; + private Integer purchaseNum; /** 配件厂家 */ @ApiModelProperty(value = "配件厂家") @@ -79,7 +80,7 @@ public class PurchasePartInfo extends BaseEntity /** 验收数量 */ @ApiModelProperty(value = "验收数量") - private String checkNum; + private Integer checkNum; /** 采购状态 */ @ApiModelProperty(value = "采购状态") @@ -260,19 +261,19 @@ public class PurchasePartInfo extends BaseEntity this.supplier = supplier; } - public String getPurchaseNum() { + public Integer getPurchaseNum() { return purchaseNum; } - public void setPurchaseNum(String purchaseNum) { + public void setPurchaseNum(Integer purchaseNum) { this.purchaseNum = purchaseNum; } - public String getCheckNum() { + public Integer getCheckNum() { return checkNum; } - public void setCheckNum(String checkNum) { + public void setCheckNum(Integer checkNum) { this.checkNum = checkNum; } @@ -332,11 +333,11 @@ public class PurchasePartInfo extends BaseEntity this.taskStatusResult = taskStatusResult; } - public String getPurchasePrice() { + public BigDecimal getPurchasePrice() { return purchasePrice; } - public void setPurchasePrice(String purchasePrice) { + public void setPurchasePrice(BigDecimal purchasePrice) { this.purchasePrice = purchasePrice; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseAccessoryMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseAccessoryMapper.java index 7dfdb6e..ba09f81 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseAccessoryMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseAccessoryMapper.java @@ -126,7 +126,7 @@ public interface PurchaseAccessoryMapper * @param inputNum * @return 结果 */ - int updatePartTypeNum(@Param("partId") Long partId,@Param("inputNum") BigDecimal inputNum); + int updatePartTypeNum(@Param("partId") Long partId,@Param("inputNum") Integer inputNum); /** * 查询 diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckDetailsMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckDetailsMapper.java index e5a8e3e..81aea2d 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckDetailsMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckDetailsMapper.java @@ -111,7 +111,7 @@ public interface PurchaseCheckDetailsMapper { * @param typeId * @return */ - BigDecimal selectInputNumByTypeId(@Param("taskId") Long taskId, @Param("typeId") Long typeId); + int selectInputNumByTypeId(@Param("taskId") Long taskId, @Param("typeId") Long typeId); /** * 查询 diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/service/CalcMonthlyServiceImp.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/service/CalcMonthlyServiceImp.java index 3c0cea1..29e3097 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/service/CalcMonthlyServiceImp.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/service/CalcMonthlyServiceImp.java @@ -121,11 +121,11 @@ public class CalcMonthlyServiceImp implements CalcMonthlyService { List leaseList = sltAgreementInfoMapper.getLeaseListOneMonth(agreementInfo, idList); BigDecimal leaseCostOne = BigDecimal.ZERO; for (SltAgreementInfo bean : leaseList) { - if (StringUtils.isEmpty(bean.getLeasePrice())) { - bean.setLeasePrice("0"); + if (bean.getLeasePrice() == null) { + bean.setLeasePrice(new BigDecimal("0")); } - if (StringUtils.isEmpty(bean.getNum())) { - bean.setNum("0"); + if (bean.getNum() == null) { + bean.setNum(0); } if (StringUtils.isEmpty(bean.getLeaseDays())) { bean.setLeaseDays("0"); @@ -133,7 +133,7 @@ public class CalcMonthlyServiceImp implements CalcMonthlyService { if (Objects.isNull(bean.getTrimDay())) { bean.setTrimDay(0); } - BigDecimal leasePrice = new BigDecimal(bean.getLeasePrice()); + BigDecimal leasePrice = bean.getLeasePrice(); BigDecimal num = new BigDecimal(bean.getNum()); BigDecimal leaseDays = new BigDecimal(bean.getLeaseDays()); // 实际结算天数（领料天数 + 调整天数(可以为负整数)） @@ -142,9 +142,9 @@ public class CalcMonthlyServiceImp implements CalcMonthlyService { BigDecimal realCosts = leasePrice.multiply(num).multiply(realDays); // 应结算金额 BigDecimal costs = leasePrice.multiply(num).multiply(leaseDays); - bean.setCosts(String.valueOf(costs)); + bean.setCosts(costs); bean.setRealDays(realDays); - bean.setRealCosts(String.valueOf(realCosts)); + bean.setRealCosts(realCosts); leaseCostOne = leaseCostOne.add(costs); bean.setMonth(sltAgreementInfo.getMonth()); @@ -164,7 +164,7 @@ public class CalcMonthlyServiceImp implements CalcMonthlyService { projectMonthDetail.setProMonthCostId(pmcId); calMonthlyMapper.insertProjectMonthDetail(projectMonthDetail); } - sltAgreementInfo.setCosts(String.valueOf(leaseCostOne)); + sltAgreementInfo.setCosts(leaseCostOne); return leaseList; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java index 6ed8f72..301e054 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java @@ -49,7 +49,6 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService private PurchaseCheckDetailsMapper checkDetailsMapper; - /** * 查询新购验收编号管理 * @@ -70,9 +69,9 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService @Override public List selectPurchaseMacodeInfoList(PurchaseMacodeInfo purchaseMacodeInfo) { List purchaseMacodeInfoList = purchaseMacodeInfoMapper.selectPurchaseMacodeInfoList(purchaseMacodeInfo); - //判断有没有绑定固定资产 - if (purchaseMacodeInfoList.size() > 0/* && purchaseMacodeInfoList.get(0).getFixCode()!=null*/){ - Map groupCounts = purchaseMacodeInfoList.stream().map(PurchaseMacodeInfo::getTypeId).collect(Collectors.groupingBy(String::valueOf, Collectors.counting())); + //判断有没有绑定固定资产 + if (purchaseMacodeInfoList.size() > 0/* && purchaseMacodeInfoList.get(0).getFixCode()!=null*/) { + Map groupCounts = purchaseMacodeInfoList.stream().map(PurchaseMacodeInfo::getTypeId).collect(Collectors.groupingBy(String::valueOf, Collectors.counting())); // 根据 typeId 进行去重 purchaseMacodeInfoList = purchaseMacodeInfoList.stream() // 指定键为 typeId @@ -330,8 +329,8 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService // 修改编码管理的入库状态 MaType maType = purchaseMacodeInfoMapper.selectTypeByTypeId(typeId); // 库存添加 - maType.setNum((maInputRecord.getInputNum() == null ? new BigDecimal(0) : maInputRecord.getInputNum()) - .add(maType.getNum() == null ? new BigDecimal(0) : maType.getNum())); + maType.setNum((maInputRecord.getInputNum() == null ? 0 : maInputRecord.getInputNum()) + + (maType.getNum() == null ? 0 : maType.getNum())); purchaseMacodeInfoMapper.updateTypeByTypeId(maType); if ("0".equals(maType.getManageType())) { //编码设备 @@ -340,7 +339,7 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService } //判断是否是成套机具，是的话配件库存也要增加 - if ("2".equals(maType.getManageType())){ + if ("2".equals(maType.getManageType())) { PurchaseCheckInfo purchaseCheckInfo = new PurchaseCheckInfo(); purchaseCheckInfo.setPurchaseNum(maInputRecord.getInputNum().toString()); purchaseCheckInfo.setTypeId(maInputRecord.getTypeId()); @@ -350,11 +349,11 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService } } - BigDecimal inputNum = checkDetailsMapper.selectInputNumByTypeId(taskId, typeId); + int inputNum = checkDetailsMapper.selectInputNumByTypeId(taskId, typeId); PurchaseCheckDetails purchaseCheckDetails = new PurchaseCheckDetails(); purchaseCheckDetails.setTaskId(taskId); purchaseCheckDetails.setTypeId(typeId); - purchaseCheckDetails.setInputNum(inputNum.add(maInputRecord.getInputNum() == null ? new BigDecimal(0) : maInputRecord.getInputNum())); + purchaseCheckDetails.setInputNum(inputNum + (maInputRecord.getInputNum() == null ? 0 : maInputRecord.getInputNum())); purchaseCheckDetails.setStatus(4); checkDetailsMapper.updateByTaskIdTypeId(purchaseCheckDetails); @@ -362,7 +361,7 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService InputApplyDetails applyDetails = new InputApplyDetails(); applyDetails.setTaskId(taskId); applyDetails.setTypeId(typeId); - applyDetails.setInputNum(maInputRecord.getInputNum() == null ? new BigDecimal(0) : maInputRecord.getInputNum()); + applyDetails.setInputNum(maInputRecord.getInputNum() == null ? 0 : maInputRecord.getInputNum()); applyDetails.setMaId(maInputRecord.getMaId()); applyDetails.setInputType("1"); applyDetails.setCreateTime(new Date()); @@ -384,27 +383,27 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService purchaseMacodeInfoMapper.deleteMaLabelBindByMaId(maInputRecord.getMaId()); //修改purchase_macode_info表 purchaseMacodeInfoMapper.updatetePurchaseMaCodeInfoByMaCodeAndTaskIdAndTypeId(taskId, typeId, maInputRecord.getMaCode()); - if ("1".equals(maInputRecord.getManageType())){ + if ("1".equals(maInputRecord.getManageType())) { //修改purchase_check_details表 checkDetailsMapper.updatePurchaseCheckDetailsByTaskId(taskId, typeId); } } } //判断是否全部已操作（通过或不通过） - int count=purchaseMacodeInfoMapper.isOperateAll(taskId); - if (count<=0){ + int count = purchaseMacodeInfoMapper.isOperateAll(taskId); + if (count <= 0) { //获取该订单下所有的装备信息 - List purchaseCheckDetailsList=checkDetailsMapper.selectPurchaseCheckDetailsByTaskId(taskId); + List purchaseCheckDetailsList = checkDetailsMapper.selectPurchaseCheckDetailsByTaskId(taskId); //判断每种设备的验收数量和绑定数量一致 for (PurchaseCheckDetails purchaseCheckDetails : purchaseCheckDetailsList) { - if (StringUtils.isNotNull(purchaseCheckDetails.getBindNum())){ - if (purchaseCheckDetails.getCheckNum().compareTo(BigDecimal.valueOf(purchaseCheckDetails.getBindNum()))!=0){ + if (StringUtils.isNotNull(purchaseCheckDetails.getBindNum())) { + if (purchaseCheckDetails.getCheckNum().compareTo(purchaseCheckDetails.getBindNum()) != 0) { //全部操作以后如果还有未绑定的，则不改变状态 - count=1; + count = 1; } } } - if (count==0){ + if (count == 0) { //全部审核任务状态改为已审核 TmTask task = new TmTask(); task.setTaskId(taskId); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java index 711c01d..bfa9d9b 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java @@ -89,16 +89,16 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService { if (scrapList != null && scrapList.size() > 0) { for (SltAgreementInfo bean : scrapList) { - if (StringUtils.isEmpty(bean.getBuyPrice())) { - bean.setBuyPrice("0"); + if (bean.getBuyPrice() == null) { + bean.setBuyPrice(new BigDecimal(0)); } - if (StringUtils.isEmpty(bean.getNum())) { - bean.setNum("0"); + if (bean.getNum() == null) { + bean.setNum(0); } - BigDecimal buyPrice = new BigDecimal(bean.getBuyPrice()); + BigDecimal buyPrice = bean.getBuyPrice(); BigDecimal num = new BigDecimal(bean.getNum()); BigDecimal costs = buyPrice.multiply(num); - bean.setCosts(String.valueOf(costs)); + bean.setCosts(costs); } } @@ -146,11 +146,11 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService { leaseList.addAll(oneOfList); } for (SltAgreementInfo bean : leaseList) { - if (StringUtils.isEmpty(bean.getLeasePrice())) { - bean.setLeasePrice("0"); + if (bean.getLeasePrice() == null) { + bean.setLeasePrice(new BigDecimal(0)); } - if (StringUtils.isEmpty(bean.getNum())) { - bean.setNum("0"); + if (bean.getNum() == null) { + bean.setNum(0); } if (StringUtils.isEmpty(bean.getLeaseDays())) { bean.setLeaseDays("0"); @@ -158,11 +158,11 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService { if (Objects.isNull(bean.getTrimDay())) { bean.setTrimDay(0); } - BigDecimal leasePrice = new BigDecimal(bean.getLeasePrice()); + BigDecimal leasePrice = bean.getLeasePrice(); BigDecimal num = new BigDecimal(bean.getNum()); BigDecimal leaseDays = new BigDecimal(bean.getLeaseDays()); BigDecimal costs = leasePrice.multiply(num).multiply(leaseDays); - bean.setCosts(String.valueOf(costs)); + bean.setCosts(costs); /* BigDecimal costs = BigDecimal.ZERO; //当单价，数量，租赁天数都不为空时计算总价 if(bean.getLeasePrice() != null && bean.getNum() != null && bean.getLeaseDays() != null){ @@ -184,11 +184,11 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService { leaseList.addAll(oneOfList); } for (SltAgreementInfo bean : leaseList) { - if (StringUtils.isEmpty(bean.getLeasePrice())) { - bean.setLeasePrice("0"); + if (bean.getLeasePrice() == null) { + bean.setLeasePrice(new BigDecimal(0)); } - if (StringUtils.isEmpty(bean.getNum())) { - bean.setNum("0"); + if (bean.getNum() == null) { + bean.setNum(0); } if (StringUtils.isEmpty(bean.getLeaseDays())) { bean.setLeaseDays("0"); @@ -196,7 +196,7 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService { if (Objects.isNull(bean.getTrimDay())) { bean.setTrimDay(0); } - BigDecimal leasePrice = new BigDecimal(bean.getLeasePrice()); + BigDecimal leasePrice = bean.getLeasePrice(); BigDecimal num = new BigDecimal(bean.getNum()); BigDecimal leaseDays = new BigDecimal(bean.getLeaseDays()); // 实际结算天数（领料天数 + 调整天数(可以为负整数)） @@ -205,11 +205,11 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService { BigDecimal realCosts = leasePrice.multiply(num).multiply(realDays); // 应结算金额 BigDecimal costs = leasePrice.multiply(num).multiply(leaseDays); - bean.setCosts(String.valueOf(costs)); + bean.setCosts(costs); //实际结算天数 bean.setRealDays(realDays); // 实际结算金额 - bean.setRealCosts(String.valueOf(realCosts)); + bean.setRealCosts(realCosts); } return leaseList; } @@ -230,7 +230,7 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService { relation.setProjectName(lease.getProjectName()); relation.setUnitName(lease.getUnitName()); relation.setCompanyId(lease.getCompanyId()); - BigDecimal cost = new BigDecimal(lease.getRealCosts()); + BigDecimal cost = lease.getRealCosts(); leaseCostOne = leaseCostOne.add(cost); } } @@ -240,26 +240,26 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService { relation.setProjectName(lease.getProjectName()); relation.setUnitName(lease.getUnitName()); relation.setCompanyId(lease.getCompanyId()); - BigDecimal cost = new BigDecimal(lease.getRealCosts()); + BigDecimal cost = lease.getRealCosts(); leaseCostThree = leaseCostThree.add(cost); } } for (SltAgreementInfo repair : repairList) { if (repair.getAgreementId().equals(info.getAgreementId().toString())) { // 暂时先计算配件总价，后期需要加上委外维修费用 - BigDecimal allCost = new BigDecimal(repair.getPartAllCosts()); + BigDecimal allCost = repair.getPartAllCosts(); repairCost = repairCost.add(allCost); } } for (SltAgreementInfo scrap : scrapList) { if (scrap.getAgreementId().equals(info.getAgreementId().toString())) { - BigDecimal cost = new BigDecimal(scrap.getCosts()); + BigDecimal cost = scrap.getCosts(); scrapCost = scrapCost.add(cost); } } for (SltAgreementInfo scrap : preScrapList) { if (scrap.getAgreementId().equals(info.getAgreementId().toString())) { - BigDecimal cost = new BigDecimal(scrap.getCosts()); + BigDecimal cost = scrap.getCosts(); preScrapCost = preScrapCost.add(cost); } } @@ -270,7 +270,7 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService { relation.setProjectName(lose.getProjectName()); relation.setUnitName(lose.getUnitName()); relation.setCompanyId(lose.getCompanyId()); - BigDecimal cost = new BigDecimal(lose.getCosts()); + BigDecimal cost = lose.getCosts(); loseCost = loseCost.add(cost); } } @@ -343,13 +343,13 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService { loseList.addAll(oneOfList); } for (SltAgreementInfo bean : loseList) { - if (StringUtils.isEmpty(bean.getBuyPrice())) { - bean.setBuyPrice("0"); + if (bean.getBuyPrice() == null) { + bean.setBuyPrice(new BigDecimal(0)); } - if (StringUtils.isEmpty(bean.getNum())) { - bean.setNum("0"); + if (bean.getNum() == null) { + bean.setNum(0); } - BigDecimal buyPrice = new BigDecimal(bean.getBuyPrice()); + BigDecimal buyPrice = bean.getBuyPrice(); BigDecimal num = new BigDecimal(bean.getNum()); BigDecimal costs = buyPrice.multiply(num); //计算租赁费用 @@ -359,7 +359,7 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService { BigDecimal num = new BigDecimal(bean.getNum()); costs = buyPrice.multiply(num); }*/ - bean.setCosts(String.valueOf(costs)); + bean.setCosts(costs); } return loseList; } @@ -379,16 +379,16 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService { if (scrapList != null && scrapList.size() > 0) { for (SltAgreementInfo bean : scrapList) { - if (StringUtils.isEmpty(bean.getBuyPrice())) { - bean.setBuyPrice("0"); + if (bean.getBuyPrice() == null) { + bean.setBuyPrice(new BigDecimal(0)); } - if (StringUtils.isEmpty(bean.getNum())) { - bean.setNum("0"); + if (bean.getNum() == null) { + bean.setNum(0); } - BigDecimal buyPrice = new BigDecimal(bean.getBuyPrice()); + BigDecimal buyPrice = bean.getBuyPrice(); BigDecimal num = new BigDecimal(bean.getNum()); BigDecimal costs = buyPrice.multiply(num); - bean.setCosts(String.valueOf(costs)); + bean.setCosts(costs); } } @@ -497,11 +497,11 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService { List leaseList = sltAgreementInfoMapper.getLeaseListOneMonth(list, idList); BigDecimal leaseCostOne = BigDecimal.ZERO; for (SltAgreementInfo bean : leaseList) { - if (StringUtils.isEmpty(bean.getLeasePrice())) { - bean.setLeasePrice("0"); + if (bean.getLeasePrice() == null) { + bean.setLeasePrice(new BigDecimal(0)); } - if (StringUtils.isEmpty(bean.getNum())) { - bean.setNum("0"); + if (bean.getNum() == null) { + bean.setNum(0); } if (StringUtils.isEmpty(bean.getLeaseDays())) { bean.setLeaseDays("0"); @@ -509,7 +509,7 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService { if (Objects.isNull(bean.getTrimDay())) { bean.setTrimDay(0); } - BigDecimal leasePrice = new BigDecimal(bean.getLeasePrice()); + BigDecimal leasePrice = bean.getLeasePrice(); BigDecimal num = new BigDecimal(bean.getNum()); BigDecimal leaseDays = new BigDecimal(bean.getLeaseDays()); // 实际结算天数（领料天数 + 调整天数(可以为负整数)） @@ -518,13 +518,13 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService { BigDecimal realCosts = leasePrice.multiply(num).multiply(realDays); // 应结算金额 BigDecimal costs = leasePrice.multiply(num).multiply(leaseDays); - bean.setCosts(String.valueOf(costs)); + bean.setCosts(costs); bean.setRealDays(realDays); - bean.setRealCosts(String.valueOf(realCosts)); + bean.setRealCosts(realCosts); leaseCostOne = leaseCostOne.add(costs); bean.setMonth(sltAgreementInfo.getMonth()); } - sltAgreementInfo.setCosts(String.valueOf(leaseCostOne)); + sltAgreementInfo.setCosts(leaseCostOne); return leaseList; } @@ -551,11 +551,11 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService { leaseList.addAll(oneOfList); } for (SltAgreementInfo bean : leaseList) { - if (StringUtils.isEmpty(bean.getLeasePrice())) { - bean.setLeasePrice("0"); + if (bean.getLeasePrice() == null) { + bean.setLeasePrice(new BigDecimal(0)); } - if (StringUtils.isEmpty(bean.getNum())) { - bean.setNum("0"); + if (bean.getNum() == null) { + bean.setNum(0); } if (StringUtils.isEmpty(bean.getLeaseDays())) { bean.setLeaseDays("0"); @@ -563,7 +563,7 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService { if (Objects.isNull(bean.getTrimDay())) { bean.setTrimDay(0); } - BigDecimal leasePrice = new BigDecimal(bean.getLeasePrice()); + BigDecimal leasePrice = bean.getLeasePrice(); BigDecimal num = new BigDecimal(bean.getNum()); BigDecimal leaseDays = new BigDecimal(bean.getLeaseDays()); // 实际结算天数（领料天数 + 调整天数(可以为负整数)） @@ -572,11 +572,11 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService { BigDecimal realCosts = leasePrice.multiply(num).multiply(realDays); // 应结算金额 BigDecimal costs = leasePrice.multiply(num).multiply(leaseDays); - bean.setCosts(String.valueOf(costs)); + bean.setCosts(costs); //实际结算天数 bean.setRealDays(realDays); // 实际结算金额 - bean.setRealCosts(String.valueOf(realCosts)); + bean.setRealCosts(realCosts); } return leaseList; } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaTypeHisPriceMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaTypeHisPriceMapper.xml index d3e13da..8e04da3 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaTypeHisPriceMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaTypeHisPriceMapper.xml @@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into ma_type_his_price ( - ma_code, + lease_price, time, status, company_id diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/RepairMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/RepairMapper.xml index c0c9108..d81e3ba 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/RepairMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/RepairMapper.xml @@ -272,9 +272,7 @@ from repair_apply_details where task_id = #{taskId} - select ifnull(buy_price,0) from ma_part_type where pa_id = #{partId} - -