chenzhengming 2 роки тому
батько
коміт
c76018735c

+ 20 - 22
ruoyi-system/src/main/java/com/ruoyi/system/domain/LcdInfoUserRelation.java

@@ -30,14 +30,14 @@ public class LcdInfoUserRelation extends BaseEntity
     private int lcdReceiveUserId;
 
     /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date createTime;
+    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date createAt;
 
     /** 更新时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date updateTime;
+    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date updateAt;
 
     public void setId(Long id)
     {
@@ -66,25 +66,23 @@ public class LcdInfoUserRelation extends BaseEntity
     {
         return lcdReceiveUserId;
     }
-
-    @Override
-    public Date getCreateTime() {
-        return createTime;
+    public void setCreateAt(Date createAt)
+    {
+        this.createAt = createAt;
     }
 
-    @Override
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
+    public Date getCreateAt()
+    {
+        return createAt;
     }
-
-    @Override
-    public Date getUpdateTime() {
-        return updateTime;
+    public void setUpdateAt(Date updateAt)
+    {
+        this.updateAt = updateAt;
     }
 
-    @Override
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
+    public Date getUpdateAt()
+    {
+        return updateAt;
     }
 
     @Override
@@ -93,8 +91,8 @@ public class LcdInfoUserRelation extends BaseEntity
                 .append("id", getId())
                 .append("lcdInfoId", getLcdInfoId())
                 .append("lcdReceiveUserId", getLcdReceiveUserId())
-                .append("createTime", getCreateTime())
-                .append("updateTime", getUpdateTime())
+                .append("createAt", getCreateAt())
+                .append("updateAt", getUpdateAt())
                 .toString();
     }
 }

+ 2 - 2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/LcdInfoServiceImpl.java

@@ -84,8 +84,8 @@ public class LcdInfoServiceImpl implements ILcdInfoService {
                     LcdInfoUserRelation lcdInfoUserRelation = new LcdInfoUserRelation();//插入中间表数据
                     lcdInfoUserRelation.setLcdInfoId(info_id);
                     lcdInfoUserRelation.setLcdReceiveUserId(userId);
-                    lcdInfoUserRelation.setCreateTime(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,DateUtils.getTime()));
-                    lcdInfoUserRelation.setUpdateTime(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,DateUtils.getTime()));
+                    lcdInfoUserRelation.setCreateAt(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,DateUtils.getTime()));
+                    lcdInfoUserRelation.setUpdateAt(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,DateUtils.getTime()));
                     lcdInfoUserRelationMapper.insertLcdInfoUserRelation(lcdInfoUserRelation);
                 }
                 return AjaxResult.success("新增成功");

+ 1 - 1
ruoyi-system/src/main/resources/mapper/system/LcdInfoMapper.xml

@@ -88,7 +88,7 @@
     </insert>
 
     <!--
-    根据手机号查消息ID
+    查重
     -->
     <select id="selectTitleById" resultType="Long" parameterType="String">
         <include refid="selectLcdInfoVo"/>

+ 11 - 11
ruoyi-system/src/main/resources/mapper/system/LcdInfoUserRelationMapper.xml

@@ -8,12 +8,12 @@
         <result property="id"    column="id"    />
         <result property="lcdInfoId"    column="lcd_info_id"    />
         <result property="lcdReceiveUserId"    column="lcd_receive_user_id"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
+        <result property="createAt"    column="create_at"    />
+        <result property="updateAt"    column="update_at"    />
     </resultMap>
 
     <sql id="selectLcdInfoUserRelationVo">
-        select id, lcd_info_id, lcd_receive_user_id, create_time, update_time from lcd_info_user_relation
+        select id, lcd_info_id, lcd_receive_user_id, create_at, update_at from lcd_info_user_relation
     </sql>
 
     <select id="selectLcdInfoUserRelationList" parameterType="LcdInfoUserRelation" resultMap="LcdInfoUserRelationResult">
@@ -21,8 +21,8 @@
         <where>
             <if test="lcdInfoId != null "> and lcd_info_id = #{lcdInfoId}</if>
             <if test="lcdReceiveUserId != null "> and lcd_receive_user_id = #{lcdReceiveUserId}</if>
-            <if test="createTime != null "> and create_time = #{createTime}</if>
-            <if test="updateTime != null "> and update_time = #{updateTime}</if>
+            <if test="createAt != null "> and create_at = #{createAt}</if>
+            <if test="updateAt != null "> and update_at = #{updateAt}</if>
         </where>
     </select>
 
@@ -36,14 +36,14 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="lcdInfoId != null">lcd_info_id,</if>
             <if test="lcdReceiveUserId != null">lcd_receive_user_id,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateTime != null">update_time,</if>
+            <if test="createAt != null">create_at,</if>
+            <if test="updateAt != null">update_at,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="lcdInfoId != null">#{lcdInfoId},</if>
             <if test="lcdReceiveUserId != null">#{lcdReceiveUserId},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateTime != null">#{updateTime},</if>
+            <if test="createAt != null">#{createAt},</if>
+            <if test="updateAt != null">#{updateAt},</if>
         </trim>
     </insert>
 
@@ -52,8 +52,8 @@
         <trim prefix="SET" suffixOverrides=",">
             <if test="lcdInfoId != null">lcd_info_id = #{lcdInfoId},</if>
             <if test="lcdReceiveUserId != null">lcd_receive_user_id = #{lcdReceiveUserId},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="createAt != null">create_at = #{createAt},</if>
+            <if test="updateAt != null">update_at = #{updateAt},</if>
         </trim>
         where id = #{id}
     </update>