zhangzl
/
rongxin.api
1
0
Форкнуть 0
Код Задачи 0 Pull Request'ы 0 Релизы 0 Вики Активность
Просмотр исходного кода

经营属性字段变更

master
张泽亮 2 дней назад
Родитель
b1223724f1
Сommit
892a581a97
5 измененных файлов: 255 добавлений и 93 удалений
Разделённый вид
Опции Diff
Показать статистику Скачать Patch файл Скачать Diff файл
  1. +1
    -1
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceLandController.java
  2. +1
    -1
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceOperationController.java
  3. +116
    -10
      ruoyi-business/src/main/java/com/ruoyi/resource/domain/TResourceOperation.java
  4. +1
    -1
      ruoyi-business/src/main/java/com/ruoyi/resource/domain/TResourceVo.java
  5. +136
    -80
      ruoyi-business/src/main/resources/mapper/resource/TResourceOperationMapper.xml

+ 1
- 1
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());



+ 1
- 1
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());



+ 116
- 10
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())


+ 1
- 1
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;


+ 136
- 80
ruoyi-business/src/main/resources/mapper/resource/TResourceOperationMapper.xml Просмотреть файл

@@ -5,20 +5,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<mapper namespace="com.ruoyi.resource.mapper.TResourceOperationMapper">

<resultMap type="TResourceOperation" id="TResourceOperationResult">
<result property="id" column="id" />
<result property="dkbm" column="dkbm" />
<result property="dkmc" column="dkmc" />
<result property="dkdz" column="dkdz" />
<result property="dkxz" column="dkxz" />
<result property="dknz" column="dknz" />
<result property="dkbz" column="dkbz" />
<result property="jymj" column="jymj" />
<result property="jyfs" column="jyfs" />
<result property="jydxmc" column="jydxmc" />
<result property="jykssj" column="jykssj" />
<result property="jyjssj" column="jyjssj" />
<result property="cbje" column="cbje" />
<result property="bz" column="bz" />
<result property="id" column="fid" />
<result property="dkbm" column="DKBM" />
<result property="dkmc" column="DKMC" />
<result property="dkdz" column="DKDZ" />
<result property="dkxz" column="DKXZ" />
<result property="dknz" column="DKNZ" />
<result property="dkbz" column="DKBZ" />
<result property="jymj" column="JYMJ" />
<result property="jyfs" column="JYFS" />
<result property="jydxlx" column="JYDXLX" />
<result property="jydxmc" column="JYDXMC" />
<result property="jydxzjlx" column="JYDXZJLX" />
<result property="jydxzjhm" column="JYDXZJHM" />
<result property="sfqdht" column="SFQDHT" />
<result property="jykssj" column="JYKSSJ" />
<result property="jyjssj" column="JYJSSJ" />
<result property="cbje" column="CBJE" />
<result property="dxje" column="DXJE" />
<result property="sqje" column="SQJE" />
<result property="nsy" column="NSY" />
<result property="bzxx" column="BZXX" />
<result property="dkImg" column="dk_img" />
<result property="surveyStatus" column="survey_status" />
<result property="importCode" column="import_code" />
@@ -30,14 +37,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>

<sql id="selectTResourceOperationVo">
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
</sql>

<select id="selectTResourceOperationList" parameterType="TResourceOperation" resultMap="TResourceOperationResult">
<include refid="selectTResourceOperationVo"/>
<where>
<if test="dkbm != null and dkbm != ''"> and dkbm = #{dkbm}</if>
<if test="dkmc != null and dkmc != ''"> and dkmc = #{dkmc}</if>
<if test="dkbm != null and dkbm != ''"> and DKBM = #{dkbm}</if>
<if test="dkmc != null and dkmc != ''"> and DKMC = #{dkmc}</if>
<if test="jyfs != null and jyfs != ''"> and JYFS = #{jyfs}</if>
<if test="jydxlx != null and jydxlx != ''"> and JYDXLX = #{jydxlx}</if>
<if test="jydxmc != null and jydxmc != ''"> and JYDXMC = #{jydxmc}</if>
<if test="jydxzjlx != null and jydxzjlx != ''"> and JYDXZJLX = #{jydxzjlx}</if>
<if test="jydxzjhm != null and jydxzjhm != ''"> and JYDXZJHM = #{jydxzjhm}</if>
<if test="sfqdht != null and sfqdht != ''"> and SFQDHT = #{sfqdht}</if>
<if test="surveyStatus != null and surveyStatus != ''"> and survey_status = #{surveyStatus}</if>
<if test="importCode != null and importCode != ''"> and import_code like concat('%', #{importCode}, '%')</if>
</where>
@@ -45,9 +58,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

<select id="selectTResourceOperationById" parameterType="Long" resultMap="TResourceOperationResult">
<include refid="selectTResourceOperationVo"/>
where id = #{id}
where fid = #{id}
</select>


<select id="selectTResourceOperationByDkbm" parameterType="String" resultMap="TResourceOperationResult">
<include refid="selectTResourceOperationVo"/>
where dkbm = #{dkbm}
@@ -56,19 +70,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertTResourceOperation" parameterType="TResourceOperation" useGeneratedKeys="true" keyProperty="id">
insert into t_resource_operation
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="dkbm != null and dkbm != ''">dkbm,</if>
<if test="dkmc != null and dkmc != ''">dkmc,</if>
<if test="dkdz != null">dkdz,</if>
<if test="dkxz != null">dkxz,</if>
<if test="dknz != null">dknz,</if>
<if test="dkbz != null">dkbz,</if>
<if test="jymj != null">jymj,</if>
<if test="jyfs != null and jyfs != ''">jyfs,</if>
<if test="jydxmc != null and jydxmc != ''">jydxmc,</if>
<if test="jykssj != null and jykssj != ''">jykssj,</if>
<if test="jyjssj != null and jyjssj != ''">jyjssj,</if>
<if test="cbje != null">cbje,</if>
<if test="bz != null">bz,</if>
<if test="dkbm != null and dkbm != ''">DKBM,</if>
<if test="dkmc != null and dkmc != ''">DKMC,</if>
<if test="dkdz != null">DKDZ,</if>
<if test="dkxz != null">DKXZ,</if>
<if test="dknz != null">DKNZ,</if>
<if test="dkbz != null">DKBZ,</if>
<if test="jymj != null">JYMJ,</if>
<if test="jyfs != null">JYFS,</if>
<if test="jydxlx != null">JYDXLX,</if>
<if test="jydxmc != null">JYDXMC,</if>
<if test="jydxzjlx != null">JYDXZJLX,</if>
<if test="jydxzjhm != null">JYDXZJHM,</if>
<if test="sfqdht != null">SFQDHT,</if>
<if test="jykssj != null">JYKSSJ,</if>
<if test="jyjssj != null">JYJSSJ,</if>
<if test="cbje != null">CBJE,</if>
<if test="dxje != null">DXJE,</if>
<if test="sqje != null">SQJE,</if>
<if test="nsy != null">NSY,</if>
<if test="bzxx != null">BZXX,</if>
<if test="dkImg != null">dk_img,</if>
<if test="surveyStatus != null and surveyStatus != ''">survey_status,</if>
<if test="importCode != null and importCode != ''">import_code,</if>
@@ -86,12 +107,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="dknz != null">#{dknz},</if>
<if test="dkbz != null">#{dkbz},</if>
<if test="jymj != null">#{jymj},</if>
<if test="jyfs != null and jyfs != ''">#{jyfs},</if>
<if test="jydxmc != null and jydxmc != ''">#{jydxmc},</if>
<if test="jykssj != null and jykssj != ''">#{jykssj},</if>
<if test="jyjssj != null and jyjssj != ''">#{jyjssj},</if>
<if test="jyfs != null">#{jyfs},</if>
<if test="jydxlx != null">#{jydxlx},</if>
<if test="jydxmc != null">#{jydxmc},</if>
<if test="jydxzjlx != null">#{jydxzjlx},</if>
<if test="jydxzjhm != null">#{jydxzjhm},</if>
<if test="sfqdht != null">#{sfqdht},</if>
<if test="jykssj != null">#{jykssj},</if>
<if test="jyjssj != null">#{jyjssj},</if>
<if test="cbje != null">#{cbje},</if>
<if test="bz != null">#{bz},</if>
<if test="dxje != null">#{dxje},</if>
<if test="sqje != null">#{sqje},</if>
<if test="nsy != null">#{nsy},</if>
<if test="bzxx != null">#{bzxx},</if>
<if test="dkImg != null">#{dkImg},</if>
<if test="surveyStatus != null and surveyStatus != ''">#{surveyStatus},</if>
<if test="importCode != null and importCode != ''">#{importCode},</if>
@@ -106,19 +134,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertTResourceOperationBatch" parameterType="list" useGeneratedKeys="true" keyProperty="id">
insert into t_resource_operation
<trim prefix="(" suffix=")" suffixOverrides=",">
dkbm,
dkmc,
dkdz,
dkxz,
dknz,
dkbz,
jymj,
jyfs,
jydxmc,
jykssj,
jyjssj,
cbje,
bz,
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,
@@ -139,11 +174,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{item.dkbz},
#{item.jymj},
#{item.jyfs},
#{item.jydxlx},
#{item.jydxmc},
#{item.jydxzjlx},
#{item.jydxzjhm},
#{item.sfqdht},
#{item.jykssj},
#{item.jyjssj},
#{item.cbje},
#{item.bz},
#{item.dxje},
#{item.sqje},
#{item.nsy},
#{item.bzxx},
#{item.dkImg},
#{item.surveyStatus},
#{item.importCode},
@@ -159,19 +201,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="updateTResourceOperation" parameterType="TResourceOperation">
update t_resource_operation
<trim prefix="SET" suffixOverrides=",">
<if test="dkbm != null and dkbm != ''">dkbm = #{dkbm},</if>
<if test="dkmc != null and dkmc != ''">dkmc = #{dkmc},</if>
<if test="dkdz != null">dkdz = #{dkdz},</if>
<if test="dkxz != null">dkxz = #{dkxz},</if>
<if test="dknz != null">dknz = #{dknz},</if>
<if test="dkbz != null">dkbz = #{dkbz},</if>
<if test="jymj != null">jymj = #{jymj},</if>
<if test="jyfs != null and jyfs != ''">jyfs = #{jyfs},</if>
<if test="jydxmc != null and jydxmc != ''">jydxmc = #{jydxmc},</if>
<if test="jykssj != null and jykssj != ''">jykssj = #{jykssj},</if>
<if test="jyjssj != null and jyjssj != ''">jyjssj = #{jyjssj},</if>
<if test="cbje != null">cbje = #{cbje},</if>
<if test="bz != null">bz = #{bz},</if>
<if test="dkbm != null and dkbm != ''">DKBM = #{dkbm},</if>
<if test="dkmc != null and dkmc != ''">DKMC = #{dkmc},</if>
<if test="dkdz != null">DKDZ = #{dkdz},</if>
<if test="dkxz != null">DKXZ = #{dkxz},</if>
<if test="dknz != null">DKNZ = #{dknz},</if>
<if test="dkbz != null">DKBZ = #{dkbz},</if>
<if test="jymj != null">JYMJ = #{jymj},</if>
<if test="jyfs != null">JYFS = #{jyfs},</if>
<if test="jydxlx != null">JYDXLX = #{jydxlx},</if>
<if test="jydxmc != null">JYDXMC = #{jydxmc},</if>
<if test="jydxzjlx != null">JYDXZJLX = #{jydxzjlx},</if>
<if test="jydxzjhm != null">JYDXZJHM = #{jydxzjhm},</if>
<if test="sfqdht != null">SFQDHT = #{sfqdht},</if>
<if test="jykssj != null">JYKSSJ = #{jykssj},</if>
<if test="jyjssj != null">JYJSSJ = #{jyjssj},</if>
<if test="cbje != null">CBJE = #{cbje},</if>
<if test="dxje != null">DXJE = #{dxje},</if>
<if test="sqje != null">SQJE = #{sqje},</if>
<if test="nsy != null">NSY = #{nsy},</if>
<if test="bzxx != null">BZXX = #{bzxx},</if>
<if test="dkImg != null">dk_img = #{dkImg},</if>
<if test="surveyStatus != null and surveyStatus != ''">survey_status = #{surveyStatus},</if>
<if test="importCode != null and importCode != ''">import_code = #{importCode},</if>
@@ -181,7 +230,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where id = #{id}
where fid = #{id}
</update>

<!--批量更新-->
@@ -189,19 +238,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<foreach collection="list" item="item" index="index" open="" close="" separator=";">
update t_resource_operation
<set>
<if test="item.dkbm != null and item.dkbm != ''">dkbm = #{item.dkbm},</if>
<if test="item.dkmc != null and item.dkmc != ''">dkmc = #{item.dkmc},</if>
<if test="item.dkdz != null">dkdz = #{item.dkdz},</if>
<if test="item.dkxz != null">dkxz = #{item.dkxz},</if>
<if test="item.dknz != null">dknz = #{item.dknz},</if>
<if test="item.dkbz != null">dkbz = #{item.dkbz},</if>
<if test="item.jymj != null">jymj = #{item.jymj},</if>
<if test="item.jyfs != null and item.jyfs != ''">jyfs = #{item.jyfs},</if>
<if test="item.jydxmc != null and item.jydxmc != ''">jydxmc = #{item.jydxmc},</if>
<if test="item.jykssj != null and item.jykssj != ''">jykssj = #{item.jykssj},</if>
<if test="item.jyjssj != null and item.jyjssj != ''">jyjssj = #{item.jyjssj},</if>
<if test="item.cbje != null">cbje = #{item.cbje},</if>
<if test="item.bz != null">bz = #{item.bz},</if>
<if test="item.dkbm != null and item.dkbm != ''">DKBM = #{item.dkbm},</if>
<if test="item.dkmc != null and item.dkmc != ''">DKMC = #{item.dkmc},</if>
<if test="item.dkdz != null">DKDZ = #{item.dkdz},</if>
<if test="item.dkxz != null">DKXZ = #{item.dkxz},</if>
<if test="item.dknz != null">DKNZ = #{item.dknz},</if>
<if test="item.dkbz != null">DKBZ = #{item.dkbz},</if>
<if test="item.jymj != null">JYMJ = #{item.jymj},</if>
<if test="item.jyfs != null">JYFS = #{item.jyfs},</if>
<if test="item.jydxlx != null">JYDXLX = #{item.jydxlx},</if>
<if test="item.jydxmc != null">JYDXMC = #{item.jydxmc},</if>
<if test="item.jydxzjlx != null">JYDXZJLX = #{item.jydxzjlx},</if>
<if test="item.jydxzjhm != null">JYDXZJHM = #{item.jydxzjhm},</if>
<if test="item.sfqdht != null">SFQDHT = #{item.sfqdht},</if>
<if test="item.jykssj != null">JYKSSJ = #{item.jykssj},</if>
<if test="item.jyjssj != null">JYJSSJ = #{item.jyjssj},</if>
<if test="item.cbje != null">CBJE = #{item.cbje},</if>
<if test="item.dxje != null">DXJE = #{item.dxje},</if>
<if test="item.sqje != null">SQJE = #{item.sqje},</if>
<if test="item.nsy != null">NSY = #{item.nsy},</if>
<if test="item.bzxx != null">BZXX = #{item.bzxx},</if>
<if test="item.dkImg != null">dk_img = #{item.dkImg},</if>
<if test="item.surveyStatus != null and item.surveyStatus != ''">survey_status = #{item.surveyStatus},</if>
<if test="item.importCode != null and item.importCode != ''">import_code = #{item.importCode},</if>
@@ -211,16 +267,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="item.updateBy != null">update_by = #{item.updateBy},</if>
<if test="item.updateTime != null">update_time = #{item.updateTime},</if>
</set>
where id = #{item.id}
where fid = #{item.id}
</foreach>
</update>

<delete id="deleteTResourceOperationById" parameterType="Long">
delete from t_resource_operation where id = #{id}
delete from t_resource_operation where fid = #{id}
</delete>

<delete id="deleteTResourceOperationByIds" parameterType="String">
delete from t_resource_operation where id in
delete from t_resource_operation where fid in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>


Редактирование Предпросмотр
Загрузка…
Отмена
Сохранить