From 64eb07ba85c37574f9633b7292235b37a58f828b Mon Sep 17 00:00:00 2001 From: Yen Date: Sat, 28 Jan 2023 10:30:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A2=84=E7=AE=97=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E6=83=85=E5=86=B5=E7=BB=9F=E8=AE=A1=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/GoodsCategoryController.java | 21 ++++++++++++++++--- .../goods/controller/GoodsSkuController.java | 16 ++++++++++++-- .../goods/controller/GoodsSpuController.java | 13 +++++++++++- .../TbsActivityApplicationService.java | 4 +++- .../service/TbsActivitySubjectService.java | 7 +++++++ .../service/TbsBudgetApplicationService.java | 7 +++++++ .../impl/TbsActivitySubjectServiceImpl.java | 7 +++++++ .../TbsActivityTemplateLogServiceImpl.java | 1 + 8 files changed, 69 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java index 173bd054..5ab0af38 100644 --- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java +++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java @@ -56,28 +56,41 @@ public class GoodsCategoryController { */ @GetMapping("/page") @PreAuthorize("hasRole('goods:category:query')") - public R> getPage(GoodsCategory param){ + public R> getMgrPage(GoodsCategory param){ PageUtil.startPage(); LambdaQueryWrapper categoryWrapper = new LambdaQueryWrapper<>(param); List list = goodsCategoryService.list(categoryWrapper); return R.byPageHelperList(list); } + + /** * 查询 * @param param * @return */ @GetMapping("/list") - @PreAuthorize("hasRole('goods:category:query')") public R> getList(GoodsCategory param){ + param.setEnable(1); LambdaQueryWrapper categoryWrapper = new LambdaQueryWrapper<>(param); List list = goodsCategoryService.list(categoryWrapper); return R.ok(list); } /** - * 树查询 + * 树查询(组件接口) + * @param param + * @return + */ + @GetMapping("/enableTree") + public R> getPage(GoodsCategory param){ + param.setEnable(1); + return this.getTree(param); + } + + /** + * 树查询(管理) * @param param * @return */ @@ -86,6 +99,7 @@ public class GoodsCategoryController { public R> getTree(GoodsCategory param){ final boolean loadSpuData = param.getLoadSpuData()!=null&¶m.getLoadSpuData().equals(1); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); + param.setEnable(1); List list = goodsCategoryService.list(lqw); List treeVoList = list.stream().map(cate->{ GoodsCategoryTreeVo treeNode = CopierUtil.copy(cate,new GoodsCategoryTreeVo()); @@ -97,6 +111,7 @@ public class GoodsCategoryController { if(loadSpuData && cate.getLevel().equals(3)){ LambdaQueryWrapper spuLqw = new LambdaQueryWrapper<>(); spuLqw.eq(GoodsSpu::getCategoryThird,cate.getId( )); + spuLqw.eq(GoodsSpu::getShelf,1); List spuList = goodsSpuService.list(spuLqw); for (GoodsSpu goodsSpu : spuList) { GoodsCategoryTreeVo spuNode = new GoodsCategoryTreeVo(); diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java index 931cfe7b..e995ad5c 100644 --- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java +++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java @@ -61,18 +61,30 @@ public class GoodsSkuController { } /** - * 翻页 + * 翻页(管理) * @param param * @return */ @GetMapping("/page") - @PreAuthorize("hasRole('goods:sku:query')") public R> getPage(GoodsSku param){ PageUtil.startPage(); List list = goodsSkuService.selectSkuVo(param); return R.byPageHelperList(list); } + /** + * 翻页(组件接口) + * @param param + * @return + */ + @GetMapping("/enablePage") + public R> getMgrPage(GoodsSku param){ + PageUtil.startPage(); + param.setEnable(1); + List list = goodsSkuService.selectSkuVo(param); + return R.byPageHelperList(list); + } + /** * 根据ID查询 * @param id diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java index 1486c5c9..58ac8558 100644 --- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java +++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java @@ -67,7 +67,18 @@ public class GoodsSpuController { } /** - * 翻页搜索 + * 翻页搜索(组件接口) + * @param param + * @return + */ + @GetMapping("/shelfPage") + public R> getShelfPage(GoodsSpu param){ + param.setShelf(1); + return this.getPage(param); + } + + /** + * 翻页搜索(管理) * @param param * @return */ diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsActivityApplicationService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsActivityApplicationService.java index 087e0f56..4127dbbd 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/TbsActivityApplicationService.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsActivityApplicationService.java @@ -72,13 +72,15 @@ public class TbsActivityApplicationService { Map> hisCostGroupByItemBudget = hisBudgetCostItemList.stream() .collect(Collectors.groupingBy(TbsBudgetCostItem::getScheduleItemBudgetId)); List activityGoodsList = activityService.buildActGoodsList(activityBo,null,null); - //构建预算费用占用明细 + //补充添加科目拦截 + List subjectIds = activityBo.getActivitySubjectList().stream().map(TbsActivitySubjectBo::getSubjectId).collect(Collectors.toList()); // 加载所有条件 List budgetList = new ArrayList<>(); if(budgetIds.size()>0){ LambdaQueryWrapper budgetLqw = new LambdaQueryWrapper<>(); budgetLqw.in(TbsBudget::getId,budgetIds); budgetLqw.eq(TbsBudget::getBudgetState,1); + budgetLqw.in(TbsBudget::getSubjectId,subjectIds); budgetList = tbsBudgetMapper.selectList(budgetLqw); } List noConditionBudgetList = new ArrayList<>(); diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsActivitySubjectService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsActivitySubjectService.java index d7459704..0bae0e08 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/TbsActivitySubjectService.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsActivitySubjectService.java @@ -19,5 +19,12 @@ public interface TbsActivitySubjectService extends IService */ List listByActivityId(Long activityId); + /** + * 通过活动申请获取列表 + * @param costApplyId + * @return + */ + List listByCostApplyId(Long costApplyId); + } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java index 29e1071c..be094605 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java @@ -8,6 +8,7 @@ import com.qs.serve.modules.sys.service.SysConfigService; import com.qs.serve.modules.tbs.common.TbsGoodsType; import com.qs.serve.modules.tbs.common.util.TbsBudgetCostUtil; import com.qs.serve.modules.tbs.entity.*; +import com.qs.serve.modules.tbs.entity.bo.TbsActivitySubjectBo; import com.qs.serve.modules.tbs.entity.dto.TbsBudgetCostResult; import com.qs.serve.modules.tbs.entity.vo.TbsBudgetTableVo; import com.qs.serve.modules.tbs.mapper.TbsActivityGoodsMapper; @@ -33,6 +34,7 @@ import java.util.stream.Collectors; public class TbsBudgetApplicationService { private TbsActivityCenterGoodsService tbsActivityCenterGoodsService; + private TbsActivitySubjectService tbsActivitySubjectService; private TbsScheduleItemBudgetService tbsScheduleItemBudgetService; private TbsBudgetMapper tbsBudgetMapper; private TbsBudgetConditionService tbsBudgetConditionService; @@ -156,6 +158,7 @@ public class TbsBudgetApplicationService { LambdaQueryWrapper activityLqw = new LambdaQueryWrapper<>(); activityLqw.eq(TbsActivity::getCostApplyId,costApplyId); List activityList = activityMapper.selectList(activityLqw); + List activitySubjects = tbsActivitySubjectService.listByCostApplyId(costApplyId); if(activityList.size()<1){ Assert.throwEx("当前费用未设置活动"); } @@ -172,11 +175,14 @@ public class TbsBudgetApplicationService { .collect(Collectors.groupingBy(TbsBudgetCostItem::getScheduleItemBudgetId)); // 构建预算费用占用明细 List centerGoodsList = tbsActivityCenterGoodsService.listByCostApplyId(costApplyId); + //补充添加科目拦截 + List subjectIds = activitySubjects.stream().map(TbsActivitySubject::getSubjectId).collect(Collectors.toList()); // 加载所有条件 List budgetList; if(budgetIds.size()>0){ LambdaQueryWrapper budgetLqw = new LambdaQueryWrapper<>(); budgetLqw.in(TbsBudget::getId,budgetIds); + budgetLqw.in(TbsBudget::getSubjectId,subjectIds); budgetLqw.eq(TbsBudget::getBudgetState,1); budgetList = tbsBudgetMapper.selectList(budgetLqw); }else { @@ -401,6 +407,7 @@ public class TbsBudgetApplicationService { final List actMatchList, final List actUnMatchList, final Map> activityAllowBudgetIdMap) { + List activitySubjects; //过滤满全条件的预算 List allowBudgetIds = activityAllowBudgetIdMap.get(activityCostItem.getActivityId()); List budgetList = allBudgetList.stream().filter(obj->allowBudgetIds.contains(obj.getId())).collect(Collectors.toList()); diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivitySubjectServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivitySubjectServiceImpl.java index 29effa1c..cdadf3b1 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivitySubjectServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivitySubjectServiceImpl.java @@ -27,5 +27,12 @@ public class TbsActivitySubjectServiceImpl extends ServiceImpl listByCostApplyId(Long activityId) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(TbsActivitySubject::getCostApplyId,activityId); + return this.list(lqw); + } } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateLogServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateLogServiceImpl.java index a037fe0e..3175df52 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateLogServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateLogServiceImpl.java @@ -25,6 +25,7 @@ public class TbsActivityTemplateLogServiceImpl extends ServiceImpl