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, 16 insertions(+), 25 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 a1346c9..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
@@ -14,6 +14,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.*;
+import com.smartor.domain.entity.ServiceSubtaskEntity;
import com.smartor.service.IServiceSubtaskService;
import com.smartor.service.IServiceTaskService;
import io.swagger.annotations.Api;
@@ -26,8 +27,10 @@
import javax.servlet.http.HttpServletResponse;
import java.time.LocalDate;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
import java.util.stream.Collectors;
/**
@@ -45,7 +48,7 @@
private IServiceTaskService serviceTaskService;
@Autowired
- private IServiceSubtaskService iServiceTaskCallService;
+ private IServiceSubtaskService iServiceSubtaskService;
@Value("${pub_key}")
private String pub_key;
@@ -62,7 +65,7 @@
@ApiOperation("鏌ヨ浠诲姟鍒楄〃")
//@PreAuthorize("@ss.hasPermi('smartor:ServiceTask:list')")
@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
- @PostMapping("list")
+ @PostMapping("/list")
public TableDataInfo list(@RequestBody ServiceTask serviceTask) {
PageUtils.startPageByPost(serviceTask.getPageNum(), serviceTask.getPageSize());
// List<ServiceTask> list = serviceTaskService.selectServiceTaskList(serviceTask);
@@ -70,22 +73,6 @@
List<ServiceTaskVO> serviceTaskVOS = DtoConversionUtils.sourceToTarget(list, ServiceTaskVO.class);
if (CollectionUtils.isNotEmpty(serviceTaskVOS)) {
- for (ServiceTaskVO ServiceTaskVO : serviceTaskVOS) {
- ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
- serviceSubtaskVO.setTaskid(ServiceTaskVO.getTaskid());
- serviceSubtaskVO.setStartOutHospTime(serviceTask.getStartOutHospTime());
- serviceSubtaskVO.setEndOutHospTime(serviceTask.getEndOutHospTime());
- List<ServiceSubtask> ServiceTaskcalls = iServiceTaskCallService.selectServiceSubtaskList(serviceSubtaskVO);
- if (CollectionUtils.isNotEmpty(ServiceTaskcalls)) {
- //宸插彂閫侊紙瀛愪换鍔′腑鐨� sendstate=1涓鸿棰嗗彇锛�
- long yfs = ServiceTaskcalls.stream().filter(serviceTaskcall1 -> (serviceTaskcall1.getSendstate() != null && serviceTaskcall1.getSendstate() >= 3L) || (serviceTaskcall1.getSendstate() != null && serviceTaskcall1.getSendstate() == 1L)).collect(Collectors.toList()).stream().count();
- //鏈彂閫�
- long wfs = ServiceTaskcalls.stream().filter(serviceTaskcall1 -> serviceTaskcall1.getSendstate() != null && serviceTaskcall1.getSendstate() == 2L).collect(Collectors.toList()).stream().count();
- ServiceTaskVO.setYfs(yfs);
- ServiceTaskVO.setWfs(wfs);
- }
-
- }
//鑾峰彇total
long total = PageUtils.count(new ISelect() {
@Override
@@ -101,7 +88,6 @@
return getDataTable2(0, serviceTaskVOS);
}
-
/**
* 瀵煎嚭浠诲姟鍒楄〃
*/
@@ -133,10 +119,11 @@
@Log(title = "璇煶浠诲姟", businessType = BusinessType.INSERT)
@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@RequestBody ServiceTask ServiceTask) {
+ public AjaxResult add(@RequestBody ServiceTask serviceTask) {
SysUser user = getLoginUser().getUser();
- ServiceTask.setOrgid(user.getOrgid());
- return toAjax(serviceTaskService.insertServiceTask(ServiceTask));
+ serviceTask.setOrgid(user.getOrgid());
+ serviceTask.setCampusid(user.getCampusid());
+ return toAjax(serviceTaskService.insertServiceTask(serviceTask));
}
/**
@@ -201,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()));
+ return success(serviceTaskService.getScriptInfoByCondition(tid, pid, true, serviceTaskScriptQues.getPatfrom(), sid));
}
@@ -235,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()));
+ return success(serviceTaskService.getScriptInfoByCondition(tid, pid, true, serviceTaskScriptQues.getPatfrom(), null));
}
--
Gitblit v1.9.3