From a2e4db5c371dd57d617b81aa394c1bbc5330b28a Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Mon, 22 Sep 2025 17:20:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=AD=97=E6=AE=B5=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resource/TResourceLandController.java     |  7 ++++
 .../TResourceOperationController.java         |  7 ++++
 .../resource/domain/TResourceOperation.java   |  2 +-
 .../ruoyi/resource/domain/TResourceVo.java    | 33 +++++++++++++++++--
 4 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceLandController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceLandController.java
index 8243e09..20dd53c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceLandController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceLandController.java
@@ -168,10 +168,17 @@ public class TResourceLandController extends BaseController
             resource.setId(operation.getId());
             resource.setJymj(operation.getJymj());
             resource.setJyfs(operation.getJyfs());
+            resource.setJydxlx(operation.getJydxlx());
             resource.setJydxmc(operation.getJydxmc());
+            resource.setJydxzjlx(operation.getJydxzjlx());
+            resource.setJydxzjhm(operation.getJydxzjhm());
+            resource.setSfqdht(operation.getSfqdht());
             resource.setJykssj(operation.getJykssj());
             resource.setJyjssj(operation.getJyjssj());
             resource.setCbje(operation.getCbje());
+            resource.setDxje(operation.getDxje());
+            resource.setSqje(operation.getSqje());
+            resource.setNsy(operation.getNsy());
             resource.setBzxx(operation.getBzxx());
             resource.setDkImg(operation.getDkImg());
             resource.setSurveyStatus(operation.getSurveyStatus());
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceOperationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceOperationController.java
index 28f9d0f..74d892a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceOperationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceOperationController.java
@@ -158,10 +158,17 @@ public class TResourceOperationController extends BaseController
             resource.setId(operation.getId());
             resource.setJymj(operation.getJymj());
             resource.setJyfs(operation.getJyfs());
+            resource.setJydxlx(operation.getJydxlx());
             resource.setJydxmc(operation.getJydxmc());
+            resource.setJydxzjlx(operation.getJydxzjlx());
+            resource.setJydxzjhm(operation.getJydxzjhm());
+            resource.setSfqdht(operation.getSfqdht());
             resource.setJykssj(operation.getJykssj());
             resource.setJyjssj(operation.getJyjssj());
             resource.setCbje(operation.getCbje());
+            resource.setDxje(operation.getDxje());
+            resource.setSqje(operation.getSqje());
+            resource.setNsy(operation.getNsy());
             resource.setBzxx(operation.getBzxx());
             resource.setDkImg(operation.getDkImg());
             resource.setSurveyStatus(operation.getSurveyStatus());
diff --git a/ruoyi-business/src/main/java/com/ruoyi/resource/domain/TResourceOperation.java b/ruoyi-business/src/main/java/com/ruoyi/resource/domain/TResourceOperation.java
index 7db1197..a2e0188 100644
--- a/ruoyi-business/src/main/java/com/ruoyi/resource/domain/TResourceOperation.java
+++ b/ruoyi-business/src/main/java/com/ruoyi/resource/domain/TResourceOperation.java
@@ -61,7 +61,7 @@ public class TResourceOperation extends BaseEntity
     private String jyfs;
 
     /** 经营对象类型 */
-    @Excel(name = "经营对象类型", dictType = " jydxlx")
+    @Excel(name = "经营对象类型", dictType = "jydxlx")
     private String jydxlx;
 
     /** 经营对象名称 */
diff --git a/ruoyi-business/src/main/java/com/ruoyi/resource/domain/TResourceVo.java b/ruoyi-business/src/main/java/com/ruoyi/resource/domain/TResourceVo.java
index 24b31d2..863d129 100644
--- a/ruoyi-business/src/main/java/com/ruoyi/resource/domain/TResourceVo.java
+++ b/ruoyi-business/src/main/java/com/ruoyi/resource/domain/TResourceVo.java
@@ -28,7 +28,7 @@ public class TResourceVo {
     private String importCode;
 
     /** 标识码 */
-    @Excel(name = "标识码 */")
+    @Excel(name = "标识码")
     private Integer bsm;
 
     /** 要素代码 */
@@ -92,7 +92,7 @@ public class TResourceVo {
     private String zjrxm;
 
     /** 实测面积( ㎡) */
-    @Excel(name = "实测面积( ㎡)")
+    @Excel(name = "实测面积(㎡)")
     private BigDecimal scmj;
 
     /** 实测面积（亩） */
@@ -114,13 +114,28 @@ public class TResourceVo {
     private BigDecimal jymj;
 
     /** 经营方式 */
-    @Excel(name = "经营方式")
+    @Excel(name = "经营方式", dictType = "jyfs")
     private String jyfs;
 
+    @Excel(name = "经营对象类型", dictType = "jydxlx")
+    private String jydxlx;
+
     /** 经营对象名称 */
     @Excel(name = "经营对象名称")
     private String jydxmc;
 
+    /** 经营对象证件类型 */
+    @Excel(name = "经营对象证件类型", dictType = "zjlx")
+    private String jydxzjlx;
+
+    /** 经营对象证件号码 */
+    @Excel(name = "经营对象证件号码")
+    private String jydxzjhm;
+
+    /** 是否签订合同 */
+    @Excel(name = "是否签订合同", dictType = "is_common")
+    private String sfqdht;
+
     /** 经营开始时间 */
     @Excel(name = "经营开始时间")
     private String jykssj;
@@ -133,6 +148,18 @@ public class TResourceVo {
     @Excel(name = "承包金额(元)")
     private BigDecimal cbje;
 
+    /** 兑现金额 */
+    @Excel(name = "兑现金额(元)")
+    private BigDecimal dxje;
+
+    /** 尚欠金额 */
+    @Excel(name = "尚欠金额(元)")
+    private BigDecimal sqje;
+
+    /** 年收益 */
+    @Excel(name = "年收益")
+    private BigDecimal nsy;
+
     /** 备注 */
     @Excel(name = "备注")
     private String bzxx;