辅助选址结果列表接口完成，筛选，分页功能添加

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/controller/FzssController.java

@@ -68,8 +68,8 @@ public class FzssController extends BaseController {
      * @return
      */
     @GetMapping("/GetXzResList")
-    public RequestResult GetXzResList(String startTime, String endTime, String name) {
-        RequestResult res = fzssService.GetXzResList(startTime, endTime, name);
+    public RequestResult GetXzResList(String startTime, String endTime, String name, Integer pageNum, Integer pageSize) {
+        RequestResult res = fzssService.GetXzResList(startTime, endTime, name, pageNum, pageSize);
         return res;
     }
 

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/FzxzMapper.java

@@ -23,4 +23,7 @@ public interface FzxzMapper extends BaseMapper<FzxzDTO> {
 
     @Master
     List<FzxzResultDTO> getList(Map<String, Object> paramMap);
+
+    @Master
+    Integer getCount(Map<String, Object> paramMap);
 }

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/service/IFzssService.java

@@ -19,7 +19,7 @@ public interface IFzssService {
 
     RequestResult GetXzjg(String bsm);
 
-    RequestResult GetXzResList(String startTime, String endTime, String name);
+    RequestResult GetXzResList(String startTime, String endTime, String name, Integer pageNum, Integer pageSize);
 
     RequestResult saveWordFile(String bsm, ArrayList xzbsm);
 }

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/service/impl/FzssServiceImpl.java

@@ -395,7 +395,7 @@ public class FzssServiceImpl implements IFzssService {
     }
 
     @Override
-    public RequestResult GetXzResList(String startTime, String endTime, String name) {
+    public RequestResult GetXzResList(String startTime, String endTime, String name, Integer pageNum, Integer pageSize) {
         Long userId = SecurityUtils.getUserId();
         Map<String, Object> paramMap = new HashMap<>();
         paramMap.put("userId", userId);
@@ -403,8 +403,24 @@ public class FzssServiceImpl implements IFzssService {
         paramMap.put("startTime", startTime);
         paramMap.put("endTime", endTime);
 
+        if (pageNum == null) {
+            pageNum = 1;
+        }
+        if (pageSize == null) {
+            pageSize = 20;
+        }
+
+        int offset = (pageNum - 1) * pageSize;
+        paramMap.put("offset", offset);
+        paramMap.put("limit", pageSize);
+
         List<FzxzResultDTO> fzxzDTOS = fzxzMapper.getList(paramMap);
-        return RequestResult.success("查询成功！", fzxzDTOS);
+        Integer total = fzxzMapper.getCount(paramMap);
+
+        Map<String, Object> resMap = new HashMap<>();
+        resMap.put("items", fzxzDTOS);
+        resMap.put("total", total);
+        return RequestResult.success("查询成功！", resMap);
     }
 
     /**

onemap-modules/onemap-analyse/src/main/resources/mapper/oracle/fzss/FzxzMapper.xml

@@ -69,8 +69,8 @@
         <if test="userId != null and userId != ''">
             and user_id = #{userId}
         </if>
-        <if test="name != null and name != ''">
-            and xmmc like '%'||#{name}||'%'
+        <if test="xmmc != null and xmmc != ''">
+            and xmmc like '%'||#{xmmc}||'%'
         </if>
         <if test="startTime != null and startTime != ''">
             and cjsj &gt;= TO_TIMESTAMP(#{startTime}, 'YYYY-MM-DD HH24:MI:SS')
@@ -79,5 +79,24 @@
             and cjsj &lt;= TO_TIMESTAMP(#{endTime}, 'YYYY-MM-DD HH24:MI:SS')
         </if>
         order by cjsj desc
+        LIMIT #{limit} OFFSET #{offset}
+    </select>
+
+    <select id="getCount" parameterType="map" resultType="Integer">
+        select count(1)
+        from t_fzss_fzxz
+        where 1=1
+        <if test="userId != null and userId != ''">
+            and user_id = #{userId}
+        </if>
+        <if test="xmmc != null and xmmc != ''">
+            and xmmc like '%'||#{xmmc}||'%'
+        </if>
+        <if test="startTime != null and startTime != ''">
+            and cjsj &gt;= TO_TIMESTAMP(#{startTime}, 'YYYY-MM-DD HH24:MI:SS')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and cjsj &lt;= TO_TIMESTAMP(#{endTime}, 'YYYY-MM-DD HH24:MI:SS')
+        </if>
     </select>
 </mapper>