From 435b5cefb0037208d894553c964246ab618bdddf Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Wed, 18 Sep 2024 14:28:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=AF=86=E5=93=81=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=E6=97=81=E7=AB=99=E4=BA=BA=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/system/domain/TdPropertyEment.java  | 12 ++++++++
 .../ruoyi/system/domain/TdPropertyInfo.java   | 29 +++++++++++++++++++
 .../mapper/system/TdPropertyEmentMapper.xml   |  4 ++-
 .../mapper/system/TdPropertyInfoMapper.xml    | 10 +++++++
 4 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdPropertyEment.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdPropertyEment.java
index ad8d1d0d..9d87d19c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdPropertyEment.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdPropertyEment.java
@@ -102,6 +102,18 @@ public class TdPropertyEment implements Serializable {
      */
     private Date createTime;
 
+
+    /**
+     * 维护旁站人员
+     */
+    private String maintainStand;
+
+
+    /**
+     * 销毁旁站人员
+     */
+    private String destoryStand;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdPropertyInfo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdPropertyInfo.java
index c95356c6..10f706c9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdPropertyInfo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdPropertyInfo.java
@@ -126,6 +126,17 @@ public class TdPropertyInfo extends BaseEntity
     @Excel(name = "部门")
     private String part;
 
+    /**
+     * 维护旁站人员
+     */
+    private String maintainStand;
+
+
+    /**
+     * 销毁旁站人员
+     */
+    private String destoryStand;
+
     public void setId(String id) 
     {
         this.id = id;
@@ -370,6 +381,22 @@ public class TdPropertyInfo extends BaseEntity
         return part;
     }
 
+    public String getMaintainStand() {
+        return maintainStand;
+    }
+
+    public void setMaintainStand(String maintainStand) {
+        this.maintainStand = maintainStand;
+    }
+
+    public String getDestoryStand() {
+        return destoryStand;
+    }
+
+    public void setDestoryStand(String destoryStand) {
+        this.destoryStand = destoryStand;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -401,6 +428,8 @@ public class TdPropertyInfo extends BaseEntity
             .append("maintainRemark", getMaintainRemark())
             .append("shemichengdu", getShemichengdu())
             .append("part", getPart())
+            .append("maintainStand", getMaintainStand())
+            .append("destoryStand", getDestoryStand())
             .toString();
     }
 }
diff --git a/ruoyi-system/src/main/resources/mapper/system/TdPropertyEmentMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdPropertyEmentMapper.xml
index 5b6bc9fa..7282cb51 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TdPropertyEmentMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TdPropertyEmentMapper.xml
@@ -21,6 +21,8 @@
             <result property="destoryType" column="destory_type" jdbcType="VARCHAR"/>
             <result property="maintainRemark" column="maintain_remark" jdbcType="VARCHAR"/>
             <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="maintainStand" column="maintain_stand" jdbcType="VARCHAR"/>
+            <result property="destoryStand" column="destory_stand" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -29,7 +31,7 @@
         maintain_user,maintain_date,maintain_state,
         destory_state,destory_depart,destory_user,
         destory_date,destory_type,maintain_remark,
-        create_time
+        create_time,maintain_stand,destory_stand
     </sql>
 
     <select id="selectEmentList" resultType="com.ruoyi.system.domain.TdPropertyEment">
diff --git a/ruoyi-system/src/main/resources/mapper/system/TdPropertyInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdPropertyInfoMapper.xml
index e3e6f92f..ee2e7227 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TdPropertyInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TdPropertyInfoMapper.xml
@@ -33,6 +33,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="maintainRemark"    column="maintain_remark"    />
         <result property="shemichengdu"    column="shemichengdu"    />
         <result property="part"    column="part"    />
+        <result property="maintainStand" column="maintain_stand" jdbcType="VARCHAR"/>
+        <result property="destoryStand" column="destory_stand" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="selectTdPropertyInfoVo">
@@ -69,6 +71,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="maintainRemark != null  and maintainRemark != ''"> and maintain_remark = #{maintainRemark}</if>
             <if test="shemichengdu != null  and shemichengdu != ''"> and shemichengdu = #{shemichengdu}</if>
             <if test="part != null  and part != ''"> and part = #{part}</if>
+            <if test="maintainStand != null  and maintainStand != ''"> and maintain_stand = #{maintainStand}</if>
+            <if test="destoryStand != null  and destoryStand != ''"> and destory_stand = #{destoryStand}</if>
         </where>
     </select>
     
@@ -113,6 +117,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="maintainRemark != null">maintain_remark,</if>
             <if test="shemichengdu != null">shemichengdu,</if>
             <if test="part != null">part,</if>
+            <if test="maintainStand != null">maintain_stand,</if>
+            <if test="destoryStand != null">destory_stand,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -143,6 +149,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="maintainRemark != null">#{maintainRemark},</if>
             <if test="shemichengdu != null">#{shemichengdu},</if>
             <if test="part != null">#{part},</if>
+            <if test="maintainStand != null">#{maintainStand},</if>
+            <if test="destoryStand != null">#{destoryStand},</if>
          </trim>
     </insert>
 
@@ -176,6 +184,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="maintainRemark != null">maintain_remark = #{maintainRemark},</if>
             <if test="shemichengdu != null">shemichengdu = #{shemichengdu},</if>
             <if test="part != null">part = #{part},</if>
+            <if test="maintainStand != null">maintain_stand = #{maintainStand},</if>
+            <if test="destoryStand != null">destory_stand = #{destoryStand},</if>
         </trim>
         where id = #{id}
     </update>