From c0988ce95ab6a518aefe843d9cfd84d1515cdc00 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 15 十月 2026 16:18:40 +0800
Subject: [PATCH] 【丽水】1. /smartor/serviceSubtask/getCurrentUserServiceSubtaskCount工作台里加即将超时数量字段      2. /smartor/serviceSubtask/querySubtaskList 给一个列表可以查询多少小时(可选)即将超时的随访服务,如:48小时内即将超时任务(今天15号10.40到17号10.40这段时间会到达超时时间的任务)

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SmsTempletController.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SmsTempletController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SmsTempletController.java
index 1342158..27237df 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SmsTempletController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SmsTempletController.java
@@ -6,6 +6,7 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -41,16 +42,18 @@
     //@PreAuthorize("@ss.hasPermi('smartor:smstemplet:list')")
     @PostMapping("/list")
     public Map<String, Object> list(@RequestBody SmsTemplet smsTemplet) {
+        smsTemplet.setPageNum(PageUtils.getOffset(smsTemplet.getPageNum(), smsTemplet.getPageSize()));
         if (StringUtils.isEmpty(smsTemplet.getUserName()) && StringUtils.isEmpty(smsTemplet.getWardCode()) && StringUtils.isEmpty(smsTemplet.getDeptCode())) {
             SysUser user = getLoginUser().getUser();
             smsTemplet.setUserName(user.getUserName());
             smsTemplet.setNickName(user.getNickName());
         }
+        List<SmsTemplet> list = smsTempletService.selectSmsTempletList(smsTemplet);
         //杩欎釜涓嶉渶瑕佸垎椤碉紝涓�涓瀹や篃涓嶄細鏈夊灏戞潯鐭俊妯℃澘
         smsTemplet.setPageNum(null);
         smsTemplet.setPageSize(null);
-        List<SmsTemplet> list = smsTempletService.selectSmsTempletList(smsTemplet);
-        return getDataTable3(ObjectUtil.isNotEmpty(list) ? list.size() : 0, list);
+        List<SmsTemplet> total = smsTempletService.selectSmsTempletList(smsTemplet);
+        return getDataTable3(ObjectUtil.isNotEmpty(total) ? total.size() : 0, list);
     }
 
     /**

--
Gitblit v1.9.3