|
@@ -16,6 +16,7 @@ import org.springframework.format.annotation.DateTimeFormat;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
import java.util.Map;
|
|
|
+import com.zjugis.yzt.beans.vo.SsnydVO;
|
|
|
|
|
|
@RestController
|
|
|
@RequestMapping("/api/ssnyd")
|
|
@@ -39,7 +40,7 @@ public class SsnydController extends BaseRestController {
|
|
|
* @return 分页结果
|
|
|
*/
|
|
|
@GetMapping("/page")
|
|
|
- public IPage<SsnydNew> getSsnydList(
|
|
|
+ public IPage<SsnydVO> getSsnydList(
|
|
|
@RequestParam(defaultValue = "1") Integer current,
|
|
|
@RequestParam(defaultValue = "10") Integer size,
|
|
|
@RequestParam(required = false) String xmbh,
|
|
@@ -76,15 +77,17 @@ public class SsnydController extends BaseRestController {
|
|
|
}
|
|
|
|
|
|
Page<SsnydNew> page = new Page<>(current, size);
|
|
|
- return ssnydService.page(page, queryWrapper);
|
|
|
+ IPage<SsnydNew> ssnydPage = ssnydService.page(page, queryWrapper);
|
|
|
+ return ssnydPage.convert(this::convertToVO);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 根据ID获取设施农用地信息
|
|
|
*/
|
|
|
@GetMapping("/{id}")
|
|
|
- public SsnydNew getSsnydById(@PathVariable Integer id) {
|
|
|
- return ssnydService.getById(id);
|
|
|
+ public SsnydVO getSsnydById(@PathVariable Integer id) {
|
|
|
+ SsnydNew ssnyd = ssnydService.getById(id);
|
|
|
+ return convertToVO(ssnyd);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -136,4 +139,23 @@ public class SsnydController extends BaseRestController {
|
|
|
return error("部分数据导入失败", ErrorCode.DEFAULT, errorList);
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 实体转VO
|
|
|
+ */
|
|
|
+ private SsnydVO convertToVO(SsnydNew ssnyd) {
|
|
|
+ if (ssnyd == null) return null;
|
|
|
+ SsnydVO vo = new SsnydVO();
|
|
|
+ vo.setObjectid(ssnyd.getObjectid());
|
|
|
+ vo.setBah(ssnyd.getBah());
|
|
|
+ vo.setBasj(ssnyd.getBasj());
|
|
|
+ vo.setYt(ssnyd.getYt());
|
|
|
+ vo.setXmbh(ssnyd.getXmbh());
|
|
|
+ vo.setXmmc(ssnyd.getXmmc());
|
|
|
+ vo.setSzs(ssnyd.getSzs());
|
|
|
+ vo.setXzq(ssnyd.getXzq());
|
|
|
+ vo.setBamj(ssnyd.getBamj());
|
|
|
+ vo.setShape(ssnyd.getShape());
|
|
|
+ return vo;
|
|
|
+ }
|
|
|
}
|