瀏覽代碼

修改nzy查询接口,不支持分页

liutao 2 周之前
父節點
當前提交
fa465b01c6

+ 5 - 0
.gitignore

@@ -0,0 +1,5 @@
+node_modules
+dist
+log
+target
+.idea

+ 15 - 0
YHYZT/server/src/main/java/com/zjugis/yzt/beans/entity/StNzydk.java

@@ -17,29 +17,44 @@ import com.vividsolutions.jts.geom.Geometry;
 @Data
 @TableName("sde.st_nzydk")
 public class StNzydk {
+
     @TableId
     private Integer objectid;
+    /** 项目编号 */
     @TableField("dk_bh")
     private String dkBh;
+    /** 项目名称 */
     @TableField("dk_mc")
     private String dkMc;
+    /** 土地用途 */
     @TableField("dk_yt")
     private String dkYt;
+    /** 项目面积(公顷) */
     @TableField("dk_mj")
     private BigDecimal dkMj;
+    /** 备注 */
     private String bz;
+    /** 用地主体 */
     @TableField("dk_qs")
     private String dkQs;
+    /** 土地坐落 */
     @TableField("td_zl")
     private String tdZl;
+    /** 批次名称 */
     private String pch;
+    /** 批准文号 */
     private String pwh;
+    /** 批准日期 */
     private String pzrq;
+    /** 批次索引 */
     private String pcbh;
+    /** 类型 取值:单独选址/批次用地 */
     private String lx;
     @TableField("pz_mj")
     private BigDecimal pzMj;
+    /** 乡镇街道 */
     private String xzz;
+    /** 是否农民建房 */
     private String nmjf;
     @TableField("shape")
     private Geometry shape;

+ 18 - 0
YHYZT/server/src/main/java/com/zjugis/yzt/beans/vo/StNzydkVO.java

@@ -0,0 +1,18 @@
+package com.zjugis.yzt.beans.vo;
+
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@JsonInclude(JsonInclude.Include.ALWAYS)
+public class StNzydkVO {
+    private String pch;
+    private String lx;
+    private String pwh;
+    private String pzrq;
+    private BigDecimal pzMj;
+    private String nmjf;
+} 

+ 28 - 12
YHYZT/server/src/main/java/com/zjugis/yzt/controller/StNzydkController.java

@@ -11,6 +11,11 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
 import java.util.List;
+import com.zjugis.yzt.beans.vo.StNzydkVO;
+import java.util.stream.Collectors;
+import java.util.Comparator;
+import java.util.Map;
+import java.util.Date;
 
 /**
  * @program: yh_yzt
@@ -77,23 +82,14 @@ public class StNzydkController {
         return stNzydkService.removeById(objectid);
     }
 
-    /**
-     * 分页查询农转用地块信息
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @GetMapping("/page")
-    public Page<StNzydk> getStNzydkByPage(@RequestParam(defaultValue = "1") Integer pageNum,
-                                         @RequestParam(defaultValue = "10") Integer pageSize,
-                                         @RequestParam(required = false) String pch,
+    @GetMapping("/list")
+    public List<StNzydkVO> getStNzydkByPage(@RequestParam(required = false) String pch,
                                          @RequestParam(required = false) String lx,
                                          @RequestParam(required = false) String pwh,
                                          @RequestParam(required = false) String pzrqStart,
                                          @RequestParam(required = false) String pzrqEnd,
                                          @RequestParam(required = false) BigDecimal pzmj,
                                          @RequestParam(required = false) String nmjf) {
-        Page<StNzydk> page = new Page<>(pageNum, pageSize);
         QueryWrapper<StNzydk> queryWrapper = new QueryWrapper<>();
 
         if (pch != null && !pch.isEmpty()) {
@@ -118,7 +114,27 @@ public class StNzydkController {
             queryWrapper.eq("nmjf", nmjf);
         }
 
-        return stNzydkService.page(page, queryWrapper);
+        List<StNzydk> list = stNzydkService.list(queryWrapper);
+
+        // 对所有记录按照pch进行去重,只取第一条记录
+        return list.stream()
+                .collect(Collectors.toMap(
+                        StNzydk::getPch,
+                        stNzydk -> stNzydk,
+                        (existing, replacement) -> existing // 保留现有(即第一条)
+                ))
+                .values().stream()
+                .map(stNzydk -> {
+                    StNzydkVO vo = new StNzydkVO();
+                    vo.setPch(stNzydk.getPch());
+                    vo.setLx(stNzydk.getLx());
+                    vo.setPwh(stNzydk.getPwh());
+                    vo.setPzrq(stNzydk.getPzrq());
+                    vo.setPzMj(stNzydk.getPzMj()); // 注意:这里需要与StNzydk中的字段名匹配
+                    vo.setNmjf(stNzydk.getNmjf());
+                    return vo;
+                })
+                .collect(Collectors.toList());
     }
 
     /**