renkang/xj-platform
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 应急就医数据库迁移相关调整

Browse Source 
1.启动类排除QuartzAutoConfiguration.class
2.数据库字段与达梦保留关键字段冲突调整
3.sql键名重复修改
This commit is contained in:
hejiayang
2026-03-04 18:01:20 +08:00
parent 61045e4389
commit 4c98dd2d30
8 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/mapper/xml/AedEquipmentMangerMapper.xml
-1
View File
@@ -25,7 +25,6 @@
operate_instruction as operateInstruction,
operate_video as operateVideo,
disclaimer as disclaimer,
control_org_name as controlOrgName,
manage_user_name as manageUserName,
manage_user_mobile as manageUserMobile,
mfrs_Mobile as mfrsMobile,
health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/async/AsyncImportService.java
+3 -3
View File
@@ -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.getBegin())
.ifPresent(begin -> Optional.ofNullable(tblQimoNotice.getEnd()).ifPresent(end -> {
Optional.ofNullable(tblQimoNotice.getBeginTime())
.ifPresent(begin -> Optional.ofNullable(tblQimoNotice.getEndTime()).ifPresent(end -> {
exportVO.setCallDuration(String.valueOf(end.getTime() - begin.getTime()));
}));
exportVO.setCallTime(Optional.ofNullable(tblQimoNotice.getBegin())
exportVO.setCallTime(Optional.ofNullable(tblQimoNotice.getBeginTime())
.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
+2 -2
View File
@@ -60,8 +60,8 @@ public class PhoneDataInfo {
this.seatNo = tblQimoNotice.getExten();
this.phone = tblQimoNotice.getCallNo();
this.callTime = tblQimoNotice.getRing();
if (ObjUtil.isNotEmpty(tblQimoNotice.getBegin()) && ObjUtil.isNotEmpty(tblQimoNotice.getEnd())) {
this.callDuration = String.valueOf((tblQimoNotice.getEnd().getTime() - tblQimoNotice.getBegin().getTime()) / 1000);
if (ObjUtil.isNotEmpty(tblQimoNotice.getBeginTime()) && ObjUtil.isNotEmpty(tblQimoNotice.getEndTime())) {
this.callDuration = String.valueOf((tblQimoNotice.getEndTime().getTime() - tblQimoNotice.getBeginTime().getTime()) / 1000);
}
}
}
health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/EmergencyGroupedServiceImpl.java
+2 -2
View File
@@ -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.getEnd()) && ObjectUtil.isNotEmpty(item.getBegin())){
vo.setCallDuration(item.getEnd().getTime() - item.getBegin().getTime());
if (ObjectUtil.isNotEmpty(item.getEndTime()) && ObjectUtil.isNotEmpty(item.getBeginTime())){
vo.setCallDuration(item.getEndTime().getTime() - item.getBeginTime().getTime());
}
Optional.ofNullable(item.getCreateDate()).ifPresent(vo::setCallTime);
voList.add(vo);