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 | 55 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 30 insertions(+), 25 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 fd3276f..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,13 +1,15 @@
-package com.smartor.controller;
+package com.ruoyi.web.controller.smartor;
import java.util.List;
+import java.util.Map;
import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
+
+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;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,21 +18,20 @@
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
-import com.smartor.domain.SmsTemplet;
-import com.smartor.service.ISmsTempletService;
+import com.ruoyi.system.domain.SmsTemplet;
+import com.ruoyi.system.service.ISmsTempletService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 鐭俊妯℃澘Controller
- *
+ *
* @author smartor
* @date 2023-03-06
*/
@RestController
@RequestMapping("/smartor/smstemplet")
-public class SmsTempletController extends BaseController
-{
+public class SmsTempletController extends BaseController {
@Autowired
private ISmsTempletService smsTempletService;
@@ -38,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);
}
/**
@@ -52,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, "鐭俊妯℃澘鏁版嵁");
@@ -64,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));
}
@@ -75,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));
}
@@ -86,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));
}
@@ -96,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