From 2cba0d00dc45998105129a0c26cb546282cd39a8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 05 六月 2024 13:44:23 +0800
Subject: [PATCH] 随访功能测试：模板、任务、定时发送、公众号发送，流程走通
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeTaskController.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeTaskController.java
index 71e9064..743d69a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeTaskController.java
@@ -1,15 +1,13 @@
package com.ruoyi.web.controller.smartor;
+import com.github.pagehelper.ISelect;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.PageUtils;
-import com.smartor.domain.HeTask;
-import com.smartor.domain.HeTaskVO;
-import com.smartor.domain.PatArchiveReq;
-import com.smartor.domain.PatTaskRelevanceVO;
+import com.smartor.domain.*;
import com.smartor.service.IHeTaskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -106,8 +104,14 @@
@PostMapping("/getPatientInfo")
public TableDataInfo getPatientInfo(@RequestBody PatArchiveReq patArchiveReq) {
PageUtils.startPageByPost(patArchiveReq.getPageNum(), patArchiveReq.getPageSize());
- return getDataTable(heTaskService.getPatientInfo(patArchiveReq));
+ List<PatTaskRelevance> patientInfo = heTaskService.getPatientInfo(patArchiveReq);
+ long count = PageUtils.count(new ISelect() {
+ @Override
+ public void doSelect() {
+ heTaskService.getPatientInfo(patArchiveReq);
+ }
+ });
+ return getDataTable2(count, patientInfo);
}
-
}
--
Gitblit v1.9.3