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 |   45 ++++++++++++++++++++++++++-------------------
 1 files changed, 26 insertions(+), 19 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 0ad0f48..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;
@@ -27,8 +31,7 @@
  */
 @RestController
 @RequestMapping("/smartor/smstemplet")
-public class SmsTempletController extends BaseController
-{
+public class SmsTempletController extends BaseController {
     @Autowired
     private ISmsTempletService smsTempletService;
 
@@ -36,12 +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);
     }
 
     /**
@@ -50,8 +59,7 @@
     //@PreAuthorize("@ss.hasPermi('smartor:smstemplet:export')")
     @Log(title = "鐭俊妯℃澘", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SmsTemplet smsTemplet)
-    {
+    public void export(HttpServletResponse response, SmsTemplet smsTemplet) {
         List<SmsTemplet> list = smsTempletService.selectSmsTempletList(smsTemplet);
         ExcelUtil<SmsTemplet> util = new ExcelUtil<SmsTemplet>(SmsTemplet.class);
         util.exportExcel(response, list, "鐭俊妯℃澘鏁版嵁");
@@ -62,8 +70,7 @@
      */
     //@PreAuthorize("@ss.hasPermi('smartor:smstemplet:query')")
     @GetMapping(value = "/{templetid}")
-    public AjaxResult getInfo(@PathVariable("templetid") Long templetid)
-    {
+    public AjaxResult getInfo(@PathVariable("templetid") Long templetid) {
         return success(smsTempletService.selectSmsTempletByTempletid(templetid));
     }
 
@@ -73,8 +80,10 @@
     //@PreAuthorize("@ss.hasPermi('smartor:smstemplet:add')")
     @Log(title = "鐭俊妯℃澘", businessType = BusinessType.INSERT)
     @PostMapping("/add")
-    public AjaxResult add(@RequestBody SmsTemplet smsTemplet)
-    {
+    public AjaxResult add(@RequestBody SmsTemplet smsTemplet) {
+        SysUser user = getLoginUser().getUser();
+        smsTemplet.setUserName(user.getUserName());
+        smsTemplet.setNickName(user.getNickName());
         return toAjax(smsTempletService.insertSmsTemplet(smsTemplet));
     }
 
@@ -84,8 +93,7 @@
     //@PreAuthorize("@ss.hasPermi('smartor:smstemplet:edit')")
     @Log(title = "鐭俊妯℃澘", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
-    public AjaxResult edit(@RequestBody SmsTemplet smsTemplet)
-    {
+    public AjaxResult edit(@RequestBody SmsTemplet smsTemplet) {
         return toAjax(smsTempletService.updateSmsTemplet(smsTemplet));
     }
 
@@ -94,9 +102,8 @@
      */
     //@PreAuthorize("@ss.hasPermi('smartor:smstemplet:remove')")
     @Log(title = "鐭俊妯℃澘", businessType = BusinessType.DELETE)
-	@GetMapping("/remove/{templetids}")
-    public AjaxResult remove(@PathVariable Long[] templetids)
-    {
+    @GetMapping("/remove/{templetids}")
+    public AjaxResult remove(@PathVariable Long[] templetids) {
         return toAjax(smsTempletService.deleteSmsTempletByTempletids(templetids));
     }
 }

--
Gitblit v1.9.3