From 656d6f8029f8bf9b2daa9dcc89101a879a70b860 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期三, 03 十二月 2025 23:10:05 +0800
Subject: [PATCH] feat:优先添加执行人
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java | 639 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 456 insertions(+), 183 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java
index afde674..466e111 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java
@@ -8,6 +8,7 @@
import java.net.URL;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.system.domain.vo.*;
import com.ruoyi.system.mapper.*;
import com.ruoyi.system.utils.TaskCodeGenerator;
import com.ruoyi.common.config.ImageUrlConfig;
@@ -28,10 +29,6 @@
import com.ruoyi.system.domain.SysTaskEmergency;
import com.ruoyi.system.domain.SysTaskWelfare;
import com.ruoyi.system.domain.SysTaskAssignee;
-import com.ruoyi.system.domain.vo.TaskQueryVO;
-import com.ruoyi.system.domain.vo.TaskCreateVO;
-import com.ruoyi.system.domain.vo.TaskUpdateVO;
-import com.ruoyi.system.domain.vo.TaskStatisticsVO;
import com.ruoyi.system.domain.enums.TaskStatus;
import com.ruoyi.system.domain.VehicleInfo;
import com.ruoyi.system.service.ISysTaskService;
@@ -259,11 +256,11 @@
taskVehicle.setTaskId(task.getTaskId());
taskVehicle.setVehicleId(vehicleId);
taskVehicle.setAssignTime(DateUtils.getNowDate());
- taskVehicle.setAssignBy(SecurityUtils.getUsername());
+ taskVehicle.setAssignBy(username);
taskVehicle.setStatus("ASSIGNED");
- taskVehicle.setCreateBy(SecurityUtils.getUsername());
+ taskVehicle.setCreateBy(username);
taskVehicle.setCreateTime(DateUtils.getNowDate());
- taskVehicle.setUpdateBy(SecurityUtils.getUsername());
+ taskVehicle.setUpdateBy(username);
taskVehicle.setUpdateTime(DateUtils.getNowDate());
sysTaskVehicleMapper.insertSysTaskVehicle(taskVehicle);
@@ -549,49 +546,70 @@
*/
@Override
@Transactional
- public int updateSysTask(TaskUpdateVO updateVO) {
+ public int updateSysTask(TaskUpdateVO updateVO, Boolean updateFromLegacy) {
SysTask oldTask = sysTaskMapper.selectSysTaskByTaskId(updateVO.getTaskId());
if (oldTask == null) {
throw new RuntimeException("浠诲姟涓嶅瓨鍦�");
}
+ String userName = SecurityUtils.getUsername();
SysTask task = new SysTask();
task.setTaskId(updateVO.getTaskId());
task.setTaskDescription(updateVO.getTaskDescription());
+ task.setPlannedStartTime(updateVO.getPlannedStartTime());
+ task.setPlannedEndTime(updateVO.getPlannedEndTime());
+ task.setAssigneeId(updateVO.getAssigneeId());
+ task.setUpdateBy(userName);
+ task.setUpdateTime(updateVO.getUpdateTime() != null ? updateVO.getUpdateTime() : DateUtils.getNowDate());
+ task.setRemark(updateVO.getRemark());
+
+ // 璁剧疆閫氱敤鍦板潃鍜屽潗鏍囦俊鎭�
task.setDepartureAddress(updateVO.getDepartureAddress());
task.setDestinationAddress(updateVO.getDestinationAddress());
task.setDepartureLongitude(updateVO.getDepartureLongitude());
task.setDepartureLatitude(updateVO.getDepartureLatitude());
task.setDestinationLongitude(updateVO.getDestinationLongitude());
task.setDestinationLatitude(updateVO.getDestinationLatitude());
- task.setPlannedStartTime(updateVO.getPlannedStartTime());
- task.setPlannedEndTime(updateVO.getPlannedEndTime());
- task.setAssigneeId(updateVO.getAssigneeId());
- task.setUpdateBy(SecurityUtils.getUsername());
- task.setUpdateTime(DateUtils.getNowDate());
- task.setRemark(updateVO.getRemark());
+
+ // 璁剧疆棰勮璺濈
+ if (updateVO.getEstimatedDistance() != null) {
+ task.setEstimatedDistance(updateVO.getEstimatedDistance());
+ } else if (updateVO.getTransferDistance() != null) {
+ // 鍏煎鎬ユ晳杞繍瀛楁
+ task.setEstimatedDistance(updateVO.getTransferDistance());
+ } else if (updateVO.getDistance() != null) {
+ // 鍏煎绂忕杞﹀瓧娈�
+ task.setEstimatedDistance(updateVO.getDistance());
+ }
// 濡傛灉鏇存柊浜嗛儴闂↖D
if (updateVO.getDeptId() != null) {
task.setDeptId(updateVO.getDeptId());
}
+ // 濡傛灉鏇存柊浜嗕换鍔＄紪鍙�
+ if (updateVO.getTaskCode() != null) {
+ task.setTaskCode(updateVO.getTaskCode());
+ }
+
// 鑷姩鑾峰彇鍑哄彂鍦癎PS鍧愭爣锛堝鏋滄洿鏂颁簡鍦板潃浣嗙己澶卞潗鏍囷級
if (updateVO.getDepartureAddress() != null &&
(updateVO.getDepartureLongitude() == null || updateVO.getDepartureLatitude() == null) &&
mapService != null) {
- try {
- Map<String, Double> coords = mapService.geocoding(
- updateVO.getDepartureAddress(),
- extractCityFromAddress(updateVO.getDepartureAddress())
- );
- if (coords != null) {
- task.setDepartureLongitude(BigDecimal.valueOf(coords.get("lng")));
- task.setDepartureLatitude(BigDecimal.valueOf(coords.get("lat")));
- log.info("鍑哄彂鍦癎PS鍧愭爣鑷姩鑾峰彇鎴愬姛: {}, {}", coords.get("lng"), coords.get("lat"));
+ if (!updateVO.getDepartureAddress().equals(oldTask.getDepartureAddress())) {
+ try {
+ Map<String, Double> coords = mapService.geocoding(
+ updateVO.getDepartureAddress(),
+ extractCityFromAddress(updateVO.getDepartureAddress())
+ );
+ if (coords != null) {
+ task.setDepartureLongitude(BigDecimal.valueOf(coords.get("lng")));
+ task.setDepartureLatitude(BigDecimal.valueOf(coords.get("lat")));
+ log.info("鍑哄彂鍦癎PS鍧愭爣鑷姩鑾峰彇鎴愬姛: {}, {}", coords.get("lng"), coords.get("lat"));
+ }
+ } catch (Exception e) {
+ log.error("鑷姩鑾峰彇鍑哄彂鍦癎PS鍧愭爣澶辫触", e);
}
- } catch (Exception e) {
- log.error("鑷姩鑾峰彇鍑哄彂鍦癎PS鍧愭爣澶辫触", e);
}
}
@@ -599,28 +617,27 @@
if (updateVO.getDestinationAddress() != null &&
(updateVO.getDestinationLongitude() == null || updateVO.getDestinationLatitude() == null) &&
mapService != null) {
- try {
- Map<String, Double> coords = mapService.geocoding(
- updateVO.getDestinationAddress(),
- extractCityFromAddress(updateVO.getDestinationAddress())
- );
- if (coords != null) {
- task.setDestinationLongitude(BigDecimal.valueOf(coords.get("lng")));
- task.setDestinationLatitude(BigDecimal.valueOf(coords.get("lat")));
- log.info("鐩殑鍦癎PS鍧愭爣鑷姩鑾峰彇鎴愬姛: {}, {}", coords.get("lng"), coords.get("lat"));
+ if (!updateVO.getDestinationAddress().equals(oldTask.getDestinationAddress())) {
+ try {
+ Map<String, Double> coords = mapService.geocoding(
+ updateVO.getDestinationAddress(),
+ extractCityFromAddress(updateVO.getDestinationAddress())
+ );
+ if (coords != null) {
+ task.setDestinationLongitude(BigDecimal.valueOf(coords.get("lng")));
+ task.setDestinationLatitude(BigDecimal.valueOf(coords.get("lat")));
+ log.info("鐩殑鍦癎PS鍧愭爣鑷姩鑾峰彇鎴愬姛: {}, {}", coords.get("lng"), coords.get("lat"));
+ }
+ } catch (Exception e) {
+ log.error("鑷姩鑾峰彇鐩殑鍦癎PS鍧愭爣澶辫触", e);
}
- } catch (Exception e) {
- log.error("鑷姩鑾峰彇鐩殑鍦癎PS鍧愭爣澶辫触", e);
}
}
-
- // 閲嶆柊璁＄畻棰勮鍏噷鏁�
- calculateEstimatedDistance(task);
-
+ // 鐢ㄤ簬璺熻釜鏄惁闇�瑕侀噸鏂板悓姝ワ紙杞﹁締銆佷汉鍛樸�佸湴鍧�銆佹垚浜や环鍙樻洿锛�
+ boolean needResync = true;
int result = sysTaskMapper.updateSysTask(task);
- // 鐢ㄤ簬璺熻釜鏄惁闇�瑕侀噸鏂板悓姝ワ紙杞﹁締銆佷汉鍛樸�佸湴鍧�銆佹垚浜や环鍙樻洿锛�
- boolean needResync = false;
+
// 鏇存柊杞﹁締鍏宠仈
if (result > 0 && updateVO.getVehicleIds() != null && !updateVO.getVehicleIds().isEmpty()) {
@@ -640,7 +657,7 @@
// 娣诲姞鏂扮殑杞﹁締鍏宠仈
Date now = DateUtils.getNowDate();
- String currentUser = SecurityUtils.getUsername();
+ String currentUser = userName;
for (Long vehicleId : updateVO.getVehicleIds()) {
SysTaskVehicle taskVehicle = new SysTaskVehicle();
taskVehicle.setTaskId(updateVO.getTaskId());
@@ -665,7 +682,7 @@
.collect(Collectors.toList());
List<Long> newAssigneeIds = updateVO.getAssignees().stream()
- .map(TaskUpdateVO.AssigneeInfo::getUserId)
+ .map(TaskCreateVO.AssigneeInfo::getUserId)
.collect(Collectors.toList());
// 姣旇緝鏂版棫鎵ц浜哄憳ID鍒楄〃锛屽垽鏂槸鍚︽湁鍙樺寲
@@ -678,17 +695,7 @@
// 娣诲姞鏂扮殑鎵ц浜哄憳鍏宠仈
if (!updateVO.getAssignees().isEmpty()) {
- // 灏� TaskUpdateVO.AssigneeInfo 杞崲涓� TaskCreateVO.AssigneeInfo
- List<TaskCreateVO.AssigneeInfo> createAssignees = updateVO.getAssignees().stream()
- .map(assignee -> {
- TaskCreateVO.AssigneeInfo createAssignee = new TaskCreateVO.AssigneeInfo();
- createAssignee.setUserId(assignee.getUserId());
- createAssignee.setUserName(assignee.getUserName());
- createAssignee.setUserType(assignee.getUserType());
- return createAssignee;
- })
- .collect(Collectors.toList());
- saveTaskAssignees(updateVO.getTaskId(), createAssignees, SecurityUtils.getUsername());
+ saveTaskAssignees(updateVO.getTaskId(), updateVO.getAssignees(), userName);
}
// 鏍囪闇�瑕侀噸鏂板悓姝ワ紙浜哄憳鍙樻洿锛�
@@ -697,37 +704,41 @@
}
// 鏇存柊鎬ユ晳杞繍鎵╁睍淇℃伅锛堟娴嬪湴鍧�鍜屾垚浜や环鍙樻洿锛�
- if (result > 0 && "EMERGENCY_TRANSFER".equals(oldTask.getTaskType()) && updateVO.getEmergencyInfo() != null) {
+ if (result > 0 && "EMERGENCY_TRANSFER".equals(oldTask.getTaskType())) {
// 鑾峰彇鏃х殑鎬ユ晳杞繍淇℃伅
SysTaskEmergency oldEmergency = sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(updateVO.getTaskId());
// 妫�娴嬭浆鍑哄尰闄㈠湴鍧�鍙樻洿
boolean hospitalOutAddressChanged = false;
- if (updateVO.getEmergencyInfo().getHospitalOutAddress() != null
- && oldEmergency != null
- && !updateVO.getEmergencyInfo().getHospitalOutAddress().equals(oldEmergency.getHospitalOutAddress())) {
+ if (updateVO.getHospitalOut() != null && updateVO.getHospitalOut().getAddress() != null
+ && oldEmergency != null
+ && !updateVO.getHospitalOut().getAddress().equals(oldEmergency.getHospitalOutAddress())) {
hospitalOutAddressChanged = true;
}
// 妫�娴嬭浆鍏ュ尰闄㈠湴鍧�鍙樻洿
boolean hospitalInAddressChanged = false;
- if (updateVO.getEmergencyInfo().getHospitalInAddress() != null
- && oldEmergency != null
- && !updateVO.getEmergencyInfo().getHospitalInAddress().equals(oldEmergency.getHospitalInAddress())) {
+ if (updateVO.getHospitalIn() != null && updateVO.getHospitalIn().getAddress() != null
+ && oldEmergency != null
+ && !updateVO.getHospitalIn().getAddress().equals(oldEmergency.getHospitalInAddress())) {
hospitalInAddressChanged = true;
}
// 妫�娴嬫垚浜や环鍙樻洿
boolean transferPriceChanged = false;
- if (updateVO.getEmergencyInfo().getTransferPrice() != null
- && oldEmergency != null
+ if (updateVO.getPrice() != null
+ && oldEmergency != null
&& oldEmergency.getTransferPrice() != null
- && updateVO.getEmergencyInfo().getTransferPrice().compareTo(oldEmergency.getTransferPrice()) != 0) {
+ && updateVO.getPrice().compareTo(oldEmergency.getTransferPrice()) != 0) {
transferPriceChanged = true;
}
+
+ ;
// 鏇存柊鎬ユ晳杞繍淇℃伅
- updateEmergencyInfo(updateVO.getTaskId(), updateVO);
+ if (updateVO.getHospitalOut() != null || updateVO.getHospitalIn() != null || updateVO.getPatient() != null) {
+ updateEmergencyInfoFromCreateVO(updateVO.getTaskId(), updateVO, userName);
+ }
// 濡傛灉鍦板潃鎴栨垚浜や环鍙戠敓鍙樻洿锛屾爣璁伴渶瑕侀噸鏂板悓姝�
if (hospitalOutAddressChanged || hospitalInAddressChanged || transferPriceChanged) {
@@ -735,8 +746,15 @@
}
}
+ // 鏇存柊绂忕杞︽墿灞曚俊鎭�
+ if (result > 0 && "WELFARE".equals(oldTask.getTaskType())) {
+ if (updateVO.getPassenger() != null || updateVO.getStartAddress() != null || updateVO.getEndAddress() != null) {
+ updateWelfareInfoFromCreateVO(updateVO.getTaskId(), updateVO, userName);
+ }
+ }
+
// 濡傛灉鏄�ユ晳杞繍浠诲姟涓旀湁鍙樻洿锛屾爣璁伴渶瑕侀噸鏂板悓姝�
- if (result > 0 && "EMERGENCY_TRANSFER".equals(oldTask.getTaskType()) && needResync) {
+ if (result > 0 && "EMERGENCY_TRANSFER".equals(oldTask.getTaskType()) && needResync && !updateFromLegacy) {
try {
sysTaskEmergencyService.markNeedResync(updateVO.getTaskId());
} catch (Exception e) {
@@ -746,9 +764,183 @@
// 璁板綍鎿嶄綔鏃ュ織
if (result > 0) {
- recordTaskLog(updateVO.getTaskId(), "UPDATE", "鏇存柊浠诲姟",
- buildTaskDescription(oldTask), buildTaskDescription(task),
- SecurityUtils.getUserId(), SecurityUtils.getUsername());
+ recordTaskLog(updateVO.getTaskId(), "UPDATE", "鏇存柊浠诲姟",
+ buildTaskDescription(oldTask), buildTaskDescription(task),
+ SecurityUtils.getUserId(), userName);
+ }
+
+ return result;
+ }
+
+ /**
+ * 鏇存柊浠诲姟锛堢敤浜庢棫绯荤粺鍚屾锛�
+ *
+ * @param updateVO 浠诲姟鏇存柊瀵硅薄
+ * @param serviceOrderId 鏃х郴缁熸湇鍔″崟ID
+ * @param dispatchOrderId 鏃х郴缁熻皟搴﹀崟ID
+ * @param serviceOrdNo 鏃х郴缁熸湇鍔″崟缂栧彿
+ * @param userId 鐢ㄦ埛ID
+ * @param userName 鐢ㄦ埛鍚�
+ * @param deptId 閮ㄩ棬ID
+ * @param createTime 鍒涘缓鏃堕棿
+ * @param updateTime 鏇存柊鏃堕棿
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateTask(TaskUpdateVO updateVO, String serviceOrderId, String dispatchOrderId, String serviceOrdNo,
+ Long userId, String userName, Long deptId, Date createTime, Date updateTime) {
+ // 閫氳繃鏃х郴缁熸湇鍔″崟ID鏌ユ壘浠诲姟
+ SysTaskEmergency taskEmergency = sysTaskEmergencyMapper.selectByLegacyServiceOrdId(Long.parseLong(serviceOrderId));
+ Long taskId = taskEmergency.getTaskId();
+ updateVO.setTaskId(taskId);
+ SysTask task = new SysTask();
+ task.setTaskId(taskId);
+ task.setTaskDescription(updateVO.getTaskDescription());
+ task.setPlannedStartTime(updateVO.getPlannedStartTime());
+ task.setPlannedEndTime(updateVO.getPlannedEndTime());
+ task.setAssigneeId(updateVO.getAssigneeId());
+ task.setUpdateBy(userName);
+ task.setUpdateTime(DateUtils.getNowDate());
+ task.setRemark(updateVO.getRemark());
+
+
+ // 璁剧疆鍦板潃鍜屽潗鏍囦俊鎭�
+ task.setDepartureAddress(updateVO.getDepartureAddress());
+ task.setDestinationAddress(updateVO.getDestinationAddress());
+ task.setDepartureLongitude(updateVO.getDepartureLongitude());
+ task.setDepartureLatitude(updateVO.getDepartureLatitude());
+ task.setDestinationLongitude(updateVO.getDestinationLongitude());
+ task.setDestinationLatitude(updateVO.getDestinationLatitude());
+
+ // 濡傛灉鏇存柊浜嗛儴闂↖D
+ if (updateVO.getDeptId() != null) {
+ task.setDeptId(updateVO.getDeptId());
+ }
+
+ // 濡傛灉鏇存柊浜嗕换鍔＄紪鍙�
+ if (updateVO.getTaskCode() != null) {
+ task.setTaskCode(updateVO.getTaskCode());
+ }
+
+ // 鑾峰彇鏃т换鍔′俊鎭紝鐢ㄤ簬鍒ゆ柇鍦板潃鏄惁鍙樻洿
+ SysTask oldTask = sysTaskMapper.selectSysTaskByTaskId(taskId);
+
+ // 鑷姩鑾峰彇鍑哄彂鍦癎PS鍧愭爣锛堝鏋滃湴鍧�鍙樻洿涓旂己澶卞潗鏍囷級
+ if (oldTask != null && updateVO.getDepartureAddress() != null
+ && !updateVO.getDepartureAddress().equals(oldTask.getDepartureAddress())
+ && (updateVO.getDepartureLongitude() == null || updateVO.getDepartureLatitude() == null)
+ && mapService != null) {
+ try {
+ Map<String, Double> coords = mapService.geocoding(
+ updateVO.getDepartureAddress(),
+ extractCityFromAddress(updateVO.getDepartureAddress())
+ );
+ if (coords != null) {
+ task.setDepartureLongitude(BigDecimal.valueOf(coords.get("lng")));
+ task.setDepartureLatitude(BigDecimal.valueOf(coords.get("lat")));
+ log.info("鍑哄彂鍦癎PS鍧愭爣鑷姩鑾峰彇鎴愬姛: {}, {}", coords.get("lng"), coords.get("lat"));
+ }
+ } catch (Exception e) {
+ log.error("鑷姩鑾峰彇鍑哄彂鍦癎PS鍧愭爣澶辫触", e);
+ }
+ }
+
+ // 鑷姩鑾峰彇鐩殑鍦癎PS鍧愭爣锛堝鏋滃湴鍧�鍙樻洿涓旂己澶卞潗鏍囷級
+ if (oldTask != null && updateVO.getDestinationAddress() != null
+ && !updateVO.getDestinationAddress().equals(oldTask.getDestinationAddress())
+ && (updateVO.getDestinationLongitude() == null || updateVO.getDestinationLatitude() == null)
+ && mapService != null) {
+ try {
+ Map<String, Double> coords = mapService.geocoding(
+ updateVO.getDestinationAddress(),
+ extractCityFromAddress(updateVO.getDestinationAddress())
+ );
+ if (coords != null) {
+ task.setDestinationLongitude(BigDecimal.valueOf(coords.get("lng")));
+ task.setDestinationLatitude(BigDecimal.valueOf(coords.get("lat")));
+ log.info("鐩殑鍦癎PS鍧愭爣鑷姩鑾峰彇鎴愬姛: {}, {}", coords.get("lng"), coords.get("lat"));
+ }
+ } catch (Exception e) {
+ log.error("鑷姩鑾峰彇鐩殑鍦癎PS鍧愭爣澶辫触", e);
+ }
+ }
+
+ int result = sysTaskMapper.updateSysTask(task);
+
+ // 鏇存柊杞﹁締鍏宠仈
+ if (result > 0 && updateVO.getVehicleIds() != null && !updateVO.getVehicleIds().isEmpty()) {
+ // 鏌ヨ鐜版湁鐨勮溅杈嗗叧鑱�
+ List<SysTaskVehicle> existingVehicles = sysTaskVehicleMapper.selectSysTaskVehicleByTaskId(taskId);
+ List<Long> existingVehicleIds = existingVehicles.stream()
+ .map(SysTaskVehicle::getVehicleId)
+ .collect(Collectors.toList());
+
+ // 姣旇緝鏂版棫杞﹁締ID鍒楄〃锛屽垽鏂槸鍚︽湁鍙樺寲
+ boolean vehiclesChanged = !new HashSet<>(existingVehicleIds).equals(new HashSet<>(updateVO.getVehicleIds()));
+
+ // 鍙湁杞﹁締鍙戠敓鍙樺寲鏃舵墠鏇存柊
+ if (vehiclesChanged) {
+ // 鍒犻櫎鏃х殑杞﹁締鍏宠仈
+ sysTaskVehicleMapper.deleteSysTaskVehicleByTaskId(taskId);
+
+ // 娣诲姞鏂扮殑杞﹁締鍏宠仈
+ Date now = DateUtils.getNowDate();
+ for (Long vehicleId : updateVO.getVehicleIds()) {
+ SysTaskVehicle taskVehicle = new SysTaskVehicle();
+ taskVehicle.setTaskId(taskId);
+ taskVehicle.setVehicleId(vehicleId);
+ taskVehicle.setAssignTime(now);
+ taskVehicle.setAssignBy(userName);
+ taskVehicle.setCreateTime(now);
+ sysTaskVehicleMapper.insertSysTaskVehicle(taskVehicle);
+ }
+ }
+ }
+
+ // 鏇存柊鎵ц浜哄憳锛堟娴嬩汉鍛樺彉鏇达級
+ if (result > 0 && updateVO.getAssignees() != null) {
+ // 鏌ヨ鐜版湁鐨勬墽琛屼汉鍛�
+ List<SysTaskAssignee> existingAssignees = sysTaskAssigneeMapper.selectSysTaskAssigneeByTaskId(taskId);
+ List<Long> existingAssigneeIds = existingAssignees.stream()
+ .map(SysTaskAssignee::getUserId)
+ .collect(Collectors.toList());
+
+ List<Long> newAssigneeIds = updateVO.getAssignees().stream()
+ .map(TaskCreateVO.AssigneeInfo::getUserId)
+ .collect(Collectors.toList());
+
+ // 姣旇緝鏂版棫鎵ц浜哄憳ID鍒楄〃锛屽垽鏂槸鍚︽湁鍙樺寲
+ boolean assigneesChanged = !new HashSet<>(existingAssigneeIds).equals(new HashSet<>(newAssigneeIds));
+
+ // 鍙湁鎵ц浜哄憳鍙戠敓鍙樺寲鏃舵墠鏇存柊
+ if (assigneesChanged) {
+ // 鍒犻櫎鏃х殑鎵ц浜哄憳鍏宠仈
+ sysTaskAssigneeMapper.deleteSysTaskAssigneeByTaskId(taskId);
+
+ // 娣诲姞鏂扮殑鎵ц浜哄憳鍏宠仈
+ if (!updateVO.getAssignees().isEmpty()) {
+ saveTaskAssignees(taskId, updateVO.getAssignees(), userName);
+ }
+ }
+ }
+
+ // 鏇存柊鎬ユ晳杞繍鎵╁睍淇℃伅
+ if (result > 0) {
+ // 鏇存柊鏃х郴缁烮D
+ if (serviceOrderId != null) {
+ taskEmergency.setLegacyServiceOrdId(Long.parseLong(serviceOrderId));
+ }
+ if (dispatchOrderId != null) {
+ taskEmergency.setLegacyDispatchOrdId(Long.parseLong(dispatchOrderId));
+ }
+ if (serviceOrdNo != null) {
+ taskEmergency.setLegacyServiceOrdNo(serviceOrdNo);
+ }
+
+ // 浣跨敤TaskCreateVO鐨勫瓧娈垫潵鏇存柊鎬ユ晳杞繍淇℃伅
+ if (updateVO.getHospitalOut() != null || updateVO.getHospitalIn() != null || updateVO.getPatient() != null) {
+ updateEmergencyInfoFromCreateVO(taskId, updateVO, userName);
+ }
}
return result;
@@ -1165,7 +1357,7 @@
*/
@Override
@Transactional
- public int assignVehicleToTask(Long taskId, Long vehicleId, String remark) {
+ public int assignVehicleToTask(Long taskId, Long vehicleId, String remark,Long userId,String userName) {
// 妫�鏌ユ槸鍚﹀凡缁忓垎閰�
int exists = sysTaskVehicleMapper.checkTaskVehicleExists(taskId, vehicleId);
if (exists > 0) {
@@ -1176,7 +1368,7 @@
taskVehicle.setTaskId(taskId);
taskVehicle.setVehicleId(vehicleId);
taskVehicle.setAssignTime(DateUtils.getNowDate());
- taskVehicle.setAssignBy(SecurityUtils.getUsername());
+ taskVehicle.setAssignBy(userName);
taskVehicle.setStatus("ASSIGNED");
taskVehicle.setRemark(remark);
@@ -1186,7 +1378,7 @@
if (result > 0) {
recordTaskLog(taskId, "ASSIGN", "鍒嗛厤杞﹁締", null,
"鍒嗛厤杞﹁締ID锛�" + vehicleId + "锛屽娉細" + remark,
- SecurityUtils.getUserId(), SecurityUtils.getUsername());
+ userId, userName);
}
return result;
@@ -1224,10 +1416,10 @@
*/
@Override
@Transactional
- public int assignMultipleVehiclesToTask(Long taskId, List<Long> vehicleIds, String remark) {
+ public int assignMultipleVehiclesToTask(Long taskId, List<Long> vehicleIds, String remark,Long userId,String userName) {
List<SysTaskVehicle> taskVehicles = new ArrayList<>();
Date now = DateUtils.getNowDate();
- String assignBy = SecurityUtils.getUsername();
+ String assignBy = userName;
for (Long vehicleId : vehicleIds) {
// 妫�鏌ユ槸鍚﹀凡缁忓垎閰�
@@ -1253,7 +1445,7 @@
if (result > 0) {
recordTaskLog(taskId, "ASSIGN", "鎵归噺鍒嗛厤杞﹁締", null,
"鍒嗛厤杞﹁締鏁伴噺锛�" + result + "锛屽娉細" + remark,
- SecurityUtils.getUserId(), SecurityUtils.getUsername());
+ userId,userName);
}
return result;
@@ -1768,12 +1960,13 @@
}
/**
- * 鏇存柊鎬ユ晳杞繍浠诲姟鎵╁睍淇℃伅
+ * 浠� TaskCreateVO 鏇存柊鎬ユ晳杞繍浠诲姟鎵╁睍淇℃伅
*
* @param taskId 浠诲姟ID
- * @param updateVO 浠诲姟鏇存柊瀵硅薄
+ * @param createVO 浠诲姟鍒涘缓/鏇存柊瀵硅薄
+ * @param userName 鎿嶄綔浜哄悕
*/
- private void updateEmergencyInfo(Long taskId, TaskUpdateVO updateVO) {
+ private void updateEmergencyInfoFromCreateVO(Long taskId, TaskCreateVO createVO, String userName) {
// 鏌ヨ鐜版湁鐨勬墿灞曚俊鎭�
SysTaskEmergency existingInfo = sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(taskId);
if (existingInfo == null) {
@@ -1781,143 +1974,223 @@
existingInfo = new SysTaskEmergency();
existingInfo.setTaskId(taskId);
existingInfo.setCreateTime(DateUtils.getNowDate());
- existingInfo.setCreateBy(SecurityUtils.getUsername());
+ existingInfo.setCreateBy(userName);
}
-
- TaskUpdateVO.EmergencyInfoVO emergencyInfo = updateVO.getEmergencyInfo();
// 鏇存柊鎮ｈ�呬俊鎭�
- if (emergencyInfo.getPatientContact() != null) {
- existingInfo.setPatientContact(emergencyInfo.getPatientContact());
- }
- if (emergencyInfo.getPatientPhone() != null) {
- existingInfo.setPatientPhone(emergencyInfo.getPatientPhone());
- }
- if (emergencyInfo.getPatientName() != null) {
- existingInfo.setPatientName(emergencyInfo.getPatientName());
- }
- if (emergencyInfo.getPatientGender() != null) {
- existingInfo.setPatientGender(emergencyInfo.getPatientGender());
- }
- if (emergencyInfo.getPatientIdCard() != null) {
- existingInfo.setPatientIdCard(emergencyInfo.getPatientIdCard());
- }
- if (emergencyInfo.getPatientCondition() != null) {
- existingInfo.setPatientCondition(emergencyInfo.getPatientCondition());
+ if (createVO.getPatient() != null) {
+ if (createVO.getPatient().getContact() != null) {
+ existingInfo.setPatientContact(createVO.getPatient().getContact());
+ }
+ if (createVO.getPatient().getPhone() != null) {
+ existingInfo.setPatientPhone(createVO.getPatient().getPhone());
+ }
+ if (createVO.getPatient().getName() != null) {
+ existingInfo.setPatientName(createVO.getPatient().getName());
+ }
+ if (createVO.getPatient().getGender() != null) {
+ existingInfo.setPatientGender(createVO.getPatient().getGender());
+ }
+ if (createVO.getPatient().getIdCard() != null) {
+ existingInfo.setPatientIdCard(createVO.getPatient().getIdCard());
+ }
+ if (createVO.getPatient().getCondition() != null) {
+ existingInfo.setPatientCondition(createVO.getPatient().getCondition());
+ }
}
// 鏇存柊杞嚭鍖婚櫌淇℃伅
- if (emergencyInfo.getHospitalOutId() != null) {
- existingInfo.setHospitalOutId(emergencyInfo.getHospitalOutId());
- }
- if (emergencyInfo.getHospitalOutName() != null) {
- existingInfo.setHospitalOutName(emergencyInfo.getHospitalOutName());
- }
- if (emergencyInfo.getHospitalOutDepartment() != null) {
- existingInfo.setHospitalOutDepartment(emergencyInfo.getHospitalOutDepartment());
- }
- if (emergencyInfo.getHospitalOutDepartmentId() != null) {
- existingInfo.setHospitalOutDepartmentId(emergencyInfo.getHospitalOutDepartmentId());
- }
- if (emergencyInfo.getHospitalOutBedNumber() != null) {
- existingInfo.setHospitalOutBedNumber(emergencyInfo.getHospitalOutBedNumber());
- }
- if (emergencyInfo.getHospitalOutAddress() != null) {
- existingInfo.setHospitalOutAddress(emergencyInfo.getHospitalOutAddress());
-
- // 濡傛灉鏇存柊浜嗗湴鍧�浣嗘病鏈塆PS鍧愭爣锛屽悗绔嚜鍔ㄨ幏鍙�
- if (emergencyInfo.getHospitalOutLongitude() == null && emergencyInfo.getHospitalOutLatitude() == null && mapService != null) {
- try {
- Map<String, Double> coords = mapService.geocoding(
- emergencyInfo.getHospitalOutAddress(),
- extractCityFromAddress(emergencyInfo.getHospitalOutAddress())
- );
- if (coords != null) {
- existingInfo.setHospitalOutLongitude(BigDecimal.valueOf(coords.get("lng")));
- existingInfo.setHospitalOutLatitude(BigDecimal.valueOf(coords.get("lat")));
- log.info("杞嚭鍖婚櫌GPS鍧愭爣鑷姩鑾峰彇鎴愬姛: {}, {}", coords.get("lng"), coords.get("lat"));
+ if (createVO.getHospitalOut() != null) {
+ if (createVO.getHospitalOut().getId() != null) {
+ existingInfo.setHospitalOutId(createVO.getHospitalOut().getId());
+ }
+ if (createVO.getHospitalOut().getName() != null) {
+ existingInfo.setHospitalOutName(createVO.getHospitalOut().getName());
+ }
+ if (createVO.getHospitalOut().getDepartment() != null) {
+ existingInfo.setHospitalOutDepartment(createVO.getHospitalOut().getDepartment());
+ }
+ if (createVO.getHospitalOut().getDepartmentId() != null) {
+ existingInfo.setHospitalOutDepartmentId(createVO.getHospitalOut().getDepartmentId());
+ }
+ if (createVO.getHospitalOut().getBedNumber() != null) {
+ existingInfo.setHospitalOutBedNumber(createVO.getHospitalOut().getBedNumber());
+ }
+ if (createVO.getHospitalOut().getAddress() != null && !createVO.getHospitalOut().getAddress().equals(existingInfo.getHospitalOutAddress())) {
+ existingInfo.setHospitalOutAddress(createVO.getHospitalOut().getAddress());
+
+ // 濡傛灍鏇存柊浜嗗湴鍧�浣嗘病鏈塆PS鍧愭爣锛屽悗绔嚜鍔ㄨ幏鍙�
+ if (createVO.getHospitalOut().getLongitude() == null && createVO.getHospitalOut().getLatitude() == null && mapService != null) {
+ try {
+
+ Map<String, Double> coords = mapService.geocoding(
+ createVO.getHospitalOut().getAddress(),
+ extractCityFromAddress(createVO.getHospitalOut().getAddress())
+ );
+ if (coords != null) {
+ existingInfo.setHospitalOutLongitude(BigDecimal.valueOf(coords.get("lng")));
+ existingInfo.setHospitalOutLatitude(BigDecimal.valueOf(coords.get("lat")));
+ log.info("杞嚭鍖婚櫌GPS鍧愭爣鑷姩鑾峰彇鎴愬姛: {}, {}", coords.get("lng"), coords.get("lat"));
+ }
+ } catch (Exception e) {
+ log.error("鑷姩鑾峰彇杞嚭鍖婚櫌GPS鍧愭爣澶辫触", e);
}
- } catch (Exception e) {
- log.error("鑷姩鑾峰彇杞嚭鍖婚櫌GPS鍧愭爣澶辫触", e);
}
}
- }
- if (emergencyInfo.getHospitalOutLongitude() != null) {
- existingInfo.setHospitalOutLongitude(emergencyInfo.getHospitalOutLongitude());
- }
- if (emergencyInfo.getHospitalOutLatitude() != null) {
- existingInfo.setHospitalOutLatitude(emergencyInfo.getHospitalOutLatitude());
+ if (createVO.getHospitalOut().getLongitude() != null) {
+ existingInfo.setHospitalOutLongitude(createVO.getHospitalOut().getLongitude());
+ }
+ if (createVO.getHospitalOut().getLatitude() != null) {
+ existingInfo.setHospitalOutLatitude(createVO.getHospitalOut().getLatitude());
+ }
}
// 鏇存柊杞叆鍖婚櫌淇℃伅
- if (emergencyInfo.getHospitalInId() != null) {
- existingInfo.setHospitalInId(emergencyInfo.getHospitalInId());
- }
- if (emergencyInfo.getHospitalInName() != null) {
- existingInfo.setHospitalInName(emergencyInfo.getHospitalInName());
- }
- if (emergencyInfo.getHospitalInDepartment() != null) {
- existingInfo.setHospitalInDepartment(emergencyInfo.getHospitalInDepartment());
- }
- if (emergencyInfo.getHospitalInDepartmentId() != null) {
- existingInfo.setHospitalInDepartmentId(emergencyInfo.getHospitalInDepartmentId());
- }
- if (emergencyInfo.getHospitalInBedNumber() != null) {
- existingInfo.setHospitalInBedNumber(emergencyInfo.getHospitalInBedNumber());
- }
- if (emergencyInfo.getHospitalInAddress() != null) {
- existingInfo.setHospitalInAddress(emergencyInfo.getHospitalInAddress());
-
- // 濡傛灉鏇存柊浜嗗湴鍧�浣嗘病鏈塆PS鍧愭爣锛屽悗绔嚜鍔ㄨ幏鍙�
- if (emergencyInfo.getHospitalInLongitude() == null && emergencyInfo.getHospitalInLatitude() == null && mapService != null) {
- try {
- Map<String, Double> coords = mapService.geocoding(
- emergencyInfo.getHospitalInAddress(),
- extractCityFromAddress(emergencyInfo.getHospitalInAddress())
- );
- if (coords != null) {
- existingInfo.setHospitalInLongitude(BigDecimal.valueOf(coords.get("lng")));
- existingInfo.setHospitalInLatitude(BigDecimal.valueOf(coords.get("lat")));
- log.info("杞叆鍖婚櫌GPS鍧愭爣鑷姩鑾峰彇鎴愬姛: {}, {}", coords.get("lng"), coords.get("lat"));
+ if (createVO.getHospitalIn() != null) {
+ if (createVO.getHospitalIn().getId() != null) {
+ existingInfo.setHospitalInId(createVO.getHospitalIn().getId());
+ }
+ if (createVO.getHospitalIn().getName() != null) {
+ existingInfo.setHospitalInName(createVO.getHospitalIn().getName());
+ }
+ if (createVO.getHospitalIn().getDepartment() != null) {
+ existingInfo.setHospitalInDepartment(createVO.getHospitalIn().getDepartment());
+ }
+ if (createVO.getHospitalIn().getDepartmentId() != null) {
+ existingInfo.setHospitalInDepartmentId(createVO.getHospitalIn().getDepartmentId());
+ }
+ if (createVO.getHospitalIn().getBedNumber() != null) {
+ existingInfo.setHospitalInBedNumber(createVO.getHospitalIn().getBedNumber());
+ }
+ if (createVO.getHospitalIn().getAddress() != null && !createVO.getHospitalIn().getAddress().equals(existingInfo.getHospitalInAddress())) {
+ existingInfo.setHospitalInAddress(createVO.getHospitalIn().getAddress());
+
+ // 濡傛灉鏇存柊浜嗗湴鍧�浣嗘病鏈塆PS鍧愭爣锛屽悗绔嚜鍔ㄨ幏鍙�
+ if (createVO.getHospitalIn().getLongitude() == null && createVO.getHospitalIn().getLatitude() == null && mapService != null) {
+ try {
+ Map<String, Double> coords = mapService.geocoding(
+ createVO.getHospitalIn().getAddress(),
+ extractCityFromAddress(createVO.getHospitalIn().getAddress())
+ );
+ if (coords != null) {
+ existingInfo.setHospitalInLongitude(BigDecimal.valueOf(coords.get("lng")));
+ existingInfo.setHospitalInLatitude(BigDecimal.valueOf(coords.get("lat")));
+ log.info("杞叆鍖婚櫌GPS鍧愭爣鑷姩鑾峰彇鎴愬姛: {}, {}", coords.get("lng"), coords.get("lat"));
+ }
+ } catch (Exception e) {
+ log.error("鑷姩鑾峰彇杞叆鍖婚櫌GPS鍧愭爣澶辫触", e);
}
- } catch (Exception e) {
- log.error("鑷姩鑾峰彇杞叆鍖婚櫌GPS鍧愭爣澶辫触", e);
}
}
- }
- if (emergencyInfo.getHospitalInLongitude() != null) {
- existingInfo.setHospitalInLongitude(emergencyInfo.getHospitalInLongitude());
- }
- if (emergencyInfo.getHospitalInLatitude() != null) {
- existingInfo.setHospitalInLatitude(emergencyInfo.getHospitalInLatitude());
+ if (createVO.getHospitalIn().getLongitude() != null) {
+ existingInfo.setHospitalInLongitude(createVO.getHospitalIn().getLongitude());
+ }
+ if (createVO.getHospitalIn().getLatitude() != null) {
+ existingInfo.setHospitalInLatitude(createVO.getHospitalIn().getLatitude());
+ }
}
// 鏇存柊璐圭敤淇℃伅
- if (emergencyInfo.getTransferDistance() != null) {
- existingInfo.setTransferDistance(emergencyInfo.getTransferDistance());
+ if (createVO.getTransferDistance() != null) {
+ existingInfo.setTransferDistance(createVO.getTransferDistance());
}
- if (emergencyInfo.getTransferPrice() != null) {
- existingInfo.setTransferPrice(emergencyInfo.getTransferPrice());
+ if (createVO.getPrice() != null) {
+ existingInfo.setTransferPrice(createVO.getPrice());
+ }
+
+ // 鏇存柊鍗曟嵁绫诲瀷ID
+ if (createVO.getDocumentTypeId() != null) {
+ existingInfo.setDocumentTypeId(createVO.getDocumentTypeId());
+ }
+
+ // 鏇存柊浠诲姟绫诲瀷ID
+ if (createVO.getTaskTypeId() != null) {
+ existingInfo.setTaskTypeId(createVO.getTaskTypeId());
}
// 鏇存柊鐥呮儏ID鍒楄〃
- if (updateVO.getDiseaseIds() != null && !updateVO.getDiseaseIds().isEmpty()) {
- String diseaseIdsStr = updateVO.getDiseaseIds().stream()
+ if (createVO.getDiseaseIds() != null && !createVO.getDiseaseIds().isEmpty()) {
+ String diseaseIdsStr = createVO.getDiseaseIds().stream()
.map(String::valueOf)
.collect(Collectors.joining(","));
existingInfo.setDiseaseIds(diseaseIdsStr);
- } else {
- // 濡傛灉鐥呮儏ID鍒楄〃涓虹┖锛屾竻绌鸿瀛楁
- existingInfo.setDiseaseIds(null);
}
// 绯荤粺瀛楁
existingInfo.setUpdateTime(DateUtils.getNowDate());
- existingInfo.setUpdateBy(SecurityUtils.getUsername());
+ existingInfo.setUpdateBy(userName);
// 鎵ц鏇存柊
sysTaskEmergencyMapper.updateSysTaskEmergency(existingInfo);
}
+
+ /**
+ * 浠� TaskCreateVO 鏇存柊绂忕杞︿换鍔℃墿灞曚俊鎭�
+ *
+ * @param taskId 浠诲姟ID
+ * @param createVO 浠诲姟鍒涘缓/鏇存柊瀵硅薄
+ * @param userName 鎿嶄綔浜哄悕
+ */
+ private void updateWelfareInfoFromCreateVO(Long taskId, TaskCreateVO createVO, String userName) {
+ // 鏌ヨ鐜版湁鐨勬墿灞曚俊鎭�
+ SysTaskWelfare existingInfo = sysTaskWelfareMapper.selectSysTaskWelfareByTaskId(taskId);
+ if (existingInfo == null) {
+ // 濡傛灉涓嶅瓨鍦紝鍒欏垱寤烘柊鐨�
+ existingInfo = new SysTaskWelfare();
+ existingInfo.setTaskId(taskId);
+ existingInfo.setCreateTime(DateUtils.getNowDate());
+ existingInfo.setCreateBy(userName);
+ }
+
+ // 鏇存柊涔樺淇℃伅
+ if (createVO.getPassenger() != null) {
+ if (createVO.getPassenger().getContact() != null) {
+ existingInfo.setPassengerContact(createVO.getPassenger().getContact());
+ }
+ if (createVO.getPassenger().getPhone() != null) {
+ existingInfo.setPassengerPhone(createVO.getPassenger().getPhone());
+ }
+ }
+
+ // 鏇存柊鍦板潃淇℃伅
+ if (createVO.getStartAddress() != null) {
+ existingInfo.setPickupAddress(createVO.getStartAddress());
+ }
+ if (createVO.getEndAddress() != null) {
+ existingInfo.setDestinationAddress(createVO.getEndAddress());
+ }
+
+ // 鏇存柊GPS鍧愭爣
+ if (createVO.getDepartureLongitude() != null) {
+ existingInfo.setPickupLongitude(createVO.getDepartureLongitude());
+ }
+ if (createVO.getDepartureLatitude() != null) {
+ existingInfo.setPickupLatitude(createVO.getDepartureLatitude());
+ }
+ if (createVO.getDestinationLongitude() != null) {
+ existingInfo.setDestinationLongitude(createVO.getDestinationLongitude());
+ }
+ if (createVO.getDestinationLatitude() != null) {
+ existingInfo.setDestinationLatitude(createVO.getDestinationLatitude());
+ }
+
+ // 鏇存柊璺濈鍜岃垂鐢�
+ if (createVO.getDistance() != null) {
+ existingInfo.setServiceDistance(createVO.getDistance());
+ } else if (createVO.getEstimatedDistance() != null) {
+ existingInfo.setServiceDistance(createVO.getEstimatedDistance());
+ }
+ if (createVO.getPrice() != null) {
+ existingInfo.setServicePrice(createVO.getPrice());
+ }
+
+ // 绯荤粺瀛楁
+ existingInfo.setUpdateTime(DateUtils.getNowDate());
+ existingInfo.setUpdateBy(userName);
+
+ // 鎵ц鏇存柊
+ sysTaskWelfareMapper.updateSysTaskWelfare(existingInfo);
+ }
/**
* 淇濆瓨绂忕杞︿换鍔℃墿灞曚俊鎭�
--
Gitblit v1.9.1