From 950c3aa95dbe29d468d66d53d5e727d3b678153a Mon Sep 17 00:00:00 2001 From: donqi Date: Tue, 5 Jul 2022 14:19:20 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E6=9F=A5=E8=AF=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=8B=86=E5=88=86=E6=88=90=E4=B8=A4=E4=B8=AA=E5=88=86?= =?UTF-8?q?=E5=88=AB=E6=8F=90=E4=BE=9B=E7=BB=99=E5=90=8E=E5=8F=B0=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=B3=BB=E7=BB=9F=E4=B8=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/goods/GoodsController.java | 21 +++++++- .../payment/FinancialDetailController.java | 10 +++- .../controller/system/SysAreaController.java | 15 +++++- .../controller/worker/WorkerController.java | 51 ++++++++++++++++++- 4 files changed, 92 insertions(+), 5 deletions(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java b/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java index 3156b8d0..b8edadac 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java @@ -43,10 +43,27 @@ public class GoodsController extends BaseController { return PREFIX + "/goods"; } - // @RequiresPermissions("goods:goods:list") +// @RequiresPermissions("goods:goods:list") @PostMapping("/list") @ResponseBody - public TableDataInfo list(@RequestBody Goods goods) { + public TableDataInfo list(Goods goods) { + startPage(); + List list = goodsService.selectGoodsList(goods); + list.forEach(one -> { + // 补全商品 + List goodsAreas = goodsAreaService.selectByGoodsId(one.getGoodsId()); + one.setGoodsAreaList(goodsAreas); + + // 补全商品类别 + List goodsStandards = goodsStandardService.selectByGoodsId(one.getGoodsId()); + one.setGoodsStandardList(goodsStandards); + }); + return getDataTable(list); + } + + @PostMapping("/app/list") + @ResponseBody + public TableDataInfo appList(@RequestBody Goods goods) { startPage(); List list = goodsService.selectGoodsList(goods); list.forEach(one -> { diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/payment/FinancialDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/payment/FinancialDetailController.java index 64b6466b..746c0df7 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/payment/FinancialDetailController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/payment/FinancialDetailController.java @@ -54,7 +54,15 @@ public class FinancialDetailController extends BaseController { // @RequiresPermissions("financial:detail:list") @PostMapping("/list") @ResponseBody - public TableDataInfo list(@RequestBody FinancialDetail financialDetail) { + public TableDataInfo list(FinancialDetail financialDetail) { + startPage(); + List list = financialDetailService.selectFinancialDetailList(financialDetail); + return getDataTable(list); + } + + @PostMapping("/app/list") + @ResponseBody + public TableDataInfo appList(@RequestBody FinancialDetail financialDetail) { startPage(); List list = financialDetailService.selectFinancialDetailList(financialDetail); return getDataTable(list); diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/system/SysAreaController.java b/ghy-admin/src/main/java/com/ghy/web/controller/system/SysAreaController.java index eb0d9586..b2766795 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/system/SysAreaController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/system/SysAreaController.java @@ -34,7 +34,20 @@ public class SysAreaController extends BaseController { // @RequiresPermissions("system:area:list") @PostMapping("/list") @ResponseBody - public AjaxResult list(@RequestBody SysArea sysArea) + public AjaxResult list(SysArea sysArea) + { + try { + return AjaxResult.success(sysAreaService.selectSysAreaList(sysArea)); + }catch (Exception e){ + logger.error(ExceptionUtil.getExceptionMessage(e)); + return AjaxResult.error(e.getMessage()); + } + + } + + @PostMapping("/app/list") + @ResponseBody + public AjaxResult appList(@RequestBody SysArea sysArea) { try { return AjaxResult.success(sysAreaService.selectSysAreaList(sysArea)); 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 73d6a59a..d43491ba 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 @@ -66,7 +66,56 @@ public class WorkerController extends BaseController { // @RequiresPermissions("worker:worker:list") @PostMapping("/list") @ResponseBody - public TableDataInfo list(@RequestBody WorkerListRequest workerListRequest) + public TableDataInfo list(WorkerListRequest workerListRequest) + { + List resList = new ArrayList(); + + try { + // 查询满足区域条件的师傅区域记录 + WorkerArea workerArea = new WorkerArea(); + workerArea.setDistrictId(workerListRequest.getAreaId()); + List workerAreaList = workerAreaService.getWorkerAreaList(workerArea); + List workerIdsByArea = workerAreaList.stream().map(WorkerArea::getWorkerId).collect(Collectors.toList()); + // 查询满足技能条件的师傅技能记录 + WorkerGoodsCategory workerGoodsCategory = new WorkerGoodsCategory(); + workerGoodsCategory.setGoodsCategoryId(workerListRequest.getGoodsCategoryId()); + List workerGoodsCategoryList = workerGoodsCategoryService.getWorkerGoodsCategory(workerGoodsCategory); + List workerIdsByCategory = workerGoodsCategoryList.stream().map(WorkerGoodsCategory::getWorkerId).collect(Collectors.toList()); + // 两个list中的workerid取交集 + List resWorkerIds = new ArrayList<>(CollectionUtils.intersection(workerIdsByArea, workerIdsByCategory)); + + if (CollectionUtils.isEmpty(resWorkerIds)) { + // 交集不存在的情况直接返回空list + return getDataTable(resList); + } + + startPage(); + Worker worker = new Worker(); + worker.setWorkerIds(CollectionUtils.isNotEmpty(resWorkerIds) ? resWorkerIds : null); + worker.setName(workerListRequest.getWorkerName()); + List list = workerService.getWorkList(worker); + list.forEach(w -> { + Goods goods = new Goods(); + goods.setWorkerId(w.getWorkerId()); + goods.setStatus(Integer.valueOf(GoodsStatus.OK.getCode())); + WorkerListResponse workerListResponse = JSONObject.parseObject(JSON.toJSONString(w), WorkerListResponse.class); + workerListResponse.setGoodsList(goodsService.selectGoodsList(goods)); + workerListResponse.setWorkerAreas(workerAreaService.getByWorker(w.getWorkerId())); + workerListResponse.setGoodsCategories(workerGoodsCategoryService.getByWorker(w.getWorkerId())); + workerListResponse.setSpecialSkills(specialSkillService.getByWorker(w.getWorkerId())); + resList.add(workerListResponse); + }); + } catch (Exception e) { + e.printStackTrace(); + logger.error(ExceptionUtil.getExceptionMessage(e)); + } + + return getDataTable(resList); + } + + @PostMapping("/app/list") + @ResponseBody + public TableDataInfo appList(@RequestBody WorkerListRequest workerListRequest) { List resList = new ArrayList();