From 892a581a97a248c69f12af8f443a5b700ac16a6d Mon Sep 17 00:00:00 2001 From: zzl <961867786@qq.com> Date: Mon, 8 Sep 2025 14:50:19 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=8F=E8=90=A5=E5=B1=9E=E6=80=A7=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resource/TResourceLandController.java | 2 +- .../TResourceOperationController.java | 2 +- .../resource/domain/TResourceOperation.java | 126 +++++++++- .../ruoyi/resource/domain/TResourceVo.java | 2 +- .../resource/TResourceOperationMapper.xml | 216 +++++++++++------- 5 files changed, 255 insertions(+), 93 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 ef491d1..1ddc06e 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 @@ -139,7 +139,7 @@ public class TResourceLandController extends BaseController resource.setJykssj(operation.getJykssj()); resource.setJyjssj(operation.getJyjssj()); resource.setCbje(operation.getCbje()); - resource.setBz(operation.getBz()); + 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 026b5b7..0dc838e 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 @@ -141,7 +141,7 @@ public class TResourceOperationController extends BaseController resource.setJykssj(operation.getJykssj()); resource.setJyjssj(operation.getJyjssj()); resource.setCbje(operation.getCbje()); - resource.setBz(operation.getBz()); + 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 074ac7f..f304c83 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 @@ -11,7 +11,7 @@ import java.math.BigDecimal; * 地块经营对象 t_resource_operation * * @author rongxin - * @date 2025-09-05 + * @date 2025-09-08 */ public class TResourceOperation extends BaseEntity { @@ -28,8 +28,8 @@ public class TResourceOperation extends BaseEntity @Excel(name = "区域位置名称") private String deptName; - /** 地块代码 */ - @Excel(name = "地块代码") + /** 地块编码 */ + @Excel(name = "地块编码") private String dkbm; /** 地块名称 */ @@ -57,13 +57,29 @@ public class TResourceOperation extends BaseEntity 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; @@ -76,9 +92,21 @@ public class TResourceOperation extends BaseEntity @Excel(name = "承包金额(元)") private BigDecimal cbje; + /** 兑现金额 */ + @Excel(name = "兑现金额(元)") + private BigDecimal dxje; + + /** 尚欠金额 */ + @Excel(name = "尚欠金额(元)") + private BigDecimal sqje; + + /** 年收益 */ + @Excel(name = "年收益") + private BigDecimal nsy; + /** 备注 */ @Excel(name = "备注") - private String bz; + private String bzxx; /** 实物图 */ private String dkImg; @@ -89,6 +117,7 @@ public class TResourceOperation extends BaseEntity + /** 行政区划id */ private Long deptId; @@ -182,6 +211,16 @@ public class TResourceOperation extends BaseEntity return jyfs; } + public void setJydxlx(String jydxlx) + { + this.jydxlx = jydxlx; + } + + public String getJydxlx() + { + return jydxlx; + } + public void setJydxmc(String jydxmc) { this.jydxmc = jydxmc; @@ -192,6 +231,36 @@ public class TResourceOperation extends BaseEntity return jydxmc; } + public void setJydxzjlx(String jydxzjlx) + { + this.jydxzjlx = jydxzjlx; + } + + public String getJydxzjlx() + { + return jydxzjlx; + } + + public void setJydxzjhm(String jydxzjhm) + { + this.jydxzjhm = jydxzjhm; + } + + public String getJydxzjhm() + { + return jydxzjhm; + } + + public void setSfqdht(String sfqdht) + { + this.sfqdht = sfqdht; + } + + public String getSfqdht() + { + return sfqdht; + } + public void setJykssj(String jykssj) { this.jykssj = jykssj; @@ -222,14 +291,44 @@ public class TResourceOperation extends BaseEntity return cbje; } - public void setBz(String bz) + public void setDxje(BigDecimal dxje) + { + this.dxje = dxje; + } + + public BigDecimal getDxje() + { + return dxje; + } + + public void setSqje(BigDecimal sqje) + { + this.sqje = sqje; + } + + public BigDecimal getSqje() + { + return sqje; + } + + public void setNsy(BigDecimal nsy) + { + this.nsy = nsy; + } + + public BigDecimal getNsy() + { + return nsy; + } + + public void setBzxx(String bzxx) { - this.bz = bz; + this.bzxx = bzxx; } - public String getBz() + public String getBzxx() { - return bz; + return bzxx; } public void setDkImg(String dkImg) @@ -292,11 +391,18 @@ public class TResourceOperation extends BaseEntity .append("dkbz", getDkbz()) .append("jymj", getJymj()) .append("jyfs", getJyfs()) + .append("jydxlx", getJydxlx()) .append("jydxmc", getJydxmc()) + .append("jydxzjlx", getJydxzjlx()) + .append("jydxzjhm", getJydxzjhm()) + .append("sfqdht", getSfqdht()) .append("jykssj", getJykssj()) .append("jyjssj", getJyjssj()) .append("cbje", getCbje()) - .append("bz", getBz()) + .append("dxje", getDxje()) + .append("sqje", getSqje()) + .append("nsy", getNsy()) + .append("bzxx", getBzxx()) .append("dkImg", getDkImg()) .append("surveyStatus", getSurveyStatus()) .append("importCode", getImportCode()) 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 3151184..d8e7d10 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 @@ -127,7 +127,7 @@ public class TResourceVo { /** 备注 */ @Excel(name = "备注") - private String bz; + private String bzxx; /** 实物图 */ private String dkImg; diff --git a/ruoyi-business/src/main/resources/mapper/resource/TResourceOperationMapper.xml b/ruoyi-business/src/main/resources/mapper/resource/TResourceOperationMapper.xml index 5287814..c031a56 100644 --- a/ruoyi-business/src/main/resources/mapper/resource/TResourceOperationMapper.xml +++ b/ruoyi-business/src/main/resources/mapper/resource/TResourceOperationMapper.xml @@ -5,20 +5,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -30,14 +37,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, dkbm, dkmc, dkdz, dkxz, dknz, dkbz, jymj, jyfs, jydxmc, jykssj, jyjssj, cbje, bz, dk_img, survey_status, import_code, dept_name, create_by, create_time, update_by, update_time from t_resource_operation + select fid, DKBM, DKMC, DKDZ, DKXZ, DKNZ, DKBZ, JYMJ, JYFS, JYDXLX, JYDXMC, JYDXZJLX, JYDXZJHM, SFQDHT, JYKSSJ, JYJSSJ, CBJE, DXJE, SQJE, NSY, BZXX, dk_img, survey_status, import_code, dept_name, create_by, create_time, update_by, update_time from t_resource_operation - where id = #{id} + where fid = #{id} +