|
@@ -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());
|
|
|
}
|
|
|
|
|
|
/**
|