From 77b8624957ea9afafc81af72e52212c15b5f091e Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期四, 25 十二月 2025 01:34:32 +0800
Subject: [PATCH] feat: 优化新建 保存同步
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java | 115 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 90 insertions(+), 25 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 461aae1..abbeaab 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
@@ -252,24 +252,29 @@
* @return 缁撴灉
*/
@Override
- @Transactional
public int 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;
}
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);
@@ -388,8 +393,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());
@@ -400,9 +405,7 @@
if (createVO.getEndAddress() != null) {
task.setDestinationAddress(createVO.getEndAddress());
}
- if (createVO.getDistance() != null) {
- task.setEstimatedDistance(createVO.getDistance());
- }
+
// 鑷姩濉厖缂哄け鐨凣PS鍧愭爣
autoFillMissingGpsCoordinates(task);
@@ -503,11 +506,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
@@ -812,7 +812,7 @@
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");
@@ -1013,6 +1013,71 @@
}
return result;
+ }
+
+ /**
+ * 淇濆瓨浠诲姟鍙栨秷淇℃伅锛堜粎闄愯浆杩愪换鍔★級
+ *
+ * @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);
}
/**
@@ -1420,8 +1485,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());
}
}
@@ -1436,8 +1501,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());
}
// 璁剧疆绂忕杞︾壒瀹氫俊鎭�
@@ -1450,9 +1515,7 @@
if (createVO.getEndAddress() != null) {
task.setDestinationAddress(createVO.getEndAddress());
}
- if (createVO.getDistance() != null) {
- task.setEstimatedDistance(createVO.getDistance());
- }
+
}
/**
@@ -1654,5 +1717,7 @@
public AjaxResult cancelAssigneeReady(Long taskId, Long userId) {
return sysTaskAssigneeService.cancelAssigneeReady(taskId, userId);
}
+
+
}
--
Gitblit v1.9.1