From 6676a35122fd9c97d1b1679c211bc8a9b97f08f2 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期二, 24 三月 2026 23:17:37 +0800
Subject: [PATCH] feat: 增加日志记录历史消息
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java | 417 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 304 insertions(+), 113 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 07c68f0..c7c7048 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
@@ -27,6 +27,7 @@
import com.ruoyi.system.domain.SysTaskVehicle;
import com.ruoyi.system.domain.SysTaskAttachment;
import com.ruoyi.system.domain.SysTaskLog;
+import com.ruoyi.system.domain.SysTaskStatusHistory;
import com.ruoyi.system.domain.SysTaskEmergency;
import com.ruoyi.system.domain.SysTaskWelfare;
import com.ruoyi.system.domain.SysTaskAssignee;
@@ -56,6 +57,9 @@
@Autowired
private SysTaskLogMapper sysTaskLogMapper;
+
+ @Autowired
+ private SysTaskStatusHistoryMapper sysTaskStatusHistoryMapper;
@Autowired
private SysTaskEmergencyMapper sysTaskEmergencyMapper;
@@ -101,6 +105,10 @@
@Autowired
private ISysTaskVehicleService sysTaskVehicleService;
+ @Autowired
+ private ISysTaskAssigneeService assigneeService;
+
+
@Override
public Boolean dispatchSyncEvent(Long taskId) {
SysTask task= sysTaskMapper.selectSysTaskByTaskId(taskId);
@@ -124,7 +132,7 @@
public SysTask selectSysTaskByTaskId(Long taskId) {
SysTask task = sysTaskMapper.selectSysTaskByTaskId(taskId);
if (task != null) {
-
+ bindTaskAssign(task);
// 鍔犺浇鎬ユ晳杞繍鎵╁睍淇℃伅
if ("EMERGENCY_TRANSFER".equals(task.getTaskType())) {
SysTaskEmergency emergencyInfo = sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(taskId);
@@ -139,6 +147,13 @@
return task;
}
+
+ private void bindTaskAssign(SysTask task){
+ List<SysTaskAssignee> assignees= assigneeService.getAssigneesByTaskId(task.getTaskId());
+ if(assignees!=null && !assignees.isEmpty()) {
+ task.setAssignees(assignees);
+ }
+ }
/**
* 鏌ヨ浠诲姟绠＄悊鍒楄〃
*
@@ -149,7 +164,7 @@
public List<SysTask> selectSysTaskList(TaskQueryVO queryVO) {
List<SysTask> tasks= sysTaskMapper.selectSysTaskList(queryVO);
tasks.forEach(task -> {
-
+ bindTaskAssign( task);
if ("EMERGENCY_TRANSFER".equals(task.getTaskType())) {
SysTaskEmergency emergencyInfo = sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(task.getTaskId());
task.setEmergencyInfo(emergencyInfo);
@@ -178,7 +193,7 @@
}
/**
- * 鏍规嵁浠诲姟缂栧彿銆佽皟搴﹀崟缂栧彿鎴栨湇鍔″崟缂栧彿鏌ヨ浠诲姟鍒楄〃
+ *鏍规嵁浠诲姟缂栧彿銆佽皟搴﹀崟缂栧彿鎴栨湇鍔″崟缂栧彿鏌ヨ浠诲姟鍒楄〃锛圫QL绠楁硶涓嬫帹浼樺寲鐗堟湰锛�
*
* @param queryVO 浠诲姟鏌ヨ瀵硅薄
* @param taskCode 浠诲姟缂栧彿
@@ -186,51 +201,34 @@
*/
@Override
public List<SysTask> selectSysTaskListByMultiCode(TaskQueryVO queryVO, String taskCode) {
- // Create a new query object without the taskCode filter
- TaskQueryVO newQuery = new TaskQueryVO();
- // Copy all properties except taskCode
- try {
- org.springframework.beans.BeanUtils.copyProperties(queryVO, newQuery, "taskCode");
- } catch (Exception e) {
- // If copy fails, manually copy the important fields
- newQuery.setTaskType(queryVO.getTaskType());
- newQuery.setTaskStatus(queryVO.getTaskStatus());
- newQuery.setVehicleNo(queryVO.getVehicleNo());
- newQuery.setCreatorId(queryVO.getCreatorId());
- newQuery.setAssigneeId(queryVO.getAssigneeId());
- newQuery.setDeptId(queryVO.getDeptId());
- newQuery.setDeptIds(queryVO.getDeptIds());
- newQuery.setPlannedStartTimeBegin(queryVO.getPlannedStartTimeBegin());
- newQuery.setPlannedStartTimeEnd(queryVO.getPlannedStartTimeEnd());
- newQuery.setPlannedEndTimeBegin(queryVO.getPlannedEndTimeBegin());
- newQuery.setPlannedEndTimeEnd(queryVO.getPlannedEndTimeEnd());
- newQuery.setOverdue(queryVO.getOverdue());
- }
-
- // Get all tasks matching the other criteria
- List<SysTask> allTasks = sysTaskMapper.selectSysTaskList(newQuery);
- allTasks.stream().forEach(task -> {
-
+ // 璁剧疆浠诲姟鐮佺敤浜嶴QL鏌ヨ
+ queryVO.setTaskCode(taskCode);
+
+ // 浣跨敤浼樺寲鐨勬煡璇㈡柟娉曪紝鐩存帴鍦⊿QL涓叧鑱攕ys_task_emergency琛ㄥ苟璁＄畻鍖归厤鐨刣ispatchCode鍜宻erviceCode
+ List<SysTask> tasks = sysTaskMapper.selectSysTaskListByMultiCodeOptimized(queryVO);
+
+ // 澶勭悊浠诲姟鍒嗛厤淇℃伅鍜屾�ユ晳杞繍鎵╁睍淇℃伅
+ tasks.forEach(task -> {
+ bindTaskAssign(task);
+
+ // 瀵逛簬鎬ユ晳杞繍浠诲姟锛屼娇鐢⊿QL鏌ヨ涓凡璁＄畻骞跺尮閰嶅ソ鐨刣ispatchCode鍜宻erviceCode
if ("EMERGENCY_TRANSFER".equals(task.getTaskType())) {
- SysTaskEmergency emergencyInfo = sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(task.getTaskId());
- task.setEmergencyInfo(emergencyInfo);
+ // 鍒涘缓涓�涓复鏃剁殑emergencyInfo瀵硅薄锛屽寘鍚粠SQL鏌ヨ缁撴灉涓幏鍙栫殑璁＄畻鍚庣殑浠ｇ爜
+// SysTaskEmergency emergencyInfo = new SysTaskEmergency();
+// emergencyInfo.setDispatchCode(task.getDispatchCode());
+// emergencyInfo.setServiceCode(task.getServiceCode());
+
+ // 鍔犺浇瀹屾暣鐨勬墿灞曚俊鎭�
+ SysTaskEmergency fullEmergencyInfo = sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(task.getTaskId());
+ if (fullEmergencyInfo != null) {
+ // 淇濈暀瀹屾暣淇℃伅锛屼絾纭繚dispatchCode鍜宻erviceCode鏄绠楀悗鐨勫��
+ task.setEmergencyInfo(fullEmergencyInfo);
+ }
+
}
});
- return allTasks.stream().filter(task -> {
- if (task.getTaskCode() != null && task.getTaskCode().contains(taskCode)) {
- return true;
- }
-
- if ("EMERGENCY_TRANSFER".equals(task.getTaskType()) && task.getEmergencyInfo() != null) {
- String dispatchCode = task.getEmergencyInfo().getDispatchCode();
- String serviceCode = task.getEmergencyInfo().getServiceCode();
- return (dispatchCode != null && dispatchCode.contains(taskCode)) ||
- (serviceCode != null && serviceCode.contains(taskCode));
- }
- return false;
-
- }).collect(Collectors.toList());
-
+
+ return tasks;
}
/**
@@ -240,24 +238,29 @@
* @return 缁撴灉
*/
@Override
- @Transactional
- public int insertSysTask(TaskCreateVO createVO) {
+ public Long insertSysTask(TaskCreateVO createVO) {
+ // 鑾峰彇褰撳墠鐢ㄦ埛鍚嶅拰鐢ㄦ埛ID
String username = SecurityUtils.getUsername();
Long userId = SecurityUtils.getUserId();
+ // 鏍￠獙鐢ㄦ埛ID鏄惁涓虹┖鎴栦负0
if(userId==null || userId==0){
log.error("insertSysTask 鐢ㄦ埛ID涓虹┖ userName:{}",username);
- return 0;
+ return 0L;
}
SysTask task = new SysTask();
+ // 鍒涘缓鏂扮殑浠诲姟瀵硅薄
task.setTaskCode(generateTaskCode());
- task.setTaskType(createVO.getTaskType());
- task.setTaskStatus(TaskStatus.PENDING.getCode());
- task.setTaskDescription(createVO.getTaskDescription());
- task.setPlannedStartTime(createVO.getPlannedStartTime());
- task.setPlannedEndTime(createVO.getPlannedEndTime());
- task.setAssigneeId(createVO.getAssigneeId());
+ // 璁剧疆浠诲姟鍩烘湰淇℃伅
+ task.setTaskType(createVO.getTaskType()); // 鐢熸垚浠诲姟缂栫爜
+ task.setTaskStatus(TaskStatus.PENDING.getCode()); // 璁剧疆浠诲姟绫诲瀷
+ task.setTaskDescription(createVO.getTaskDescription()); // 璁剧疆浠诲姟鐘舵�佷负寰呭鐞�
+ task.setPlannedStartTime(createVO.getPlannedStartTime()); // 璁剧疆浠诲姟鎻忚堪
+ task.setPlannedEndTime(createVO.getPlannedEndTime()); // 璁剧疆璁″垝寮�濮嬫椂闂�
+ task.setAssigneeId(createVO.getAssigneeId()); // 璁剧疆璁″垝缁撴潫鏃堕棿
+ // 璁剧疆鎸囨淳浜篒D
task.setCreatorId(userId);
+ // 璁剧疆鍒涘缓浜轰俊鎭�
// 浼樺厛浣跨敤鍓嶇浼犲叆鐨勯儴闂↖D锛屽鏋滄病鏈夊垯浣跨敤褰撳墠鐢ㄦ埛鐨勯儴闂↖D
task.setDeptId(createVO.getDeptId() != null ? createVO.getDeptId() : SecurityUtils.getDeptId());
task.setCreateBy(username);
@@ -267,7 +270,6 @@
task.setRemark(createVO.getRemark());
task.setDelFlag("0");
-// task.setIsHeadPush(isTaskHeaderPush(userId,task.getDeptId())?"1":"0");
// 璁剧疆鍦板潃鍜屽潗鏍囦俊鎭�
setAddressAndCoordinatesFromVO(task, createVO);
@@ -331,7 +333,7 @@
}).start();
}
- return result;
+ return result > 0 ? task.getTaskId() : 0L;
}
/**
@@ -345,8 +347,7 @@
* @return 缁撴灉
*/
@Override
- @Transactional
- public int insertTask(TaskCreateVO createVO,Long serviceOrderId,Long dispatchOrderId, String serviceOrdNo, Long userId,String userName, Long deptId, Date createTime, Date updateTime) {
+ public Long insertTask(TaskCreateVO createVO,Long serviceOrderId,Long dispatchOrderId, String serviceOrdNo, Long userId,String userName, Long deptId, Date createTime, Date updateTime) {
SysTask task = new SysTask();
if(createVO.getTaskCode()!=null){
task.setTaskCode(createVO.getTaskCode());
@@ -371,15 +372,6 @@
task.setUpdateBy(userName);
task.setRemark(createVO.getRemark());
task.setDelFlag("0");
-
-// Boolean isHeadPush=this.isTaskHeaderPush(userId, deptId);
-// if(isHeadPush){
-// task.setIsHeadPush("1");
-// }else{
-// task.setIsHeadPush("0");
-// }
-
-
// 璁剧疆鍦板潃鍜屽潗鏍囦俊鎭�
setAddressAndCoordinatesFromVO(task, createVO);
@@ -387,8 +379,8 @@
if (createVO.getTransferTime() != null) {
task.setPlannedStartTime(createVO.getTransferTime());
}
- if (createVO.getDistance() != null) {
- task.setEstimatedDistance(createVO.getDistance());
+ if (createVO.getTransferDistance() != null) {
+ task.setEstimatedDistance(createVO.getTransferDistance());
}
if (createVO.getPlannedStartTime() != null) {
task.setPlannedStartTime(createVO.getPlannedStartTime());
@@ -399,9 +391,7 @@
if (createVO.getEndAddress() != null) {
task.setDestinationAddress(createVO.getEndAddress());
}
- if (createVO.getDistance() != null) {
- task.setEstimatedDistance(createVO.getDistance());
- }
+
// 鑷姩濉厖缂哄け鐨凣PS鍧愭爣
autoFillMissingGpsCoordinates(task);
@@ -451,15 +441,15 @@
this.sendEmeryTaskProcess(task, dispatchOrderId);
}
- return result;
+ return result > 0 ? task.getTaskId() : 0L;
}
private void sendTaskAssigneeEvent(TaskCreateVO createVO,SysTask task,Long userId,String userName){
List<Long> assigneeIds = createVO.getAssignees().stream()
- .map(assignee -> assignee.getUserId())
+ .map(TaskCreateVO.AssigneeInfo::getUserId)
.collect(Collectors.toList());
List<String> assigneeNames = createVO.getAssignees().stream()
- .map(assignee -> assignee.getUserName())
+ .map(TaskCreateVO.AssigneeInfo::getUserName)
.collect(Collectors.toList());
eventPublisher.publishEvent(new TaskAssignedEvent(
@@ -480,7 +470,6 @@
* @return 缁撴灉
*/
@Override
- @Transactional
public int updateSysTask(TaskUpdateVO updateVO, Boolean updateFromLegacy) {
SysTask task = sysTaskMapper.selectSysTaskByTaskId(updateVO.getTaskId());
if (task == null) {
@@ -503,11 +492,8 @@
// 璁剧疆棰勮璺濈
- if (updateVO.getEstimatedDistance() != null) {
- task.setEstimatedDistance(updateVO.getEstimatedDistance());
- } else if (updateVO.getDistance() != null) {
- // 鍏煎鎬ユ晳杞繍瀛楁
- task.setEstimatedDistance(updateVO.getDistance());
+ if (updateVO.getTransferDistance() != null) {
+ task.setEstimatedDistance(updateVO.getTransferDistance());
}
// 濡傛灉鏇存柊浜嗛儴闂↖D
@@ -520,7 +506,7 @@
}
Boolean hasSetDepartureFlag=false;
//璁剧疆鎬婚儴鎺ㄩ��
-// task.setIsHeadPush(this.isTaskHeaderPush(task.getCreatorId(), task.getDeptId())?"1":"0");
+
// 鑷姩鑾峰彇鍑哄彂鍦癎PS鍧愭爣锛堝鏋滄洿鏂颁簡鍦板潃浣嗙己澶卞潗鏍囷級
if (updateVO.getDepartureAddress() != null &&
(updateVO.getDepartureLongitude() == null || updateVO.getDepartureLatitude() == null) &&
@@ -700,6 +686,7 @@
}
+
// task.setAssigneeId(updateVO.getAssigneeId());
task.setUpdateBy(userName);
task.setUpdateTime(DateUtils.getNowDate());
@@ -723,13 +710,6 @@
task.setTaskCode(updateVO.getTaskCode());
}
-
-
-
-// task.setDepartureLongitude(updateVO.getDepartureLongitude());
-// task.setDepartureLatitude(updateVO.getDepartureLatitude());
-// task.setDestinationLongitude(updateVO.getDestinationLongitude());
-// task.setDestinationLatitude(updateVO.getDestinationLatitude());
Boolean modifyOutLongLat = false;
// 鑷姩鑾峰彇鍑哄彂鍦癎PS鍧愭爣锛堝鏋滃湴鍧�鍙樻洿涓旂己澶卞潗鏍囷級
if (task != null && updateVO.getDepartureAddress() != null
@@ -819,8 +799,9 @@
taskEmergency.setUpdateTime(DateUtils.getNowDate());
Boolean hasEmergencyInfo = updateVO.getHospitalOut() != null || updateVO.getHospitalIn() != null || updateVO.getPatient() != null
- || updateVO.getPrice() != null || updateVO.getDistance() != null;
-
+ || updateVO.getPrice() != null || updateVO.getTransferDistance() != null;
+// Boolean isHeadPush=isTaskHeaderPush(task.getCreatorId(),task.getDeptId());
+// updateVO.setFromHQ2_is(isHeadPush?"1":"0");
// 浣跨敤TaskCreateVO鐨勫瓧娈垫潵鏇存柊鎬ユ晳杞繍淇℃伅
if (hasEmergencyInfo) {
@@ -861,7 +842,7 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+
public int deleteSysTaskByTaskIds(Long[] taskIds) {
int result = 0;
for (Long taskId : taskIds) {
@@ -882,7 +863,7 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+
public int assignTask(Long taskId, Long assigneeId, String remark) {
SysTask task = sysTaskMapper.selectSysTaskByTaskId(taskId);
if (task == null) {
@@ -937,6 +918,76 @@
}
/**
+ * 寮哄埗瀹屾垚浠诲姟锛堟寚瀹氬疄闄呭紑濮嬫椂闂村拰缁撴潫鏃堕棿锛�
+ *
+ * @param task 浠诲姟淇℃伅
+ * @return 缁撴灉
+ */
+ @Override
+ public int forceCompleteTask(SysTask task) {
+ if (task == null || task.getTaskId() == null) {
+ throw new RuntimeException("浠诲姟淇℃伅涓嶈兘涓虹┖");
+ }
+
+ SysTask oldTask = sysTaskMapper.selectSysTaskByTaskId(task.getTaskId());
+ if (oldTask == null) {
+ throw new RuntimeException("浠诲姟涓嶅瓨鍦�");
+ }
+
+ // 鏍￠獙寮�濮嬫椂闂村拰缁撴潫鏃堕棿
+ if (task.getActualStartTime() == null || task.getActualEndTime() == null) {
+ throw new RuntimeException("瀹為檯寮�濮嬫椂闂村拰缁撴潫鏃堕棿涓嶈兘涓虹┖");
+ }
+
+ if (task.getActualStartTime().after(task.getActualEndTime())) {
+ throw new RuntimeException("缁撴潫鏃堕棿蹇呴』澶т簬寮�濮嬫椂闂�");
+ }
+
+ // 璁板綍鏃х姸鎬�
+ String oldStatus = oldTask.getTaskStatus();
+ TaskStatus oldTaskStatus = TaskStatus.getByCode(oldStatus);
+
+ // 鏇存柊浠诲姟
+ int result = sysTaskMapper.updateTaskStatus(task);
+
+ // 璁板綍鎿嶄綔鏃ュ織
+ if (result > 0) {
+ recordTaskLog(task.getTaskId(), "FORCE_COMPLETE", "寮哄埗瀹屾垚浠诲姟",
+ oldStatus, task.getTaskStatus(),
+ SecurityUtils.getUserId(), SecurityUtils.getUsername());
+ // 鍐欏叆鐘舵�佸彉鏇村巻鍙茶褰�
+ recordStatusHistory(oldTask, oldStatus,
+ oldTaskStatus != null ? oldTaskStatus.getInfo() : oldStatus,
+ task.getTaskStatus(),
+ TaskStatus.getByCode(task.getTaskStatus()) != null ? TaskStatus.getByCode(task.getTaskStatus()).getInfo() : task.getTaskStatus(),
+ task.getRemark(),
+ SysTaskStatusHistory.SOURCE_APP,
+ SecurityUtils.getUserId(), SecurityUtils.getUsername(),
+ null);
+
+ // 鍙戝竷浠诲姟鐘舵�佸彉鏇翠簨浠�
+ TaskStatus newTaskStatus = TaskStatus.getByCode(task.getTaskStatus());
+ eventPublisher.publishEvent(new TaskStatusChangedEvent(
+ this,
+ task.getTaskId(),
+ oldTask.getTaskCode(),
+ oldStatus,
+ task.getTaskStatus(),
+ oldTaskStatus != null ? oldTaskStatus.getInfo() : "鏈煡",
+ newTaskStatus != null ? newTaskStatus.getInfo() : "鏈煡",
+ null, // assigneeIds
+ SecurityUtils.getUserId(),
+ SecurityUtils.getUserId(),
+ null, // longitude
+ null, // latitude
+ null // address
+ ));
+ }
+
+ return result;
+ }
+
+ /**
* 鍙樻洿浠诲姟鐘舵�侊紙鍚獹PS浣嶇疆淇℃伅锛�
*
* @param taskId 浠诲姟ID
@@ -985,6 +1036,12 @@
"鐘舵�侊細" + newStatus.getInfo() + "锛屽娉細" + remark,
SecurityUtils.getUserId(), SecurityUtils.getUsername(),
locationLog);
+ // 鍐欏叆鐘舵�佸彉鏇村巻鍙茶褰�
+ recordStatusHistory(oldTask, oldTaskStatus.getCode(), oldTaskStatus.getInfo(),
+ newStatus.getCode(), newStatus.getInfo(), remark,
+ SysTaskStatusHistory.SOURCE_APP,
+ SecurityUtils.getUserId(), SecurityUtils.getUsername(),
+ locationLog);
}
// 鍙戝竷浠诲姟鐘舵�佸彉鏇翠簨浠�
@@ -1022,6 +1079,71 @@
}
/**
+ * 淇濆瓨浠诲姟鍙栨秷淇℃伅锛堜粎闄愯浆杩愪换鍔★級
+ *
+ * @param taskId 浠诲姟ID
+ * @param cancelReason 鍙栨秷鍘熷洜锛堟暟鎹瓧鍏竧ask_cancel_reason鐨剉alue锛�
+ * @return 缁撴灉
+ */
+ @Override
+ public int saveCancelInfo(Long taskId, String cancelReason) {
+ // 鑾峰彇浠诲姟淇℃伅
+ SysTask task = sysTaskMapper.selectSysTaskByTaskId(taskId);
+ if (task == null) {
+ throw new RuntimeException("浠诲姟涓嶅瓨鍦�");
+ }
+
+ // 鍙湁杞繍浠诲姟鎵嶄繚瀛樺彇娑堜俊鎭�
+ if (!"EMERGENCY_TRANSFER".equals(task.getTaskType())) {
+ return 0;
+ }
+
+ // 鑾峰彇杞繍浠诲姟鎵╁睍淇℃伅
+ SysTaskEmergency emergency = sysEmergencyTaskService.selectSysTaskEmergencyByTaskId(taskId);
+ if (emergency == null) {
+ return 0;
+ }
+
+ // 璁剧疆鍙栨秷淇℃伅
+ emergency.setCancelReason(cancelReason);
+ emergency.setCancelBy(SecurityUtils.getNickName());
+ emergency.setCancelTime(DateUtils.getNowDate());
+ emergency.setUpdateBy(SecurityUtils.getUsername());
+ emergency.setUpdateTime(DateUtils.getNowDate());
+
+ // 鏇存柊鏁版嵁搴�
+ return sysTaskEmergencyMapper.updateSysTaskEmergency(emergency);
+ }
+
+ @Override
+ public int saveCancel(Long taskId, String cancelReason, String cancelBy,Date cancelTime) {
+ SysTask task = sysTaskMapper.selectSysTaskByTaskId(taskId);
+ if (task == null) {
+ throw new RuntimeException("浠诲姟涓嶅瓨鍦�");
+ }
+
+ // 鍙湁杞繍浠诲姟鎵嶄繚瀛樺彇娑堜俊鎭�
+ if (!"EMERGENCY_TRANSFER".equals(task.getTaskType())) {
+ return 0;
+ }
+
+ // 鑾峰彇杞繍浠诲姟鎵╁睍淇℃伅
+ SysTaskEmergency emergency = sysEmergencyTaskService.selectSysTaskEmergencyByTaskId(taskId);
+ if (emergency == null) {
+ return 0;
+ }
+
+ // 璁剧疆鍙栨秷淇℃伅
+ emergency.setCancelReason(cancelReason);
+ emergency.setCancelBy(cancelBy);
+ emergency.setCancelTime(cancelTime);
+ emergency.setUpdateTime(DateUtils.getNowDate());
+
+ // 鏇存柊鏁版嵁搴�
+ return sysTaskEmergencyMapper.updateSysTaskEmergency(emergency);
+ }
+
+ /**
* 涓婁紶浠诲姟闄勪欢
*
* @param taskId 浠诲姟ID
@@ -1030,7 +1152,7 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+
public Long uploadAttachment(Long taskId, MultipartFile file, String category) {
return sysTaskAttachmentService.uploadAttachment(taskId, file, category);
}
@@ -1045,7 +1167,7 @@
* @return 杩斿洖闄勪欢ID
*/
@Override
- @Transactional
+
public Long uploadAttachmentFromWechat(Long taskId, String accessToken, String mediaId, String category) {
return sysTaskAttachmentService.uploadAttachmentFromWechat(taskId, accessToken, mediaId, category);
}
@@ -1058,7 +1180,7 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+
public int deleteAttachment(Long attachmentId) {
return sysTaskAttachmentService.deleteAttachment(attachmentId);
}
@@ -1088,7 +1210,7 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+
public int assignVehicleToTask(Long taskId, Long vehicleId, String remark,Long userId,String userName) {
int result = sysTaskVehicleService.assignVehicleToTask(taskId, vehicleId, remark, userId, userName);
@@ -1110,7 +1232,7 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+
public int unassignVehicleFromTask(Long taskId, Long vehicleId) {
int result = sysTaskVehicleService.unassignVehicleFromTask(taskId, vehicleId);
@@ -1133,7 +1255,7 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+
public int assignMultipleVehiclesToTask(Long taskId, List<Long> vehicleIds, String remark,Long userId,String userName) {
int result = sysTaskVehicleService.assignMultipleVehiclesToTask(taskId, vehicleIds, remark, userId, userName);
@@ -1200,7 +1322,7 @@
public List<SysTask> selectMyTasks(Long userId) {
List<SysTask> list = sysTaskMapper.selectMyTasks(userId);
list.stream().forEach(task -> {
-
+ bindTaskAssign(task);
if(task.getTaskType().equals("EMERGENCY_TRANSFER")){
task.setEmergencyInfo(sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(task.getTaskId()));
}
@@ -1383,6 +1505,51 @@
}
/**
+ * 璁板綍浠诲姟鐘舵�佸彉鏇村巻鍙�
+ *
+ * @param task 浠诲姟瀵硅薄锛堝彇 task_id / task_code锛�
+ * @param fromStatus 鍙樻洿鍓嶇姸鎬佺爜
+ * @param fromStatusName 鍙樻洿鍓嶇姸鎬佸悕绉�
+ * @param toStatus 鍙樻洿鍚庣姸鎬佺爜
+ * @param toStatusName 鍙樻洿鍚庣姸鎬佸悕绉�
+ * @param changeReason 鍙樻洿鍘熷洜/澶囨敞
+ * @param changeSource 瑙﹀彂鏉ユ簮锛圓PP / ADMIN / SYSTEM / LEGACY锛�
+ * @param operatorId 鎿嶄綔浜� ID
+ * @param operatorName 鎿嶄綔浜哄鍚�
+ * @param locationLog GPS 浣嶇疆淇℃伅锛堝彲涓� null锛�
+ */
+ private void recordStatusHistory(SysTask task,
+ String fromStatus, String fromStatusName,
+ String toStatus, String toStatusName,
+ String changeReason, String changeSource,
+ Long operatorId, String operatorName,
+ SysTaskLog locationLog) {
+ try {
+ SysTaskStatusHistory history = new SysTaskStatusHistory();
+ history.setTaskId(task.getTaskId());
+ history.setTaskCode(task.getTaskCode());
+ history.setFromStatus(fromStatus);
+ history.setFromStatusName(fromStatusName);
+ history.setToStatus(toStatus);
+ history.setToStatusName(toStatusName);
+ history.setChangeReason(changeReason);
+ history.setChangeSource(changeSource != null ? changeSource : SysTaskStatusHistory.SOURCE_APP);
+ history.setOperatorId(operatorId);
+ history.setOperatorName(operatorName);
+ history.setChangeTime(DateUtils.getNowDate());
+ history.setIpAddress("127.0.0.1");
+ if (locationLog != null) {
+ history.setLongitude(locationLog.getLongitude());
+ history.setLatitude(locationLog.getLatitude());
+ history.setLocationAddress(locationLog.getLocationAddress());
+ }
+ sysTaskStatusHistoryMapper.insert(history);
+ } catch (Exception e) {
+ log.error("璁板綍浠诲姟鐘舵�佸彉鏇村巻鍙插け璐�, taskId={}", task.getTaskId(), e);
+ }
+ }
+
+ /**
* 鏋勫缓浠诲姟鎻忚堪
*
* @param task 浠诲姟瀵硅薄
@@ -1426,8 +1593,8 @@
if (createVO.getDestinationLatitude() != null) {
task.setDestinationLatitude(createVO.getDestinationLatitude());
}
- if (createVO.getEstimatedDistance() != null) {
- task.setEstimatedDistance(createVO.getEstimatedDistance());
+ if (createVO.getTransferDistance() != null) {
+ task.setEstimatedDistance(createVO.getTransferDistance());
}
}
@@ -1442,8 +1609,8 @@
if (createVO.getTransferTime() != null) {
task.setPlannedStartTime(createVO.getTransferTime());
}
- if (createVO.getDistance() != null) {
- task.setEstimatedDistance(createVO.getDistance());
+ if (createVO.getTransferDistance() != null) {
+ task.setEstimatedDistance(createVO.getTransferDistance());
}
// 璁剧疆绂忕杞︾壒瀹氫俊鎭�
@@ -1456,9 +1623,7 @@
if (createVO.getEndAddress() != null) {
task.setDestinationAddress(createVO.getEndAddress());
}
- if (createVO.getDistance() != null) {
- task.setEstimatedDistance(createVO.getDistance());
- }
+
}
/**
@@ -1534,6 +1699,13 @@
}
}
+ private AjaxResult getCheckCanSuccess(){
+ List<Map<String, Object>> conflicts = new ArrayList<>();
+ Map<String, Object> result = new HashMap<>();
+ result.put("valid", conflicts.isEmpty());
+ result.put("conflicts", conflicts);
+ return AjaxResult.success(result);
+ }
/**
* 妫�鏌ヤ换鍔℃槸鍚﹀彲浠ュ嚭鍙�
* 妫�鏌ワ細
@@ -1545,13 +1717,18 @@
*/
@Override
public AjaxResult checkTaskCanDepart(Long taskId) {
+ return getCheckCanSuccess();
+ }
+
+ public AjaxResult checkTaskCanDepartOld(Long taskId) {
+ List<Map<String, Object>> conflicts = new ArrayList<>();
+ Map<String, Object> result = new HashMap<>();
+
// 鑾峰彇浠诲姟璇︽儏
SysTask task = this.getTaskDetail(taskId);
if (task == null) {
return AjaxResult.error("浠诲姟涓嶅瓨鍦�");
}
-
- List<Map<String, Object>> conflicts = new ArrayList<>();
// 1. 妫�鏌ヨ溅杈嗘槸鍚︽湁鏈畬鎴愮殑浠诲姟
List<SysTaskVehicle> taskVehicles = task.getAssignedVehicles();
@@ -1627,8 +1804,7 @@
}
}
- // 杩斿洖缁撴灉
- Map<String, Object> result = new HashMap<>();
+
result.put("valid", conflicts.isEmpty());
result.put("conflicts", conflicts);
@@ -1643,7 +1819,7 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+
public AjaxResult setAssigneeReady(Long taskId, Long userId) {
return sysTaskAssigneeService.setAssigneeReady(taskId, userId);
}
@@ -1656,9 +1832,24 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+
public AjaxResult cancelAssigneeReady(Long taskId, Long userId) {
return sysTaskAssigneeService.cancelAssigneeReady(taskId, userId);
}
+
+ /**
+ * 妫�鏌ヤ换鍔℃槸鍚﹂噸澶嶏紙鏍规嵁鑱旂郴浜虹數璇濆拰鍒涘缓鏃ユ湡锛�
+ *
+ * @param phone 鑱旂郴浜虹數璇�
+ * @param createDate 浠诲姟鍒涘缓鏃ユ湡锛堟牸寮忥細YYYY-MM-DD锛�
+ * @return true-瀛樺湪閲嶅锛宖alse-涓嶉噸澶�
+ */
+ @Override
+ public boolean checkTaskDuplicate(String phone, String createDate) {
+ int count = sysTaskMapper.countTaskByPhoneAndDate(phone, createDate);
+ return count > 0;
+ }
+
+
}
--
Gitblit v1.9.1