fix: 应急就医数据库迁移相关调整
1.启动类排除QuartzAutoConfiguration.class 2.数据库字段与达梦保留关键字段冲突调整 3.sql键名重复修改
This commit is contained in:
+1
-1
@@ -345,7 +345,7 @@ public class AedEquipmentManger implements Serializable {
|
||||
*/
|
||||
@Excel(name = "型号", width = 15)
|
||||
@Schema(title = "型号")
|
||||
private String model;
|
||||
private String modelNumber;
|
||||
/**
|
||||
* 来源字典 设备类型 1:立式 ,2:挂式,3:车载
|
||||
*/
|
||||
|
||||
+2
-2
@@ -81,13 +81,13 @@ 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 begin;
|
||||
private java.util.Date beginTime;
|
||||
/**
|
||||
* 通话结束时间
|
||||
*/
|
||||
@Schema(title = "通话结束时间", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
|
||||
@Excel(name = "通话结束时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
|
||||
private java.util.Date end;
|
||||
private java.util.Date endTime;
|
||||
/**
|
||||
* 来电进入技能组时间
|
||||
*/
|
||||
|
||||
+2
-2
@@ -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.setBegin(DateUtils.parseDate(qimoVo.getBegin(), "yyyy-MM-dd hh:mm:ss"));
|
||||
qimoNoticeEntity.setEnd(DateUtils.parseDate(qimoVo.getEnd(), "yyyy-MM-dd hh:mm:ss"));
|
||||
qimoNoticeEntity.setBeginTime(DateUtils.parseDate(qimoVo.getBegin(), "yyyy-MM-dd hh:mm:ss"));
|
||||
qimoNoticeEntity.setEndTime(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) {
|
||||
|
||||
Reference in New Issue
Block a user