From 6f28c35c6d1177675d3ef3b8138616ba92d94690 Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Fri, 2 Jun 2023 11:38:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A7=E5=8C=BA=E6=98=AF=E5=90=A6=E4=B8=BA?=
 =?UTF-8?q?=E5=A4=87=E8=B4=A7=E5=8C=BA=E4=BF=AE=E6=94=B9=E8=B4=A7=E5=8C=BA?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BasicdataGoodsAreaController.java         | 21 +++++++++++++++----
 .../mapper/BasicdataGoodsAreaMapper.xml       |  2 +-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java
index e1111d4d1..cabff7b48 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java
@@ -76,13 +76,26 @@ public class BasicdataGoodsAreaController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入warehouseGoodsArea")
-	public R<IPage<BasicdataGoodsAreaVO>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataGoodsArea, Query query) {
+	public R<IPage<BasicdataGoodsAreaEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataGoodsArea, Query query) {
 		IPage<Object> page = Condition.getPage(query);
-		IPage<BasicdataGoodsAreaVO> list = basicdataGoodsAreaService.getBasicdataGoodsAreaList(basicdataGoodsArea,page);
-//		IPage<BasicdataGoodsAreaVO> pages = basicdataGoodsAreaService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataGoodsArea, BasicdataGoodsAreaEntity.class));
-		return R.data(list);
+//		IPage<BasicdataGoodsAreaVO> list = basicdataGoodsAreaService.getBasicdataGoodsAreaList(basicdataGoodsArea,page);
+		IPage<BasicdataGoodsAreaEntity> pages = basicdataGoodsAreaService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataGoodsArea, BasicdataGoodsAreaEntity.class));
+		return R.data(pages);
 	}
 
+//	/**
+//	 * 货区 分页
+//	 */
+//	@GetMapping("/list")
+//	@ApiOperationSupport(order = 2)
+//	@ApiOperation(value = "分页", notes = "传入warehouseGoodsArea")
+//	public R<IPage<BasicdataGoodsAreaEntity>> listInfo(@ApiIgnore Query query) {
+//		IPage<Object> page = Condition.getPage(query);
+////		IPage<BasicdataGoodsAreaVO> list = basicdataGoodsAreaService.getBasicdataGoodsAreaList(basicdataGoodsArea,page);
+//		IPage<BasicdataGoodsAreaEntity> pages = basicdataGoodsAreaService.page(Condition.getPage(query));
+//		return R.data(pages);
+//	}
+
 	/**
 	 * 货区 自定义分页
 	 */
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml
index 7a2e1b090..437ec1e7a 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml
@@ -21,7 +21,7 @@
         <result column="warehouse_id" property="warehouseId"/>
         <result column="headline" property="headline"/>
         <result column="enbale_status" property="enableStatus"/>
-        <result column="is_strage_area" property="isStrageArea"/>
+        <result column="area_type" property="areaType"/>
     </resultMap>
     <update id="removeGoodsArea">
         UPDATE logpm_warehouse_goods_area