实体类数据库关键字注释

health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/AedEquipmentManger.java

@@ -345,7 +345,8 @@ public class AedEquipmentManger implements Serializable {
      */
     @Excel(name = "型号", width = 15)
     @Schema(title = "型号")
-    private String modelNumber;
+    @TableField("modelNumber")
+    private String model;
     /**
      * 来源字典 设备类型 1：立式 ，2：挂式，3：车载
      */

health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/TblQimoNotice.java

@@ -1,5 +1,6 @@
 package com.renkang.emergency.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -81,13 +82,15 @@ public class TblQimoNotice implements Serializable {
      */
     @Schema(title = "通话接通时间", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     @Excel(name = "通话接通时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
-    private java.util.Date beginTime;
+    @TableField("beginTime")
+    private java.util.Date begin;
     /**
      * 通话结束时间
      */
     @Schema(title = "通话结束时间", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     @Excel(name = "通话结束时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
-    private java.util.Date endTime;
+    @TableField("endTime")
+    private java.util.Date end;
     /**
      * 来电进入技能组时间
      */

health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/util/QimoVoUtil.java

@@ -33,8 +33,8 @@ public class QimoVoUtil {
         try {
             qimoNoticeEntity.setRing(DateUtils.parseDate(qimoVo.getRing(), "yyyy-MM-dd hh:mm:ss"));
             qimoNoticeEntity.setRingingDate(DateUtils.parseDate(qimoVo.getRingingDate(), "yyyy-MM-dd hh:mm:ss"));
-            qimoNoticeEntity.setBeginTime(DateUtils.parseDate(qimoVo.getBegin(), "yyyy-MM-dd hh:mm:ss"));
+            qimoNoticeEntity.setBegin(DateUtils.parseDate(qimoVo.getBegin(), "yyyy-MM-dd hh:mm:ss"));
-            qimoNoticeEntity.setEndTime(DateUtils.parseDate(qimoVo.getEnd(), "yyyy-MM-dd hh:mm:ss"));
+            qimoNoticeEntity.setEnd(DateUtils.parseDate(qimoVo.getEnd(), "yyyy-MM-dd hh:mm:ss"));
             qimoNoticeEntity.setQueueTime(DateUtils.parseDate(qimoVo.getQueueTime(), "yyyy-MM-dd hh:mm:ss"));
             qimoNoticeEntity.setRingingTimestamp(qimoVo.getRingingTimestamp());
         } catch (ParseException e) {

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/async/AsyncImportService.java

@@ -139,11 +139,11 @@ public class AsyncImportService {
                 exportVO.setCenterName(Optional.ofNullable(groupedMap.get(tblQimoNotice.getExten())).map(EmergencyGrouped::getCenterName).orElse(""));
                 exportVO.setSeatId(tblQimoNotice.getExten());
                 exportVO.setPhone(tblQimoNotice.getCallNo());
-                Optional.ofNullable(tblQimoNotice.getBeginTime())
+                Optional.ofNullable(tblQimoNotice.getBegin())
-                        .ifPresent(begin -> Optional.ofNullable(tblQimoNotice.getEndTime()).ifPresent(end -> {
+                        .ifPresent(begin -> Optional.ofNullable(tblQimoNotice.getEnd()).ifPresent(end -> {
                             exportVO.setCallDuration(String.valueOf(end.getTime() - begin.getTime()));
                         }));
-                exportVO.setCallTime(Optional.ofNullable(tblQimoNotice.getBeginTime())
+                exportVO.setCallTime(Optional.ofNullable(tblQimoNotice.getBegin())
                         .map(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.ENGLISH)::format).orElse(""));
                 exports.add(exportVO);
             }

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/data/model/vo/PhoneDataInfo.java

@@ -60,8 +60,8 @@ public class PhoneDataInfo {
         this.seatNo = tblQimoNotice.getExten();
         this.phone = tblQimoNotice.getCallNo();
         this.callTime = tblQimoNotice.getRing();
-        if (ObjUtil.isNotEmpty(tblQimoNotice.getBeginTime()) && ObjUtil.isNotEmpty(tblQimoNotice.getEndTime())) {
+        if (ObjUtil.isNotEmpty(tblQimoNotice.getBegin()) && ObjUtil.isNotEmpty(tblQimoNotice.getEnd())) {
-            this.callDuration = String.valueOf((tblQimoNotice.getEndTime().getTime() - tblQimoNotice.getBeginTime().getTime()) / 1000);
+            this.callDuration = String.valueOf((tblQimoNotice.getEnd().getTime() - tblQimoNotice.getBegin().getTime()) / 1000);
         }
     }
 }

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/EmergencyGroupedServiceImpl.java

@@ -251,8 +251,8 @@ public class EmergencyGroupedServiceImpl extends MPJBaseServiceImpl<EmergencyGro
             vo.setDeptName(Optional.ofNullable(thirdDepart).map(SysDepart::getDepartName).orElse(""));
             Optional.ofNullable(item.getExten()).ifPresent(vo::setSeatId);
             Optional.ofNullable(item.getCallNo()).ifPresent(vo::setPhone);
-            if (ObjectUtil.isNotEmpty(item.getEndTime()) && ObjectUtil.isNotEmpty(item.getBeginTime())){
+            if (ObjectUtil.isNotEmpty(item.getEnd()) && ObjectUtil.isNotEmpty(item.getBegin())){
-                vo.setCallDuration(item.getEndTime().getTime() - item.getBeginTime().getTime());
+                vo.setCallDuration(item.getEnd().getTime() - item.getBegin().getTime());
             }
             Optional.ofNullable(item.getCreateDate()).ifPresent(vo::setCallTime);
             voList.add(vo);