bonus
/
cqdevicemgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

结算优化

This commit is contained in:
sxu 2024-08-15 14:07:24 +08:00
parent 0d2c680eac
commit 8b932e9f6d
3 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/BmStorageLog.java
View File

@ -2,14 +2,16 @@ package com.bonus.sgzb.base.api.domain;
import com.bonus.sgzb.common.core.annotation.Excel; import com.bonus.sgzb.common.core.annotation.Excel;
import com.bonus.sgzb.common.core.web.domain.BaseEntity; import com.bonus.sgzb.common.core.web.domain.BaseEntity;
import lombok.Data;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import lombok.ToString;
/** /**
* @author syruan * @author syruan
*/ */
@Getter @Data
@Setter @ToString
public class BmStorageLog extends BaseEntity { public class BmStorageLog extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

8
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/remind/service/CalcMonthlyServiceImp.java
View File

@ -121,16 +121,16 @@ public class CalcMonthlyServiceImp implements CalcMonthlyService {
List<SltAgreementInfo> leaseList = sltAgreementInfoMapper.getLeaseListOneMonth(agreementInfo, idList); List<SltAgreementInfo> leaseList = sltAgreementInfoMapper.getLeaseListOneMonth(agreementInfo, idList);
BigDecimal leaseCostOne = BigDecimal.ZERO; BigDecimal leaseCostOne = BigDecimal.ZERO;
for (SltAgreementInfo bean : leaseList) { for (SltAgreementInfo bean : leaseList) {
if (bean.getLeasePrice() == null) { if (StringUtils.isEmpty(bean.getLeasePrice())) {
bean.setLeasePrice("0"); bean.setLeasePrice("0");
} }
if (bean.getNum() == null) { if (StringUtils.isEmpty(bean.getNum())) {
bean.setNum("0"); bean.setNum("0");
} }
if (bean.getLeaseDays() == null) { if (StringUtils.isEmpty(bean.getLeaseDays())) {
bean.setLeaseDays("0"); bean.setLeaseDays("0");
} }
if (bean.getTrimDay() == null) { if (Objects.isNull(bean.getTrimDay())) {
bean.setTrimDay(0); bean.setTrimDay(0);
} }
BigDecimal leasePrice = new BigDecimal(bean.getLeasePrice()); BigDecimal leasePrice = new BigDecimal(bean.getLeasePrice());

46
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java
View File

@ -30,6 +30,7 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Objects;
/** /**
* @author c liu * @author c liu
@ -89,10 +90,10 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService {
if (scrapList != null && scrapList.size() > 0) { if (scrapList != null && scrapList.size() > 0) {
for (SltAgreementInfo bean : scrapList) { for (SltAgreementInfo bean : scrapList) {
if (bean.getBuyPrice() == null) { if (StringUtils.isEmpty(bean.getBuyPrice())) {
bean.setBuyPrice("0"); bean.setBuyPrice("0");
} }
if (bean.getNum() == null) { if (StringUtils.isEmpty(bean.getNum())) {
bean.setNum("0"); bean.setNum("0");
} }
BigDecimal buyPrice = new BigDecimal(bean.getBuyPrice()); BigDecimal buyPrice = new BigDecimal(bean.getBuyPrice());
@ -168,15 +169,18 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService {
leaseList.addAll(oneOfList); leaseList.addAll(oneOfList);
} }
for (SltAgreementInfo bean : leaseList) { for (SltAgreementInfo bean : leaseList) {
if (bean.getLeasePrice() == null) { if (StringUtils.isEmpty(bean.getLeasePrice())) {
bean.setLeasePrice("0"); bean.setLeasePrice("0");
} }
if (bean.getNum() == null) { if (StringUtils.isEmpty(bean.getNum())) {
bean.setNum("0"); bean.setNum("0");
} }
if (bean.getLeaseDays() == null) { if (StringUtils.isEmpty(bean.getLeaseDays())) {
bean.setLeaseDays("0"); bean.setLeaseDays("0");
} }
if (Objects.isNull(bean.getTrimDay())) {
bean.setTrimDay(0);
}
BigDecimal leasePrice = new BigDecimal(bean.getLeasePrice()); BigDecimal leasePrice = new BigDecimal(bean.getLeasePrice());
BigDecimal num = new BigDecimal(bean.getNum()); BigDecimal num = new BigDecimal(bean.getNum());
BigDecimal leaseDays = new BigDecimal(bean.getLeaseDays()); BigDecimal leaseDays = new BigDecimal(bean.getLeaseDays());
@ -203,16 +207,16 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService {
leaseList.addAll(oneOfList); leaseList.addAll(oneOfList);
} }
for (SltAgreementInfo bean : leaseList) { for (SltAgreementInfo bean : leaseList) {
if (bean.getLeasePrice() == null) { if (StringUtils.isEmpty(bean.getLeasePrice())) {
bean.setLeasePrice("0"); bean.setLeasePrice("0");
} }
if (bean.getNum() == null) { if (StringUtils.isEmpty(bean.getNum())) {
bean.setNum("0"); bean.setNum("0");
} }
if (bean.getLeaseDays() == null) { if (StringUtils.isEmpty(bean.getLeaseDays())) {
bean.setLeaseDays("0"); bean.setLeaseDays("0");
} }
if (bean.getTrimDay() == null) { if (Objects.isNull(bean.getTrimDay())) {
bean.setTrimDay(0); bean.setTrimDay(0);
} }
BigDecimal leasePrice = new BigDecimal(bean.getLeasePrice()); BigDecimal leasePrice = new BigDecimal(bean.getLeasePrice());
@ -345,10 +349,10 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService {
loseList.addAll(oneOfList); loseList.addAll(oneOfList);
} }
for (SltAgreementInfo bean : loseList) { for (SltAgreementInfo bean : loseList) {
if (bean.getBuyPrice() == null) { if (StringUtils.isEmpty(bean.getBuyPrice())) {
bean.setBuyPrice("0"); bean.setBuyPrice("0");
} }
if (bean.getNum() == null) { if (StringUtils.isEmpty(bean.getNum())) {
bean.setNum("0"); bean.setNum("0");
} }
BigDecimal buyPrice = new BigDecimal(bean.getBuyPrice()); BigDecimal buyPrice = new BigDecimal(bean.getBuyPrice());
@ -381,10 +385,10 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService {
if (scrapList != null && scrapList.size() > 0) { if (scrapList != null && scrapList.size() > 0) {
for (SltAgreementInfo bean : scrapList) { for (SltAgreementInfo bean : scrapList) {
if (bean.getBuyPrice() == null) { if (StringUtils.isEmpty(bean.getBuyPrice())) {
bean.setBuyPrice("0"); bean.setBuyPrice("0");
} }
if (bean.getNum() == null) { if (StringUtils.isEmpty(bean.getNum())) {
bean.setNum("0"); bean.setNum("0");
} }
BigDecimal buyPrice = new BigDecimal(bean.getBuyPrice()); BigDecimal buyPrice = new BigDecimal(bean.getBuyPrice());
@ -495,16 +499,16 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService {
List<SltAgreementInfo> leaseList = sltAgreementInfoMapper.getLeaseListOneMonth(list, idList); List<SltAgreementInfo> leaseList = sltAgreementInfoMapper.getLeaseListOneMonth(list, idList);
BigDecimal leaseCostOne = BigDecimal.ZERO; BigDecimal leaseCostOne = BigDecimal.ZERO;
for (SltAgreementInfo bean : leaseList) { for (SltAgreementInfo bean : leaseList) {
if (bean.getLeasePrice() == null) { if (StringUtils.isEmpty(bean.getLeasePrice())) {
bean.setLeasePrice("0"); bean.setLeasePrice("0");
} }
if (bean.getNum() == null) { if (StringUtils.isEmpty(bean.getNum())) {
bean.setNum("0"); bean.setNum("0");
} }
if (bean.getLeaseDays() == null) { if (StringUtils.isEmpty(bean.getLeaseDays())) {
bean.setLeaseDays("0"); bean.setLeaseDays("0");
} }
if (bean.getTrimDay() == null) { if (Objects.isNull(bean.getTrimDay())) {
bean.setTrimDay(0); bean.setTrimDay(0);
} }
BigDecimal leasePrice = new BigDecimal(bean.getLeasePrice()); BigDecimal leasePrice = new BigDecimal(bean.getLeasePrice());
@ -549,16 +553,16 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService {
leaseList.addAll(oneOfList); leaseList.addAll(oneOfList);
} }
for (SltAgreementInfo bean : leaseList) { for (SltAgreementInfo bean : leaseList) {
if (bean.getLeasePrice() == null) { if (StringUtils.isEmpty(bean.getLeasePrice())) {
bean.setLeasePrice("0"); bean.setLeasePrice("0");
} }
if (bean.getNum() == null) { if (StringUtils.isEmpty(bean.getNum())) {
bean.setNum("0"); bean.setNum("0");
} }
if (bean.getLeaseDays() == null) { if (StringUtils.isEmpty(bean.getLeaseDays())) {
bean.setLeaseDays("0"); bean.setLeaseDays("0");
} }
if (bean.getTrimDay() == null) { if (Objects.isNull(bean.getTrimDay())) {
bean.setTrimDay(0); bean.setTrimDay(0);
} }
BigDecimal leasePrice = new BigDecimal(bean.getLeasePrice()); BigDecimal leasePrice = new BigDecimal(bean.getLeasePrice());