警情编辑时间修改

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/dto/AlertFormRecordDto.java

@@ -52,8 +52,8 @@ public class AlertFormRecordDto extends BaseDto {
     @ApiModelProperty(value = "被困时间")
     private Date trappedTime;
 
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
+    @ApiModelProperty(value = "编辑时间")
+    private Date editTime;
 
     @ApiModelProperty(value = "事件描述")
     private String description;

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/entity/AlertFormRecord.java

@@ -84,8 +84,8 @@ public class AlertFormRecord extends BaseEntity {
     /**
      * 更新时间
      */
-    @TableField("update_time")
-    private Date updateTime;
+    @TableField("edit_time")
+    private Date editTime;
 
     /**
      * 事件描述

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/resources/mapper/AlertFormRecordMapper.xml

@@ -10,6 +10,6 @@
         <if test="TzCarcylRegDto!=null and TzCarcylRegDto!='' ">
             AND afr.alert_called_id = #{alertCalledId}
         </if>
-        ORDER BY afr.update_time desc
+        ORDER BY afr.edit_time desc
     </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/flc/biz/service/impl/AlertFormRecordServiceImpl.java

@@ -84,12 +84,12 @@ public class AlertFormRecordServiceImpl extends BaseService<AlertFormRecordDto,
             //第一次修改，保存旧记录
             if (recordByCalledId.isEmpty()) {
                 BeanUtils.copyProperties(oldData, oldRecord);
-                oldRecord.setUpdateTime(oldData.getTrappedTime());
+                oldRecord.setEditTime(oldData.getTrappedTime());
                 alertFormRecordMapper.insert(oldRecord);
             }
             AlertFormRecord record = new AlertFormRecord();
             BeanUtils.copyProperties(newData, record);
-            record.setUpdateTime(new Date());
+            record.setEditTime(new Date());
             alertFormRecordMapper.insert(record);
             // 更新警情基本信息
             Long alertCalled = record.getAlertCalledId();