修改微信列表分页total数据错误

postdischarge-manage/src/main/java/com/xinelu/manage/controller/servicepackage/ServicePackageController.java

@@ -1,9 +1,12 @@
 package com.xinelu.manage.controller.servicepackage;
 
 import com.xinelu.common.annotation.Log;
+import com.xinelu.common.constant.HttpStatus;
 import com.xinelu.common.core.controller.BaseController;
 import com.xinelu.common.core.domain.AjaxResult;
+import com.xinelu.common.core.page.PageDomain;
 import com.xinelu.common.core.page.TableDataInfo;
+import com.xinelu.common.core.page.TableSupport;
 import com.xinelu.common.enums.BusinessType;
 import com.xinelu.common.utils.poi.ExcelUtil;
 import com.xinelu.manage.domain.servicepackage.ServicePackage;
@@ -18,6 +21,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 服务包基础信息Controller
@@ -39,9 +43,17 @@ public class ServicePackageController extends BaseController {
     @PreAuthorize("@ss.hasPermi('manage:servicepackage:list')")
     @GetMapping("/list")
     public TableDataInfo list(ServicePackage servicePackage) {
-        startPage();
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
         List<ServicePackageVO> list = servicePackageService.selectServicePackageList(servicePackage);
-        return getDataTable(list);
+        int num = list.size();
+        list = list.stream().skip((pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(HttpStatus.SUCCESS);
+        rspData.setRows(list);
+        rspData.setTotal(num);
+        return rspData;
     }
 
     /**

postdischarge-manage/src/main/java/com/xinelu/manage/controller/textmessage/TextMessageController.java

@@ -1,9 +1,12 @@
 package com.xinelu.manage.controller.textmessage;
 
 import com.xinelu.common.annotation.Log;
+import com.xinelu.common.constant.HttpStatus;
 import com.xinelu.common.core.controller.BaseController;
 import com.xinelu.common.core.domain.AjaxResult;
+import com.xinelu.common.core.page.PageDomain;
 import com.xinelu.common.core.page.TableDataInfo;
+import com.xinelu.common.core.page.TableSupport;
 import com.xinelu.common.enums.BusinessType;
 import com.xinelu.common.utils.poi.ExcelUtil;
 import com.xinelu.manage.dto.textmessage.TextMessageDTO;
@@ -19,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 短信模板信息Controller
@@ -40,9 +44,17 @@ public class TextMessageController extends BaseController {
     @PreAuthorize("@ss.hasPermi('manage:message:list')")
     @GetMapping("/list")
     public TableDataInfo list(TextMessageDTO textMessageDTO) {
-        startPage();
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
         List<TextMessageTaskVO> list = textMessageService.selectTextMessageList(textMessageDTO);
-        return getDataTable(list);
+        int num = list.size();
+        list = list.stream().skip((pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(HttpStatus.SUCCESS);
+        rspData.setRows(list);
+        rspData.setTotal(num);
+        return rspData;
     }
 
     /**

postdischarge-manage/src/main/java/com/xinelu/manage/controller/wechattemplate/WechatTemplateController.java

@@ -1,9 +1,12 @@
 package com.xinelu.manage.controller.wechattemplate;
 
 import com.xinelu.common.annotation.Log;
+import com.xinelu.common.constant.HttpStatus;
 import com.xinelu.common.core.controller.BaseController;
 import com.xinelu.common.core.domain.AjaxResult;
+import com.xinelu.common.core.page.PageDomain;
 import com.xinelu.common.core.page.TableDataInfo;
+import com.xinelu.common.core.page.TableSupport;
 import com.xinelu.common.enums.BusinessType;
 import com.xinelu.common.utils.poi.ExcelUtil;
 import com.xinelu.manage.dto.wechattemplate.WechatTemplateDTO;
@@ -18,6 +21,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 微信模板信息Controller
@@ -39,9 +43,17 @@ public class WechatTemplateController extends BaseController {
     @PreAuthorize("@ss.hasPermi('manage:template:list')")
     @GetMapping("/list")
     public TableDataInfo list(WechatTemplateDTO wechatTemplateDto) {
-        startPage();
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
         List<WechatTemplateTaskVO> list = wechatTemplateService.selectWechatTemplateList(wechatTemplateDto);
-        return getDataTable(list);
+        int num = list.size();
+        list = list.stream().skip((pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(HttpStatus.SUCCESS);
+        rspData.setRows(list);
+        rspData.setTotal(num);
+        return rspData;
     }
 
     /**

postdischarge-manage/src/main/java/com/xinelu/manage/service/textmessage/impl/TextMessageServiceImpl.java

@@ -3,6 +3,7 @@ package com.xinelu.manage.service.textmessage.impl;
 import com.xinelu.common.core.domain.entity.SysDictData;
 import com.xinelu.common.exception.ServiceException;
 import com.xinelu.common.utils.DateUtils;
+import com.xinelu.common.utils.PageServiceUtil;
 import com.xinelu.common.utils.SecurityUtils;
 import com.xinelu.common.utils.bean.BeanUtils;
 import com.xinelu.manage.domain.textmessage.TextMessage;
@@ -37,6 +38,7 @@ public class TextMessageServiceImpl implements ITextMessageService {
     @Resource
     private SysDictDataMapper sysDictDataMapper;
 
+
     /**
      * 查询短信模板信息
      *

postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/impl/WechatTemplateServiceImpl.java

@@ -3,6 +3,7 @@ package com.xinelu.manage.service.wechattemplate.impl;
 import com.xinelu.common.core.domain.entity.SysDictData;
 import com.xinelu.common.exception.ServiceException;
 import com.xinelu.common.utils.DateUtils;
+import com.xinelu.common.utils.PageServiceUtil;
 import com.xinelu.common.utils.SecurityUtils;
 import com.xinelu.common.utils.bean.BeanUtils;
 import com.xinelu.manage.domain.wechattemplate.WechatTemplate;

postdischarge-manage/src/main/resources/mapper/manage/wechattemplate/WechatTemplateMapper.xml

@@ -26,7 +26,7 @@
         <result column="department_id" property="departmentId"/>
         <result column="department_name" property="departmentName"/>
         <result column="disease_type_id" property="diseaseTypeId"/>
-        <result column="disease_type_name" property="departmentName"/>
+        <result column="disease_type_name" property="diseaseTypeName"/>
         <result column="wechat_template_name" property="wechatTemplateName"/>
         <result column="template_id" property="templateId"/>
         <result column="template_content" property="templateContent"/>