Merge pull request 'bug:消息分页返回增加总数等字段' (#18) from feature-jie into develop

Reviewed-on: #18
Reviewed-by: 筱锋xiao_lfeng <gm@x-lf.cn>

.run/oa [clean,spring-boot_run].run.xml

@@ -2,7 +2,22 @@
   <configuration default="false" name="oa [clean,spring-boot:run]" type="MavenRunConfiguration" factoryName="Maven" nameIsGenerated="true">
     <MavenSettings>
       <option name="myGeneralSettings" />
-      <option name="myRunnerSettings" />
+      <option name="myRunnerSettings">
+        <MavenRunnerSettings>
+          <option name="delegateBuildToMaven" value="false" />
+          <option name="environmentProperties">
+            <map />
+          </option>
+          <option name="jreName" value="corretto-17" />
+          <option name="mavenProperties">
+            <map />
+          </option>
+          <option name="passParentEnv" value="true" />
+          <option name="runMavenInBackground" value="true" />
+          <option name="skipTests" value="false" />
+          <option name="vmOptions" value="-Dfile.encoding=GB2312" />
+        </MavenRunnerSettings>
+      </option>
       <option name="myRunnerParameters">
         <MavenRunnerParameters>
           <option name="cmdOptions" />

src/main/java/com/jsl/oa/model/vodata/PageBean.java

@@ -0,0 +1,17 @@
+package com.jsl.oa.model.vodata;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PageBean<T> {
+    private int totalCount; // 总记录数
+    private int currentPage; // 当前页码
+    private int pageSize; // 每页记录数
+    private List<T> list; // 当前页的数据列表
+}

src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java

@@ -7,6 +7,7 @@ import com.jsl.oa.model.dodata.ProjectChildDO;
 import com.jsl.oa.model.dodata.ProjectModuleDO;
 import com.jsl.oa.model.vodata.MessageAddVO;
 import com.jsl.oa.model.vodata.MessageGetVO;
+import com.jsl.oa.model.vodata.PageBean;
 import com.jsl.oa.services.MessageService;
 import com.jsl.oa.utils.*;
 import lombok.RequiredArgsConstructor;
@@ -86,12 +87,18 @@ public class MessageServiceImpl implements MessageService {
             }
             messageGetVOList.add(messageGetVO1);
         }
+
         //分页返回
         int start = (page - 1) * pageSize;
         int end = start + pageSize;
         List<MessageGetVO> pageData = messageGetVOList.subList(start,
                 Math.min(end, messageGetVOList.size()));
-        return ResultUtil.success(pageData);
+        PageBean<MessageGetVO> pageBean = new PageBean<>();
+        pageBean.setTotalCount(messageGetVOList.size());
+        pageBean.setCurrentPage(page);
+        pageBean.setPageSize(pageSize);
+        pageBean.setList(pageData);
+        return ResultUtil.success(pageBean);
     }
 
     /**