From cd373a1f9b2de04804b7869eb33abedcf3566363 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 23 九月 2026 10:18:07 +0800
Subject: [PATCH] 【丽水】随访任务页查询，待发送/已发送数量改为异步查询
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java | 41 +++++++----------------------------------
1 files changed, 7 insertions(+), 34 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
index a2fca4a..0cb71b9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
@@ -71,38 +71,8 @@
// List<ServiceTask> list = serviceTaskService.selectServiceTaskList(serviceTask);
List<ServiceTask> list = serviceTaskService.selectServiceTaskAndtaskDeptList(serviceTask);
List<ServiceTaskVO> serviceTaskVOS = DtoConversionUtils.sourceToTarget(list, ServiceTaskVO.class);
-//
-// List<Long> taskIds = list.stream().map(ServiceTask::getTaskid).collect(Collectors.toList());
-//
-// ServiceSubtaskEntity serviceSubtaskEntity = new ServiceSubtaskEntity();
-// serviceSubtaskEntity.setTaskIds(taskIds);
-// serviceSubtaskEntity.setStartOutHospTime(serviceTask.getStartOutHospTime());
-// serviceSubtaskEntity.setEndOutHospTime(serviceTask.getEndOutHospTime());
-// // 鎵归噺鏌ヨ鎵�鏈夊瓙浠诲姟
-// Map<String, List<ServiceSubtask>> subtaskMap = iServiceSubtaskService
-// .selectServiceSubtaskList(serviceSubtaskEntity)
-// .stream()
-// .filter(subtask -> subtask.getTaskid() != null) // 娣诲姞杩囨护
-// .collect(Collectors.groupingBy(subtask -> Optional.of(subtask.getTaskid().toString()).orElse("Unknown")));
-
if (CollectionUtils.isNotEmpty(serviceTaskVOS)) {
-// for (ServiceTaskVO taskVO : serviceTaskVOS) {
-// List<ServiceSubtask> subtasks = subtaskMap.getOrDefault(taskVO.getTaskid().toString(), Collections.emptyList());
-//
-// if (CollectionUtils.isNotEmpty(subtasks)) {
-// //宸插彂閫侊紙瀛愪换鍔′腑鐨� sendstate=1涓鸿棰嗗彇锛�
-// long yfs = subtasks.stream().filter(s -> s.getSendstate() != null &&
-// (s.getSendstate() >= 3L || s.getSendstate() == 1L)).count();
-// //鏈彂閫�
-// long wfs = subtasks.stream().filter(s -> s.getSendstate() != null &&
-// s.getSendstate() == 2L).count();
-// taskVO.setYfs(yfs);
-// taskVO.setWfs(wfs);
-//
-// }
-//
-// }
//鑾峰彇total
long total = PageUtils.count(new ISelect() {
@Override
@@ -118,7 +88,6 @@
return getDataTable2(0, serviceTaskVOS);
}
-
/**
* 瀵煎嚭浠诲姟鍒楄〃
*/
@@ -219,17 +188,21 @@
public AjaxResult getScriptInfoByCondition(@RequestBody ServiceTaskScriptQues serviceTaskScriptQues) {
Long tid = null;
Long pid = null;
+ Long sid = null;
log.info("getScriptInfoByCondition鍏ュ弬涓猴細{}", serviceTaskScriptQues);
try {
tid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceTaskScriptQues.getParam1(), pri_key));
- pid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceTaskScriptQues.getParam2(), pri_key));
+ if (StringUtils.isNotEmpty(serviceTaskScriptQues.getParam2()))
+ pid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceTaskScriptQues.getParam2(), pri_key));
+ if (StringUtils.isNotEmpty(serviceTaskScriptQues.getParam6()))
+ sid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceTaskScriptQues.getParam6(), pri_key));
} catch (Exception e) {
log.error("getScriptInfoByCondition鎶ラ敊浜嗭細{}", e.getMessage());
}
log.info("tid鍜宲id鐨勫�间负锛歿},{}", tid, pid);
if (StringUtils.isEmpty(serviceTaskScriptQues.getPatfrom())) serviceTaskScriptQues.setPatfrom("0");
- return success(serviceTaskService.getScriptInfoByCondition(tid, pid, true, serviceTaskScriptQues.getPatfrom(),null));
+ return success(serviceTaskService.getScriptInfoByCondition(tid, pid, true, serviceTaskScriptQues.getPatfrom(), sid));
}
@@ -253,7 +226,7 @@
log.info("tid鍜宲id鐨勫�间负锛歿},{}", tid, pid);
if (StringUtils.isEmpty(serviceTaskScriptQues.getPatfrom())) serviceTaskScriptQues.setPatfrom("0");
- return success(serviceTaskService.getScriptInfoByCondition(tid, pid, true, serviceTaskScriptQues.getPatfrom(),null));
+ return success(serviceTaskService.getScriptInfoByCondition(tid, pid, true, serviceTaskScriptQues.getPatfrom(), null));
}
--
Gitblit v1.9.3