From 09f75e1b4ee21241940ad26b91462ea15c5e4f00 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 03 七月 2026 09:25:29 +0800
Subject: [PATCH] 1.短信功能提交 2.优化随访详情页 3.导出两个sheet
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SmsTempletController.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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 38fb37c..1342158 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
@@ -1,8 +1,12 @@
-package com.smartor.controller;
+package com.ruoyi.web.controller.smartor;
import java.util.List;
+import java.util.Map;
import javax.servlet.http.HttpServletResponse;
+import cn.hutool.core.util.ObjectUtil;
+import com.ruoyi.common.core.domain.entity.SysUser;
+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;
@@ -35,11 +39,18 @@
* 鏌ヨ鐭俊妯℃澘鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:smstemplet:list')")
- @PostMapping("list")
- public TableDataInfo list(@RequestBody SmsTemplet smsTemplet) {
- startPage();
+ @PostMapping("/list")
+ public Map<String, Object> list(@RequestBody SmsTemplet smsTemplet) {
+ 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());
+ }
+ //杩欎釜涓嶉渶瑕佸垎椤碉紝涓�涓瀹や篃涓嶄細鏈夊灏戞潯鐭俊妯℃澘
+ smsTemplet.setPageNum(null);
+ smsTemplet.setPageSize(null);
List<SmsTemplet> list = smsTempletService.selectSmsTempletList(smsTemplet);
- return getDataTable(list);
+ return getDataTable3(ObjectUtil.isNotEmpty(list) ? list.size() : 0, list);
}
/**
@@ -70,6 +81,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