提交

src/main/java/cn/ezhizao/project/business/workOrder/controller/BizWorkOrderController.java

@@ -129,7 +129,7 @@ public class BizWorkOrderController extends BaseController {
                     BigDecimal collectionMoney = new BigDecimal(0);
                     //计算收款金额
                     for (BizCollection d : colList) {
-                        BigDecimal addMoney = d.getAmount();
+                        BigDecimal addMoney = d.getArriveAmount();
                         if (addMoney != null) {
                             collectionMoney = collectionMoney.add(addMoney);
                         } else {
@@ -139,7 +139,7 @@ public class BizWorkOrderController extends BaseController {
                     //判断是否全部收款
                     if (collectionMoney.compareTo(money) == 0) {
                         v.setOnceContractStatus("已收款");
-                    } else if (collectionMoney.compareTo(money) < 0) {
+                    } else if (collectionMoney.compareTo(money) < 0 &&collectionMoney.compareTo(new BigDecimal(0))>0) {
                         v.setOnceContractStatus("部分收款");
                     } else if (collectionMoney.compareTo(new BigDecimal(0)) == 0) {
                         v.setOnceContractStatus("未收款");