fix:收款管理导出

src/main/java/cn/ezhizao/project/business/collection/service/impl/BizCollectionServiceImpl.java

@@ -103,7 +103,17 @@ public class BizCollectionServiceImpl extends ServiceImpl<BizCollectionMapper, B
                 failureMsg.append("<br/>").append(failureNum).append("、合同 ").append(item.getContractNo()).append(" 不存在或不是循环合同");
                 continue;
             }
-            if(null == archiveInput.getTrueAmount() ||null ==item.getContractAmount() || archiveInput.getTrueAmount().subtract(item.getContractAmount()).compareTo(BigDecimal.ZERO) != 0){
+            if(null == item.getAmount()){
+                failureNum++;
+                failureMsg.append("<br/>").append(failureNum).append("、合同 ").append(item.getContractNo()).append(" 收款金额不能为空");
+                continue;
+            }
+            if(null == item.getContractAmount()){
+                failureNum++;
+                failureMsg.append("<br/>").append(failureNum).append("、合同 ").append(item.getContractNo()).append(" 合同总金额不能为空");
+                continue;
+            }
+            if(archiveInput.getTrueAmount().subtract(item.getContractAmount()).compareTo(BigDecimal.ZERO) != 0){
                 failureNum++;
                 failureMsg.append("<br/>").append(failureNum).append("、合同 ").append(item.getContractNo()).append("合同总金额不一致");
                 continue;
@@ -270,7 +280,17 @@ public class BizCollectionServiceImpl extends ServiceImpl<BizCollectionMapper, B
                 failureMsg.append("<br/>").append(failureNum).append("、合同 ").append(item.getContractNo()).append(" 不存在或不是单次合同");
                 continue;
             }
-            if(null == archiveInput.getTrueAmount() ||null == item.getContractAmount() || archiveInput.getTrueAmount().subtract(item.getContractAmount()).compareTo(BigDecimal.ZERO) != 0){
+            if(null == item.getAmount()){
+                failureNum++;
+                failureMsg.append("<br/>").append(failureNum).append("、合同 ").append(item.getContractNo()).append(" 收款金额不能为空");
+                continue;
+            }
+            if(null == item.getContractAmount()){
+                failureNum++;
+                failureMsg.append("<br/>").append(failureNum).append("、合同 ").append(item.getContractNo()).append(" 合同总金额不能为空");
+                continue;
+            }
+            if(archiveInput.getTrueAmount().subtract(item.getContractAmount()).compareTo(BigDecimal.ZERO) != 0){
                 failureNum++;
                 failureMsg.append("<br/>").append(failureNum).append("、合同 ").append(item.getContractNo()).append("合同总金额不一致");
                 continue;