From 13e8a74e0e70c81cfa0b8c72e9f35acd325476db Mon Sep 17 00:00:00 2001
From: wangxy <1481820854@qq.com>
Date: Mon, 23 Sep 2024 11:33:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=B6=89=E5=AF=86=E5=9C=BA=E6=89=80?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/manager/TdPlaceManager.java    |  4 +++
 .../ruoyi/system/domain/place/TdPlace.java    | 31 +++++++++++++++++++
 .../resources/mapper/system/TdPlaceMapper.xml |  5 +++
 3 files changed, 40 insertions(+)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/TdPlaceManager.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/TdPlaceManager.java
index d8f6586..d2d90a2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/TdPlaceManager.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/TdPlaceManager.java
@@ -42,6 +42,10 @@ public class TdPlaceManager {
             tdPlace.setCreateBy(ShiroUtils.getSysUser().getLoginName());
             tdPlace.setCreateTime(new Date());
         }
+        tdPlace.setState("1");
+        tdPlace.setIsDissolve("0");
+        tdPlace.setAfterName(tdPlace.getPlaceName());
+        tdPlace.setAfterRule(tdPlace.getPlaceRule());
         return placeService.saveOrUpdate(tdPlace);
     }
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/place/TdPlace.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/place/TdPlace.java
index 4bd89d1..38391b7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/place/TdPlace.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/place/TdPlace.java
@@ -4,11 +4,14 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 /**
  * 涉密场所
  * @author 13560
@@ -35,6 +38,34 @@ public class TdPlace extends BaseEntity {
     private String placeRule;
 
 
+    /**
+     * 变更后场所名称
+     */
+    private String afterName;
+
+    /**
+     * 变更后场所规范
+     */
+    private String afterRule;
+
+
+    /**
+     * 状态 :登记1，变更2，删除0
+     */
+    private String state;
+
+
+    /**
+     * 是否解除；默认0，变更解除为1
+     */
+    private String isDissolve;
+
+
+    /** 变更后时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date afterTime;
+
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/TdPlaceMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdPlaceMapper.xml
index f32cfa9..fda5b5c 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TdPlaceMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TdPlaceMapper.xml
@@ -13,6 +13,11 @@
             <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
             <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
             <result property="remark" column="remark" jdbcType="VARCHAR"/>
+            <result property="afterTime" column="after_time" jdbcType="TIMESTAMP"/>
+            <result property="afterName" column="after_name" jdbcType="VARCHAR"/>
+            <result property="afterRule" column="after_rule" jdbcType="VARCHAR"/>
+            <result property="state" column="state" jdbcType="VARCHAR"/>
+            <result property="isDissolve" column="is_dissolve" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">