From e180e3a496d6f29d3a3b34016400de9d997c6bd9 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 07 四月 2026 14:42:23 +0800
Subject: [PATCH] 省立同德满意度功能提交

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateScriptController.java |   37 +++++++++++++++++++------------------
 1 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateScriptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateScriptController.java
index b6a6aaf..804392c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateScriptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateScriptController.java
@@ -7,17 +7,20 @@
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.smartor.domain.ServiceSubtaskCountReq;
 import com.smartor.domain.SvyLibTemplateScript;
 import com.smartor.service.ISvyLibTemplateScriptService;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 妯℃澘闂嵎棰樼洰Controller
@@ -27,8 +30,7 @@
  */
 @RestController
 @RequestMapping("/smartor/svytemplatescript")
-public class SvyLibTemplateScriptController extends BaseController
-{
+public class SvyLibTemplateScriptController extends BaseController {
     @Autowired
     private ISvyLibTemplateScriptService svyLibTemplateScriptService;
 
@@ -36,12 +38,16 @@
      * 鏌ヨ妯℃澘闂嵎棰樼洰鍒楄〃
      */
     //@PreAuthorize("@ss.hasPermi('system:script:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(SvyLibTemplateScript svyLibTemplateScript)
-    {
-        startPage();
+    @PostMapping("/list")
+    public Map<String, Object> list(SvyLibTemplateScript svyLibTemplateScript) {
+        Integer offset = PageUtils.getOffset(svyLibTemplateScript.getPageNum(), svyLibTemplateScript.getPageSize());
+        svyLibTemplateScript.setPageNum(offset);
         List<SvyLibTemplateScript> list = svyLibTemplateScriptService.selectSvyLibTemplateScriptList(svyLibTemplateScript);
-        return getDataTable(list);
+
+        svyLibTemplateScript.setPageNum(null);
+        svyLibTemplateScript.setPageSize(null);
+        List<SvyLibTemplateScript> count = svyLibTemplateScriptService.selectSvyLibTemplateScriptList(svyLibTemplateScript);
+        return getDataTable3(CollectionUtils.isNotEmpty(count) ? Long.valueOf(count.size()) : 0L, list);
     }
 
     /**
@@ -50,8 +56,7 @@
     //@PreAuthorize("@ss.hasPermi('system:script:export')")
     @Log(title = "妯℃澘闂嵎棰樼洰", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SvyLibTemplateScript svyLibTemplateScript)
-    {
+    public void export(HttpServletResponse response, SvyLibTemplateScript svyLibTemplateScript) {
         List<SvyLibTemplateScript> list = svyLibTemplateScriptService.selectSvyLibTemplateScriptList(svyLibTemplateScript);
         ExcelUtil<SvyLibTemplateScript> util = new ExcelUtil<SvyLibTemplateScript>(SvyLibTemplateScript.class);
         util.exportExcel(response, list, "妯℃澘闂嵎棰樼洰鏁版嵁");
@@ -62,8 +67,7 @@
      */
     //@PreAuthorize("@ss.hasPermi('system:script:query')")
     @GetMapping(value = "/{topicid}")
-    public AjaxResult getInfo(@PathVariable("topicid") Long topicid)
-    {
+    public AjaxResult getInfo(@PathVariable("topicid") Long topicid) {
         return success(svyLibTemplateScriptService.selectSvyLibTemplateScriptByTopicid(topicid));
     }
 
@@ -74,8 +78,7 @@
     @Log(title = "妯℃澘闂嵎棰樼洰", businessType = BusinessType.INSERT)
     @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
     @PostMapping("/add")
-    public AjaxResult add(@RequestBody SvyLibTemplateScript svyLibTemplateScript)
-    {
+    public AjaxResult add(@RequestBody SvyLibTemplateScript svyLibTemplateScript) {
         SysUser user = getLoginUser().getUser();
         svyLibTemplateScript.setOrgid(user.getOrgid());
         return toAjax(svyLibTemplateScriptService.insertSvyLibTemplateScript(svyLibTemplateScript));
@@ -88,8 +91,7 @@
     @Log(title = "妯℃澘闂嵎棰樼洰", businessType = BusinessType.UPDATE)
     @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
     @PostMapping("/edit")
-    public AjaxResult edit(@RequestBody SvyLibTemplateScript svyLibTemplateScript)
-    {
+    public AjaxResult edit(@RequestBody SvyLibTemplateScript svyLibTemplateScript) {
         return toAjax(svyLibTemplateScriptService.updateSvyLibTemplateScript(svyLibTemplateScript));
     }
 
@@ -98,9 +100,8 @@
      */
     //@PreAuthorize("@ss.hasPermi('system:script:remove')")
     @Log(title = "妯℃澘闂嵎棰樼洰", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{topicids}")
-    public AjaxResult remove(@PathVariable Long[] topicids)
-    {
+    @DeleteMapping("/{topicids}")
+    public AjaxResult remove(@PathVariable Long[] topicids) {
         return toAjax(svyLibTemplateScriptService.deleteSvyLibTemplateScriptByTopicids(topicids));
     }
 

--
Gitblit v1.9.3