diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/BmStorageLog.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/BmStorageLog.java
index c7f03e2..88c5a38 100644
--- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/BmStorageLog.java
+++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/BmStorageLog.java
@@ -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.web.domain.BaseEntity;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 
 /**
  * @author syruan
  */
-@Getter
-@Setter
+@Data
+@ToString
 public class BmStorageLog extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
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 01cc7cc..3c0cea1 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,16 +121,16 @@ public class CalcMonthlyServiceImp implements CalcMonthlyService {
         List<SltAgreementInfo> leaseList = sltAgreementInfoMapper.getLeaseListOneMonth(agreementInfo, idList);
         BigDecimal leaseCostOne = BigDecimal.ZERO;
         for (SltAgreementInfo bean : leaseList) {
-            if (bean.getLeasePrice() == null) {
+            if (StringUtils.isEmpty(bean.getLeasePrice())) {
                 bean.setLeasePrice("0");
             }
-            if (bean.getNum() == null) {
+            if (StringUtils.isEmpty(bean.getNum())) {
                 bean.setNum("0");
             }
-            if (bean.getLeaseDays() == null) {
+            if (StringUtils.isEmpty(bean.getLeaseDays())) {
                 bean.setLeaseDays("0");
             }
-            if (bean.getTrimDay() == null) {
+            if (Objects.isNull(bean.getTrimDay())) {
                 bean.setTrimDay(0);
             }
             BigDecimal leasePrice = new BigDecimal(bean.getLeasePrice());
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 eed9b26..feac9e0 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
@@ -30,6 +30,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @author c liu
@@ -89,10 +90,10 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService {
 
         if (scrapList != null && scrapList.size() > 0) {
             for (SltAgreementInfo bean : scrapList) {
-                if (bean.getBuyPrice() == null) {
+                if (StringUtils.isEmpty(bean.getBuyPrice())) {
                     bean.setBuyPrice("0");
                 }
-                if (bean.getNum() == null) {
+                if (StringUtils.isEmpty(bean.getNum())) {
                     bean.setNum("0");
                 }
                 BigDecimal buyPrice = new BigDecimal(bean.getBuyPrice());
@@ -168,15 +169,18 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService {
             leaseList.addAll(oneOfList);
         }
         for (SltAgreementInfo bean : leaseList) {
-            if (bean.getLeasePrice() == null) {
+            if (StringUtils.isEmpty(bean.getLeasePrice())) {
                 bean.setLeasePrice("0");
             }
-            if (bean.getNum() == null) {
+            if (StringUtils.isEmpty(bean.getNum())) {
                 bean.setNum("0");
             }
-            if (bean.getLeaseDays() == null) {
+            if (StringUtils.isEmpty(bean.getLeaseDays())) {
                 bean.setLeaseDays("0");
             }
+            if (Objects.isNull(bean.getTrimDay())) {
+                bean.setTrimDay(0);
+            }
             BigDecimal leasePrice = new BigDecimal(bean.getLeasePrice());
             BigDecimal num = new BigDecimal(bean.getNum());
             BigDecimal leaseDays = new BigDecimal(bean.getLeaseDays());
@@ -203,16 +207,16 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService {
             leaseList.addAll(oneOfList);
         }
         for (SltAgreementInfo bean : leaseList) {
-            if (bean.getLeasePrice() == null) {
+            if (StringUtils.isEmpty(bean.getLeasePrice())) {
                 bean.setLeasePrice("0");
             }
-            if (bean.getNum() == null) {
+            if (StringUtils.isEmpty(bean.getNum())) {
                 bean.setNum("0");
             }
-            if (bean.getLeaseDays() == null) {
+            if (StringUtils.isEmpty(bean.getLeaseDays())) {
                 bean.setLeaseDays("0");
             }
-            if (bean.getTrimDay() == null) {
+            if (Objects.isNull(bean.getTrimDay())) {
                 bean.setTrimDay(0);
             }
             BigDecimal leasePrice = new BigDecimal(bean.getLeasePrice());
@@ -345,10 +349,10 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService {
             loseList.addAll(oneOfList);
         }
         for (SltAgreementInfo bean : loseList) {
-            if (bean.getBuyPrice() == null) {
+            if (StringUtils.isEmpty(bean.getBuyPrice())) {
                 bean.setBuyPrice("0");
             }
-            if (bean.getNum() == null) {
+            if (StringUtils.isEmpty(bean.getNum())) {
                 bean.setNum("0");
             }
             BigDecimal buyPrice = new BigDecimal(bean.getBuyPrice());
@@ -381,10 +385,10 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService {
 
         if (scrapList != null && scrapList.size() > 0) {
             for (SltAgreementInfo bean : scrapList) {
-                if (bean.getBuyPrice() == null) {
+                if (StringUtils.isEmpty(bean.getBuyPrice())) {
                     bean.setBuyPrice("0");
                 }
-                if (bean.getNum() == null) {
+                if (StringUtils.isEmpty(bean.getNum())) {
                     bean.setNum("0");
                 }
                 BigDecimal buyPrice = new BigDecimal(bean.getBuyPrice());
@@ -495,16 +499,16 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService {
         List<SltAgreementInfo> leaseList = sltAgreementInfoMapper.getLeaseListOneMonth(list, idList);
         BigDecimal leaseCostOne = BigDecimal.ZERO;
         for (SltAgreementInfo bean : leaseList) {
-            if (bean.getLeasePrice() == null) {
+            if (StringUtils.isEmpty(bean.getLeasePrice())) {
                 bean.setLeasePrice("0");
             }
-            if (bean.getNum() == null) {
+            if (StringUtils.isEmpty(bean.getNum())) {
                 bean.setNum("0");
             }
-            if (bean.getLeaseDays() == null) {
+            if (StringUtils.isEmpty(bean.getLeaseDays())) {
                 bean.setLeaseDays("0");
             }
-            if (bean.getTrimDay() == null) {
+            if (Objects.isNull(bean.getTrimDay())) {
                 bean.setTrimDay(0);
             }
             BigDecimal leasePrice = new BigDecimal(bean.getLeasePrice());
@@ -549,16 +553,16 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService {
             leaseList.addAll(oneOfList);
         }
         for (SltAgreementInfo bean : leaseList) {
-            if (bean.getLeasePrice() == null) {
+            if (StringUtils.isEmpty(bean.getLeasePrice())) {
                 bean.setLeasePrice("0");
             }
-            if (bean.getNum() == null) {
+            if (StringUtils.isEmpty(bean.getNum())) {
                 bean.setNum("0");
             }
-            if (bean.getLeaseDays() == null) {
+            if (StringUtils.isEmpty(bean.getLeaseDays())) {
                 bean.setLeaseDays("0");
             }
-            if (bean.getTrimDay() == null) {
+            if (Objects.isNull(bean.getTrimDay())) {
                 bean.setTrimDay(0);
             }
             BigDecimal leasePrice = new BigDecimal(bean.getLeasePrice());