From eb845e8be695ed1280a7cbf854a4d1dedf9db30d Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 30 十月 2026 15:02:55 +0800
Subject: [PATCH] 【丽水】/smartor/serviceSubtask/getSfStatisticsHyperlink 和 /smartor/serviceSubtask/getSfStatistics 统计的时候，对于 service_subtask.current_preachForm 为空的数据 当成 service_subtask.preachform 字符串的第一个执行方式、首次待随访全部(visitCount = 1 && sendstate in (1、2、3、7)) 区别于原先的待随访，这个是给市一使用的 再次待随访全部(visitCount > 1 && sendstate in (1、2、3、7)) 区别于原先的待随访，这个是给市一使用的 首次待随访待发送(visitCount = 1 && sendstate in (1、2)) 再次待随访待发送(visitCount > 1 && sendstate in (1、2)) 首次待随访已发送(visitCount = 1 && sendstate = in (3、7)) 再次待随访已发送(visitCount > 1 && sendstate = in (3、7)) 首次已发送(visitCount = 1 && sendstate = 3) 再次已发送(visitCount > 1 && sendstate = 3)
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SmsTempletController.java | 17 +++++++++++++++--
1 files changed, 15 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 8607f25..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
@@ -5,6 +5,9 @@
import javax.servlet.http.HttpServletResponse;
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;
import org.springframework.web.bind.annotation.PostMapping;
@@ -39,11 +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);
}
/**
@@ -74,6 +84,9 @@
@Log(title = "鐭俊妯℃澘", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody SmsTemplet smsTemplet) {
+ SysUser user = getLoginUser().getUser();
+ smsTemplet.setUserName(user.getUserName());
+ smsTemplet.setNickName(user.getNickName());
return toAjax(smsTempletService.insertSmsTemplet(smsTemplet));
}
--
Gitblit v1.9.3