用地报批，批次数据集添加

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/YdbpDataController.java

@@ -1,16 +1,19 @@
 package com.siwei.apply.controller;
 
 import com.siwei.apply.domain.YdbpData;
-import com.siwei.apply.domain.vo.YdbpDataVo;
 import com.siwei.apply.domain.vo.YdbpDataFilterVo;
 import com.siwei.apply.domain.vo.YdbpDataUpdateVo;
+import com.siwei.apply.domain.vo.YdbpDataVo;
 import com.siwei.apply.service.YdbpDataService;
 import com.siwei.common.core.domain.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
+import java.util.Map;
 
+/**
+ * 用地报批（批次）数据集
+ */
 @RestController
 @RequestMapping("/ydbpData")
 public class YdbpDataController {
@@ -56,9 +59,9 @@ public class YdbpDataController {
      * @return
      */
     @PostMapping("/list")
-    public R<List<YdbpData>> getList(@RequestBody YdbpDataFilterVo filterVo) {
+    public R<Map<String, Object>> getList(@RequestBody YdbpDataFilterVo filterVo) {
         try {
-            List<YdbpData> result = ydbpDataService.getList(filterVo);
+            Map<String, Object> result = ydbpDataService.getList(filterVo);
             return R.ok(result);
         } catch (Exception e) {
             return R.fail(e.getMessage());

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/YdbpDataMapper.java

@@ -14,4 +14,6 @@ public interface YdbpDataMapper {
     List<YdbpData> selectPage(int offset, int pageSize);
 
     void update(YdbpData ydbpData);
+
+    int countAll();
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/YdbpDataService.java

@@ -1,18 +1,19 @@
 package com.siwei.apply.service;
 
 import com.siwei.apply.domain.YdbpData;
-import com.siwei.apply.domain.vo.YdbpDataVo;
 import com.siwei.apply.domain.vo.YdbpDataFilterVo;
 import com.siwei.apply.domain.vo.YdbpDataUpdateVo;
+import com.siwei.apply.domain.vo.YdbpDataVo;
 
-import java.util.List;
+import java.util.Map;
 
 public interface YdbpDataService {
     String add(YdbpDataVo ydbpDataVo);
 
     YdbpData getById(String id);
 
-    List<YdbpData> getList(YdbpDataFilterVo filterVo);
+    Map<String, Object> getList(YdbpDataFilterVo filterVo);
 
     void update(YdbpDataUpdateVo ydbpDataVo);
+
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/YdbpDataServiceImpl.java

@@ -10,7 +10,9 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class YdbpDataServiceImpl implements YdbpDataService {
@@ -33,11 +35,16 @@ public class YdbpDataServiceImpl implements YdbpDataService {
     }
 
     @Override
-    public List<YdbpData> getList(YdbpDataFilterVo filterVo) {
+    public Map<String, Object> getList(YdbpDataFilterVo filterVo) {
         int pageNum = filterVo.getPageNum() == null ? 1 : filterVo.getPageNum();
         int pageSize = filterVo.getPageSize() == null ? 10 : filterVo.getPageSize();
         int offset = (pageNum - 1) * pageSize;
-        return ydbpDataMapper.selectPage(offset, pageSize);
+        List<YdbpData> rows = ydbpDataMapper.selectPage(offset, pageSize);
+        int total = ydbpDataMapper.countAll();
+        Map<String, Object> result = new HashMap<>();
+        result.put("rows", rows);
+        result.put("total", total);
+        return result;
     }
 
     @Override

siwei-modules/siwei-apply/src/main/resources/mapper/YdbpDataMapper.xml

@@ -51,4 +51,7 @@
         </set>
         WHERE id = #{id}
     </update>
+    <select id="countAll" resultType="int">
+        SELECT COUNT(1) FROM t_ydbp_data
+    </select>
 </mapper>