diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java index b72c028d..6a36c879 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java @@ -181,6 +181,7 @@ public class WorkerController extends BaseController { try { // 查询满足区域条件的师傅区域记录 worker.setDistrictId(workerListRequest.getAreaId()); + worker.setDistrictIds(workerListRequest.getAreaIds()); // 查询需要排除的区 if (workerListRequest.getExceptParentAreaId() != null) { SysArea areaParams = new SysArea(); diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/WorkerListRequest.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/WorkerListRequest.java index ce975525..eab56087 100644 --- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/WorkerListRequest.java +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/WorkerListRequest.java @@ -3,6 +3,8 @@ package com.ghy.web.pojo.vo; import com.ghy.worker.domain.Worker; import lombok.Data; +import java.util.List; + /** * @author ydq * @date : 2022-06-24 17:38 @@ -11,6 +13,8 @@ import lombok.Data; public class WorkerListRequest { private Long areaId; + private List areaIds; + private Long goodsCategoryId; private String workerName; diff --git a/ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java b/ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java index 640a6a22..deb83bc9 100644 --- a/ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java +++ b/ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java @@ -63,6 +63,8 @@ public class Goods extends BaseEntity { @Excel(name = "区域Id", cellType = Excel.ColumnType.NUMERIC) private Long areaId; + private List areaIds; + private Long exceptParentAreaId; private List goodsAreaList; diff --git a/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml b/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml index 5fcbf990..5f1bcc28 100644 --- a/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml +++ b/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml @@ -110,6 +110,12 @@ AND country_area_id = #{areaId} + + AND country_area_id in + + #{areaId} + + AND sa.parent_code != #{exceptParentAreaId} diff --git a/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java b/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java index 4778da49..61c3489d 100644 --- a/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java +++ b/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java @@ -66,6 +66,8 @@ public class Worker extends BaseEntity { private Long districtId; + private List districtIds; + private List exceptDistrictIds; private Long goodsCategoryId; diff --git a/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml b/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml index 1b33c4af..181c77b2 100644 --- a/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml +++ b/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml @@ -61,7 +61,13 @@ AND wa.district_id = #{districtId} - + + AND wa.district_id in + + #{districtId} + + + AND wa.district_id not in #{exceptDistrictId}