From f5c900c58513bad824381e69750ac7667ef35de0 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期四, 26 二月 2026 22:29:46 +0800
Subject: [PATCH] feat: 修改增另任务单查询，使用单号查询
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java | 101 +++++++++++++++++++++-----------------------------
1 files changed, 42 insertions(+), 59 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 f79c520..9c69173 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
@@ -189,7 +189,7 @@
}
/**
- * 鏍规嵁浠诲姟缂栧彿銆佽皟搴﹀崟缂栧彿鎴栨湇鍔″崟缂栧彿鏌ヨ浠诲姟鍒楄〃
+ *鏍规嵁浠诲姟缂栧彿銆佽皟搴﹀崟缂栧彿鎴栨湇鍔″崟缂栧彿鏌ヨ浠诲姟鍒楄〃锛圫QL绠楁硶涓嬫帹浼樺寲鐗堟湰锛�
*
* @param queryVO 浠诲姟鏌ヨ瀵硅薄
* @param taskCode 浠诲姟缂栧彿
@@ -197,52 +197,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;
- }
- bindTaskAssign(task);
-
- 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;
}
/**
@@ -252,14 +234,14 @@
* @return 缁撴灉
*/
@Override
- 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();
// 鍒涘缓鏂扮殑浠诲姟瀵硅薄
@@ -347,7 +329,7 @@
}).start();
}
- return result;
+ return result > 0 ? task.getTaskId() : 0L;
}
/**
@@ -361,7 +343,7 @@
* @return 缁撴灉
*/
@Override
- 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());
@@ -455,7 +437,7 @@
this.sendEmeryTaskProcess(task, dispatchOrderId);
}
- return result;
+ return result > 0 ? task.getTaskId() : 0L;
}
private void sendTaskAssigneeEvent(TaskCreateVO createVO,SysTask task,Long userId,String userName){
@@ -700,6 +682,7 @@
}
+
// task.setAssigneeId(updateVO.getAssigneeId());
task.setUpdateBy(userName);
task.setUpdateTime(DateUtils.getNowDate());
@@ -855,7 +838,7 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+
public int deleteSysTaskByTaskIds(Long[] taskIds) {
int result = 0;
for (Long taskId : taskIds) {
@@ -876,7 +859,7 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+
public int assignTask(Long taskId, Long assigneeId, String remark) {
SysTask task = sysTaskMapper.selectSysTaskByTaskId(taskId);
if (task == null) {
@@ -1150,7 +1133,7 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+
public Long uploadAttachment(Long taskId, MultipartFile file, String category) {
return sysTaskAttachmentService.uploadAttachment(taskId, file, category);
}
@@ -1165,7 +1148,7 @@
* @return 杩斿洖闄勪欢ID
*/
@Override
- @Transactional
+
public Long uploadAttachmentFromWechat(Long taskId, String accessToken, String mediaId, String category) {
return sysTaskAttachmentService.uploadAttachmentFromWechat(taskId, accessToken, mediaId, category);
}
@@ -1178,7 +1161,7 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+
public int deleteAttachment(Long attachmentId) {
return sysTaskAttachmentService.deleteAttachment(attachmentId);
}
@@ -1208,7 +1191,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);
@@ -1230,7 +1213,7 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+
public int unassignVehicleFromTask(Long taskId, Long vehicleId) {
int result = sysTaskVehicleService.unassignVehicleFromTask(taskId, vehicleId);
@@ -1253,7 +1236,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);
@@ -1761,7 +1744,7 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+
public AjaxResult setAssigneeReady(Long taskId, Long userId) {
return sysTaskAssigneeService.setAssigneeReady(taskId, userId);
}
@@ -1774,7 +1757,7 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+
public AjaxResult cancelAssigneeReady(Long taskId, Long userId) {
return sysTaskAssigneeService.cancelAssigneeReady(taskId, userId);
}
--
Gitblit v1.9.1