修复预算使用情况统计异常

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<PageVo<GoodsCategory>> getPage(GoodsCategory param){
+    public R<PageVo<GoodsCategory>> getMgrPage(GoodsCategory param){
         PageUtil.startPage();
         LambdaQueryWrapper<GoodsCategory> categoryWrapper = new LambdaQueryWrapper<>(param);
         List<GoodsCategory> list = goodsCategoryService.list(categoryWrapper);
         return R.byPageHelperList(list);
     }
 
+
+
     /**
      * 查询
      * @param param
      * @return
      */
     @GetMapping("/list")
-    @PreAuthorize("hasRole('goods:category:query')")
     public R<List<GoodsCategory>> getList(GoodsCategory param){
+        param.setEnable(1);
         LambdaQueryWrapper<GoodsCategory> categoryWrapper = new LambdaQueryWrapper<>(param);
         List<GoodsCategory> list = goodsCategoryService.list(categoryWrapper);
         return R.ok(list);
     }
 
     /**
-     * 树查询
+     * 树查询(组件接口)
+     * @param param
+     * @return
+     */
+    @GetMapping("/enableTree")
+    public R<List<GoodsCategoryTreeVo>> getPage(GoodsCategory param){
+        param.setEnable(1);
+        return this.getTree(param);
+    }
+
+    /**
+     * 树查询(管理)
      * @param param
      * @return
      */
@@ -86,6 +99,7 @@ public class GoodsCategoryController {
     public R<List<GoodsCategoryTreeVo>> getTree(GoodsCategory param){
         final boolean loadSpuData = param.getLoadSpuData()!=null&&param.getLoadSpuData().equals(1);
         LambdaQueryWrapper<GoodsCategory> lqw = new LambdaQueryWrapper<>(param);
+        param.setEnable(1);
         List<GoodsCategory> list = goodsCategoryService.list(lqw);
         List<GoodsCategoryTreeVo> 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<GoodsSpu> spuLqw = new LambdaQueryWrapper<>();
                 spuLqw.eq(GoodsSpu::getCategoryThird,cate.getId( ));
+                spuLqw.eq(GoodsSpu::getShelf,1);
                 List<GoodsSpu> spuList = goodsSpuService.list(spuLqw);
                 for (GoodsSpu goodsSpu : spuList) {
                     GoodsCategoryTreeVo spuNode = new GoodsCategoryTreeVo();

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<PageVo<GoodSkuVo>> getPage(GoodsSku param){
         PageUtil.startPage();
         List<GoodSkuVo> list = goodsSkuService.selectSkuVo(param);
         return R.byPageHelperList(list);
     }
 
+    /**
+     * 翻页(组件接口)
+     * @param param
+     * @return
+     */
+    @GetMapping("/enablePage")
+    public R<PageVo<GoodSkuVo>> getMgrPage(GoodsSku param){
+        PageUtil.startPage();
+        param.setEnable(1);
+        List<GoodSkuVo> list = goodsSkuService.selectSkuVo(param);
+        return R.byPageHelperList(list);
+    }
+
     /**
      * 根据ID查询
      * @param id

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<PageVo<GoodsSpu>> getShelfPage(GoodsSpu param){
+        param.setShelf(1);
+        return this.getPage(param);
+    }
+
+    /**
+     * 翻页搜索(管理)
      * @param param
      * @return
      */

src/main/java/com/qs/serve/modules/tbs/service/TbsActivityApplicationService.java

@@ -72,13 +72,15 @@ public class TbsActivityApplicationService {
         Map<Long,List<TbsBudgetCostItem>> hisCostGroupByItemBudget = hisBudgetCostItemList.stream()
                 .collect(Collectors.groupingBy(TbsBudgetCostItem::getScheduleItemBudgetId));
         List<TbsActivityGoods> activityGoodsList = activityService.buildActGoodsList(activityBo,null,null);
-        //构建预算费用占用明细
+        //补充添加科目拦截
+        List<Long> subjectIds = activityBo.getActivitySubjectList().stream().map(TbsActivitySubjectBo::getSubjectId).collect(Collectors.toList());
         // 加载所有条件
         List<TbsBudget> budgetList = new ArrayList<>();
         if(budgetIds.size()>0){
             LambdaQueryWrapper<TbsBudget> budgetLqw = new LambdaQueryWrapper<>();
             budgetLqw.in(TbsBudget::getId,budgetIds);
             budgetLqw.eq(TbsBudget::getBudgetState,1);
+            budgetLqw.in(TbsBudget::getSubjectId,subjectIds);
             budgetList = tbsBudgetMapper.selectList(budgetLqw);
         }
         List<TbsBudget> noConditionBudgetList = new ArrayList<>();

src/main/java/com/qs/serve/modules/tbs/service/TbsActivitySubjectService.java

@@ -19,5 +19,12 @@ public interface TbsActivitySubjectService extends IService<TbsActivitySubject>
      */
     List<TbsActivitySubject> listByActivityId(Long activityId);
 
+    /**
+     * 通过活动申请获取列表
+     * @param costApplyId
+     * @return
+     */
+    List<TbsActivitySubject> listByCostApplyId(Long costApplyId);
+
 }
 

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<TbsActivity> activityLqw = new LambdaQueryWrapper<>();
         activityLqw.eq(TbsActivity::getCostApplyId,costApplyId);
         List<TbsActivity> activityList = activityMapper.selectList(activityLqw);
+        List<TbsActivitySubject> activitySubjects = tbsActivitySubjectService.listByCostApplyId(costApplyId);
         if(activityList.size()<1){
             Assert.throwEx("当前费用未设置活动");
         }
@@ -172,11 +175,14 @@ public class TbsBudgetApplicationService {
                 .collect(Collectors.groupingBy(TbsBudgetCostItem::getScheduleItemBudgetId));
         // 构建预算费用占用明细
         List<TbsActivityCenterGoods> centerGoodsList = tbsActivityCenterGoodsService.listByCostApplyId(costApplyId);
+        //补充添加科目拦截
+        List<Long> subjectIds = activitySubjects.stream().map(TbsActivitySubject::getSubjectId).collect(Collectors.toList());
         // 加载所有条件
         List<TbsBudget> budgetList;
         if(budgetIds.size()>0){
             LambdaQueryWrapper<TbsBudget> 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<TbsActivityCenterGoods> actMatchList,
                                    final List<TbsActivityCenterGoods> actUnMatchList,
                                    final Map<Long,List<Long>> activityAllowBudgetIdMap) {
+        List<TbsActivitySubject> activitySubjects;
         //过滤满全条件的预算
         List<Long> allowBudgetIds = activityAllowBudgetIdMap.get(activityCostItem.getActivityId());
         List<TbsBudget> budgetList = allBudgetList.stream().filter(obj->allowBudgetIds.contains(obj.getId())).collect(Collectors.toList());

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivitySubjectServiceImpl.java

@@ -27,5 +27,12 @@ public class TbsActivitySubjectServiceImpl extends ServiceImpl<TbsActivitySubjec
         lqw.eq(TbsActivitySubject::getActivityId,activityId);
         return this.list(lqw);
     }
+
+    @Override
+    public List<TbsActivitySubject> listByCostApplyId(Long activityId) {
+        LambdaQueryWrapper<TbsActivitySubject> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(TbsActivitySubject::getCostApplyId,activityId);
+        return this.list(lqw);
+    }
 }
 

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateLogServiceImpl.java

@@ -25,6 +25,7 @@ public class TbsActivityTemplateLogServiceImpl extends ServiceImpl<TbsActivityTe
     public TbsActivityTemplateLog toLog(TbsActivityTemplate template, Integer optState) {
         if(template==null){return null;}
         TbsActivityTemplateLog templateLog = CopierUtil.copy(template,new TbsActivityTemplateLog());
+        templateLog.setId(null);
         templateLog.setTemplateId(template.getId());
         templateLog.setOptionState(optState);
         return templateLog;