Browse Source

添加科目适用区域

contract
Yen 2 years ago
parent
commit
f024c7dbb8
  1. 2
      src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java
  2. 14
      src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectController.java
  3. 2
      src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java

2
src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java

@ -74,7 +74,7 @@ public class BmsRegionController {
/**
* 树查询
* @param listUserFlag
* @param listUserFlag 加载我负责的用户所属的区域
* @param loadByCurrent =1过滤当前用户负责数据
* @return
*/

14
src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectController.java

@ -67,12 +67,17 @@ public class BmsSubjectController {
treeVoList = TreeUtil.buildByRecursive(treeVoList,TreeUtil.DEFAULT_PID_STRING);
if(StringUtils.hasText(supplierId)){
BmsSupplier bmsSupplier = bmsSupplierService.getById(supplierId);
LambdaQueryWrapper<BmsSubject> subjectLqw = new LambdaQueryWrapper<>();
subjectLqw.eq(BmsSubject::getBizRegionFlag,0).or().eq(BmsSubject::getSaleRegionFlag,0);
List<BmsSubject> bmsSubjectList = bmsSubjectService.list(subjectLqw);
List<BmsSubjectRegion> subjectRegionList = bmsSubjectRegionService.listByRegionIds(bmsSupplier.listBizRegionIds(),1);
List<BmsSubjectRegion> subjectRegionList2 = bmsSubjectRegionService.listByRegionIds(bmsSupplier.listSaleRegionIds(),0);
subjectRegionList.addAll(subjectRegionList2);
List<String> subjectIds = bmsSubjectList.stream().map(a->a.getId().toString()).collect(Collectors.toList());
//加载允许适用的科目
List<String> subjectIds = subjectRegionList.stream().map(a->a.getSubjectId().toString())
List<String> subjectIds2 = subjectRegionList.stream().map(a->a.getSubjectId().toString())
.distinct().collect(Collectors.toList());
subjectIds.addAll(subjectIds2);
recursionToSetSelectAble(treeVoList, subjectIds);
}
return R.ok(treeVoList);
@ -84,10 +89,13 @@ public class BmsSubjectController {
* @param subjectIds
*/
private void recursionToSetSelectAble(List<?> treeVoList, List<String> subjectIds) {
if(CollectionUtil.isEmpty(treeVoList)){
return;
}
for (Object object : treeVoList) {
BmsSubjectTreeVo subjectTreeVo = (BmsSubjectTreeVo)object;
if(subjectTreeVo.getChildren().size()==0){
if(subjectTreeVo.getBizRegionFlag().equals(0)&&subjectTreeVo.getSaleRegionFlag().equals(0)){
if(CollectionUtil.isEmpty(subjectTreeVo.getChildren())){
if(subjectTreeVo.getBizRegionFlag().equals(0)||subjectTreeVo.getSaleRegionFlag().equals(0)){
subjectTreeVo.setApiSelectAble(1);
}else {
for (String subjectId : subjectIds) {

2
src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java

@ -78,7 +78,7 @@ public class BmsSupplierController {
/**
* 翻页查询
* 翻页查询=1过滤当前用户负责数据
* @param param
* @return
*/

Loading…
Cancel
Save