From c90828f98e314c5b1dab33d109016deb518aa56e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com>
Date: Mon, 8 Sep 2025 16:02:26 +0800
Subject: [PATCH] =?UTF-8?q?09-08-=E5=9C=9F=E5=9C=B0=E6=B5=81=E8=BD=AC?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9Etype=E5=8C=BA=E5=88=86=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E5=92=8C=E6=9C=AA=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dromara/land/domain/vo/BusLandTransferLedgerVo.java   | 3 +++
 .../service/impl/BusLandTransferLedgerServiceImpl.java    | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/land/domain/vo/BusLandTransferLedgerVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/land/domain/vo/BusLandTransferLedgerVo.java
index b23eb525..1452164d 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/land/domain/vo/BusLandTransferLedgerVo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/land/domain/vo/BusLandTransferLedgerVo.java
@@ -196,4 +196,7 @@ public class BusLandTransferLedgerVo implements Serializable {
     //总金额（元）
     private BigDecimal totalAmountAll;
 
+    //流转状态 分 未完成 和  已完成
+    private String type;
+
 }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/land/service/impl/BusLandTransferLedgerServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/land/service/impl/BusLandTransferLedgerServiceImpl.java
index f0f78f1d..a320c25b 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/land/service/impl/BusLandTransferLedgerServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/land/service/impl/BusLandTransferLedgerServiceImpl.java
@@ -112,7 +112,7 @@ public class BusLandTransferLedgerServiceImpl extends ServiceImpl<BusLandTransfe
             //已流转面积
             BigDecimal transferArea = new BigDecimal(0);
             //未流转面积
-            BigDecimal noTransferAea = new BigDecimal(0);
+            BigDecimal noTransferAea;
 
             //土地租金
             BigDecimal landRentAll = new BigDecimal(0);
@@ -167,6 +167,12 @@ public class BusLandTransferLedgerServiceImpl extends ServiceImpl<BusLandTransfe
             vo.setSeedlingCompensationAll(seedlingCompensationAll);
             //总金额（元）
             vo.setTotalAmountAll(totalAmountAll);
+            //流转状态
+            if (transferArea.add(noTrans).compareTo(vo.getDesignArea()) >= 0) {
+                vo.setType("已完成");
+            }else {
+                vo.setType("未完成");
+            }
         }
 
         return TableDataInfo.build(result);