From f08739f46afe856f60ebb1d21ab23d72947629ed Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期日, 21 十二月 2025 00:03:12 +0800
Subject: [PATCH] feat:优化任务搜索查询 app
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysEmergencyTaskServiceImpl.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysEmergencyTaskServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysEmergencyTaskServiceImpl.java
index f85f37b..54d7964 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysEmergencyTaskServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysEmergencyTaskServiceImpl.java
@@ -41,9 +41,11 @@
@Override
public void saveEmergencyInfo(Long taskId, String createUserName, TaskCreateVO createVO,
- String serviceOrderId, String dispatchOrderId, String serviceOrdNo) {
+ Long serviceOrderId, Long dispatchOrderId, String serviceOrdNo) {
SysTaskEmergency emergencyInfo = new SysTaskEmergency();
emergencyInfo.setTaskId(taskId);
+ emergencyInfo.setServiceOrdVip(createVO.getServiceOrdVIP());
+ emergencyInfo.setFromHq2Is(createVO.getFromHQ2_is());
if (createVO.getPatient() != null) {
emergencyInfo.setPatientContact(createVO.getPatient().getContact());
@@ -110,7 +112,7 @@
}
}
- emergencyInfo.setTransferDistance(createVO.getTransferDistance());
+ emergencyInfo.setTransferDistance(createVO.getDistance());
emergencyInfo.setTransferPrice(createVO.getPrice());
emergencyInfo.setDocumentTypeId(createVO.getDocumentTypeId());
emergencyInfo.setTaskTypeId(createVO.getTaskTypeId());
@@ -123,13 +125,13 @@
}
if (serviceOrderId != null) {
- emergencyInfo.setLegacyServiceOrdId(Long.parseLong(serviceOrderId));
+ emergencyInfo.setLegacyServiceOrdId(serviceOrderId);
emergencyInfo.setSyncStatus(2);
emergencyInfo.setSyncTime(DateUtils.getNowDate());
emergencyInfo.setSyncErrorMsg("鏃х郴缁熷悓姝ヨ繃鏉�");
}
if (dispatchOrderId != null) {
- emergencyInfo.setLegacyDispatchOrdId(Long.parseLong(dispatchOrderId));
+ emergencyInfo.setLegacyDispatchOrdId(dispatchOrderId);
emergencyInfo.setDispatchSyncStatus(2);
emergencyInfo.setDispatchSyncTime(DateUtils.getNowDate());
emergencyInfo.setDispatchSyncErrorMsg("鏃х郴缁熷悓姝ヨ繃鏉�");
@@ -266,8 +268,8 @@
}
}
- if (updateVO.getTransferDistance() != null) {
- oldEmergency.setTransferDistance(updateVO.getTransferDistance());
+ if (updateVO.getDistance() != null) {
+ oldEmergency.setTransferDistance(updateVO.getDistance());
}
if (updateVO.getPrice() != null) {
oldEmergency.setTransferPrice(updateVO.getPrice());
@@ -306,6 +308,9 @@
if( updateVO.getLegacyServiceOrdClass() != null){
oldEmergency.setLegacyServiceOrdClass(updateVO.getLegacyServiceOrdClass());
}
+
+ oldEmergency.setFromHq2Is(updateVO.getFromHQ2_is());
+ oldEmergency.setServiceOrdVip(updateVO.getServiceOrdVIP());
sysTaskEmergencyMapper.updateSysTaskEmergency(oldEmergency);
}
@@ -428,8 +433,8 @@
}
// 鏇存柊璐圭敤淇℃伅
- if (createVO.getTransferDistance() != null) {
- existingInfo.setTransferDistance(createVO.getTransferDistance());
+ if (createVO.getDistance() != null) {
+ existingInfo.setTransferDistance(createVO.getDistance());
}
if (createVO.getPrice() != null) {
existingInfo.setTransferPrice(createVO.getPrice());
@@ -472,7 +477,9 @@
if(createVO.getLegacyServiceOrdClass() != null){
existingInfo.setLegacyServiceOrdClass(createVO.getLegacyServiceOrdClass());
}
-
+
+ existingInfo.setServiceOrdVip(createVO.getServiceOrdVIP());
+ existingInfo.setFromHq2Is(createVO.getFromHQ2_is());
// 鎵ц鏇存柊
sysTaskEmergencyMapper.updateSysTaskEmergency(existingInfo);
}
@@ -484,6 +491,7 @@
}
try {
sysTaskEmergencyService.markNeedResync(taskId);
+
} catch (Exception e) {
// 鏍囪澶辫触涓嶅奖鍝嶄富娴佺▼
}
--
Gitblit v1.9.1