From 036fecb9d3f66f3414c81526d0d4475eceae17db Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Tue, 3 Sep 2024 14:14:12 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=A2=E6=88=B7=E8=B5=84=E6=96=99=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E8=81=94=E7=B3=BB=E4=BA=BA=E4=BF=A1=E6=81=AF=E5=8E=9F?=
 =?UTF-8?q?=E5=BD=95=E5=85=A5=E6=97=B6=E9=97=B4=E5=92=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=AF=BC=E8=87=B4=E7=9A=84=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E4=B8=8D=E5=AF=B9=E9=97=AE=E9=A2=98=EF=BC=9A=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=B5=84=E6=96=99=E5=85=B6=E4=BB=96=E8=81=94?=
 =?UTF-8?q?=E7=B3=BB=E4=BA=BA=E4=BF=A1=E6=81=AF=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E5=8E=9F=E5=BD=95=E5=85=A5=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=92=8C=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=BD=95=E5=85=A5=E4=BA=BA=E3=80=81?=
 =?UTF-8?q?=E5=BD=95=E5=85=A5=E6=97=B6=E9=97=B4=E3=80=81=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BA=BA=E3=80=81=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=EF=BC=9B=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E5=8E=9F=E5=AD=97=E6=AE=B5=E3=80=81=E6=96=B0=E5=A2=9E=E8=BF=99?=
 =?UTF-8?q?=E5=9B=9B=E4=B8=AA=E5=AD=97=E6=AE=B5=EF=BC=9B=E6=8F=92=E5=85=A5?=
 =?UTF-8?q?=E5=92=8C=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=BF=99=E5=9B=9B=E4=B8=AA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/system/domain/SysContacts.java  | 23 +++-------------
 .../service/impl/SysContactsServiceImpl.java  |  1 -
 .../mapper/system/SysContactsMapper.xml       | 19 +++++++------
 .../templates/system/contacts/contacts.html   | 27 +++----------------
 4 files changed, 19 insertions(+), 51 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysContacts.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysContacts.java
index fd6d6352..a921b2ad 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysContacts.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysContacts.java
@@ -74,9 +74,6 @@ public class SysContacts extends BaseEntity
     @Excel(name = "备注")
     private String customerRemarks;
 
-    private String firstAddTime;
-
-    private String updateInfoTime;
 
     public void setContactid(Long contactid) 
     {
@@ -214,21 +211,7 @@ public class SysContacts extends BaseEntity
         return customerRemarks;
     }
 
-    public String getFirstAddTime() {
-        return firstAddTime;
-    }
-
-    public void setFirstAddTime(String firstAddTime) {
-        this.firstAddTime = firstAddTime;
-    }
 
-    public String getUpdateInfoTime() {
-        return updateInfoTime;
-    }
-
-    public void setUpdateInfoTime(String updateInfoTime) {
-        this.updateInfoTime = updateInfoTime;
-    }
 
     @Override
     public String toString() {
@@ -248,8 +231,10 @@ public class SysContacts extends BaseEntity
             .append("commonEmail", getCommonEmail())
             .append("alternateEmail", getAlternateEmail())
             .append("customerRemarks", getCustomerRemarks())
-            .append("firstAddTime", getFirstAddTime())
-            .append("updateInfoTime", getUpdateInfoTime())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
             .toString();
     }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysContactsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysContactsServiceImpl.java
index 964a463a..a84b9ccb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysContactsServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysContactsServiceImpl.java
@@ -64,7 +64,6 @@ public class SysContactsServiceImpl implements ISysContactsService
     public int insertSysContacts(SysContacts sysContacts)
     {
         String loginName = ShiroUtils.getLoginName();
-        sysContacts.setFirstAddTime(String.valueOf(DateUtils.getNowDate()));
         sysContacts.setCreateTime(DateUtils.getNowDate());
         sysContacts.setCreateBy(loginName);
         int id = sysContactsMapper.insertSysContacts(sysContacts);
diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysContactsMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysContactsMapper.xml
index 0be913d8..e9f72c42 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/SysContactsMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/SysContactsMapper.xml
@@ -20,14 +20,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="commonEmail"    column="common_email"    />
         <result property="alternateEmail"    column="alternate_email"    />
         <result property="customerRemarks"    column="customer_remarks"    />
-        <result property="customerRemarks"    column="customer_remarks"    />
-        <result property="customerRemarks"    column="customer_remarks"    />
-        <result property="firstAddTime"    column="first_add_time"    />
-        <result property="updateInfoTime"    column="update_info_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
     </resultMap>
 
     <sql id="selectSysContactsVo">
-        select contactid, enterprise_code, enterprise_name, customer_name, customer_position, customer_birthday, office_telephone, home_phone, cell_phone, customer_fax, standby_telephone_one, standby_telephone_two, common_email, alternate_email, customer_remarks, first_add_time, update_info_time from sys_contacts
+        select contactid, enterprise_code, enterprise_name, customer_name, customer_position, customer_birthday, office_telephone, home_phone, cell_phone, customer_fax, standby_telephone_one, standby_telephone_two, common_email, alternate_email, customer_remarks, create_by, create_time, update_by, update_time from sys_contacts
     </sql>
 
     <select id="selectSysContactsList" parameterType="SysContacts" resultMap="SysContactsResult">
@@ -68,7 +68,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="commonEmail != null">common_email,</if>
             <if test="alternateEmail != null">alternate_email,</if>
             <if test="customerRemarks != null">customer_remarks,</if>
-            first_add_time,
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="enterpriseCode != null">#{enterpriseCode},</if>
@@ -85,7 +86,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="commonEmail != null">#{commonEmail},</if>
             <if test="alternateEmail != null">#{alternateEmail},</if>
             <if test="customerRemarks != null">#{customerRemarks},</if>
-            NOW(),
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
          </trim>
     </insert>
 
@@ -106,7 +108,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="commonEmail != null">common_email = #{commonEmail},</if>
             <if test="alternateEmail != null">alternate_email = #{alternateEmail},</if>
             <if test="customerRemarks != null">customer_remarks = #{customerRemarks},</if>
-            update_info_time = CONCAT_WS(',',NOW(),update_info_time),
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>
         where contactid = #{contactid}
     </update>
diff --git a/ruoyi-admin/src/main/resources/templates/system/contacts/contacts.html b/ruoyi-admin/src/main/resources/templates/system/contacts/contacts.html
index d749f1f8..521e71be 100644
--- a/ruoyi-admin/src/main/resources/templates/system/contacts/contacts.html
+++ b/ruoyi-admin/src/main/resources/templates/system/contacts/contacts.html
@@ -124,29 +124,10 @@
                     field: 'customerRemarks',
                     title: '备注'
                 },
-                {
-                    field: 'firstAddTime',
-                    title: '录入时间',
-                    formatter: function (value, row, index) {
-                        if (value == null) {
-                            return " ";
-                        } else {
-                            return value;
-                        }
-                    }
-                },
-                {
-                    field: 'updateInfoTime',
-                    title: '上次修改时间',
-                    formatter: function (value, row, index) {
-                        if (value == null) {
-                            return " ";
-                        } else {
-                            var vArr = value.split(',')
-                            return vArr[0];
-                        }
-                    }
-                },
+                {title: '录入时间',field: 'createTime'},
+                {title: '更新时间',field: 'updateTime'},
+                {title: '创建人',field: 'createBy'},
+                {title: '更新人',field: 'updateBy'},
                 {
                     title: '操作',
                     align: 'center',