From 8c4288c307a200ecd5b26110e80beacd6f0cf278 Mon Sep 17 00:00:00 2001 From: Yen Date: Mon, 22 May 2023 14:11:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E7=9B=B8=E5=85=B3=E6=95=B0?= =?UTF-8?q?=E6=8D=AEID=E4=BD=BF=E7=94=A8=E9=9B=AA=E8=8A=B1=E7=AE=97?= =?UTF-8?q?=E6=B3=95=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=8C=BA=E5=9F=9F=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bms/controller/BmsRegionController.java | 1 + .../service/impl/BmsRegion2ServiceImpl.java | 25 ++++++++-------- .../service/impl/BmsRegionServiceImpl.java | 29 ++++++++++--------- .../impl/HisUserSupplierServiceImpl.java | 10 ++++--- 4 files changed, 36 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java index a2e58d78..b8ad256b 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java @@ -250,6 +250,7 @@ public class BmsRegionController { param.setName(regionBo.getName()); param.setPid(regionBo.getPid()); boolean result = bmsRegionService.updateBmsRegionById(param); + hisUserSupplierService.cleanTable(); return R.isTrue(result); } diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegion2ServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegion2ServiceImpl.java index 6f212b31..53679ac5 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegion2ServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegion2ServiceImpl.java @@ -64,37 +64,38 @@ public class BmsRegion2ServiceImpl extends ServiceImpl regionSupplierList = bmsSupplierApplicationService.listByRegionIds(Arrays.asList(ori.getId()),ori.getLevel()); - for (BmsSupplier supplier : regionSupplierList) { + if(CollectionUtil.isNotEmpty(regionSupplierList)){ String[] ids = currentRegion.getPathIds().split("_"); String region1 = "0"; String region2 = "0"; String region3 = "0"; String region4 = "0"; String regionLast = "0"; - if(ids.length>1){ + if(ids.length>0){ region1 = ids[0]; regionLast = region1; } - if(ids.length>2){ + if(ids.length>1){ region2 = ids[1]; regionLast = region2; } - if(ids.length>3){ + if(ids.length>2){ region3 = ids[2]; regionLast = region3; } - if(ids.length>4){ + if(ids.length>3){ region4 = ids[3]; regionLast = region4; } - supplier.setRegion2First(region1); - supplier.setRegion2Second(region2); - supplier.setRegion2Third(region3); - supplier.setRegion2First(region4); - supplier.setRegion2Last(regionLast); - bmsSupplierMapper.updateById(supplier); + for (BmsSupplier supplier : regionSupplierList) { + supplier.setRegionFirst(region1); + supplier.setRegionSecond(region2); + supplier.setRegionThird(region3); + supplier.setRegionFourthly(region4); + supplier.setRegionLast(regionLast); + bmsSupplierMapper.updateById(supplier); + } } - } } return b; diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java index 929748fa..a7be0a28 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java @@ -13,6 +13,7 @@ import com.qs.serve.modules.bms.mapper.BmsSupplierMapper; import com.qs.serve.modules.bms.service.BmsFactoryService; import com.qs.serve.modules.bms.service.BmsRegionUserService; import com.qs.serve.modules.his.service.HisUserChannelPointService; +import com.qs.serve.modules.his.service.HisUserSupplierService; import com.qs.serve.modules.sys.entity.SysUser; import com.qs.serve.modules.sys.service.SysUserService; import lombok.AllArgsConstructor; @@ -55,50 +56,52 @@ public class BmsRegionServiceImpl extends ServiceImpl @Override public boolean updateBmsRegionById(BmsRegion param){ + BmsRegion ori = this.getById(param.getId()); param = this.flushSetLevel(param); boolean b = this.updateById(param); - BmsRegion ori = this.getById(param.getId()); boolean changePid = !ori.getPid().equals(param.getPid()); if(!ori.getName().equals(param.getName())||changePid) { BmsRegion parentRegion = this.updatePathByPid(param.getId()); if(changePid){ + //hisUserSupplierService.cleanTable(); /*停用的逻辑 hisUserChannelPointService.removeRegion(2,ori.getPathIds()); hisUserChannelPointService.flushRegion(2,parentRegion.getPathIds());*/ //更新客户 BmsRegion currentRegion = this.getById(param.getId()); List regionSupplierList = bmsSupplierApplicationService.listByRegionIds(Arrays.asList(ori.getId()),ori.getLevel()); - for (BmsSupplier supplier : regionSupplierList) { + if(CollectionUtil.isNotEmpty(regionSupplierList)){ String[] ids = currentRegion.getPathIds().split("_"); String region1 = "0"; String region2 = "0"; String region3 = "0"; String region4 = "0"; String regionLast = "0"; - if(ids.length>1){ + if(ids.length>0){ region1 = ids[0]; regionLast = region1; } - if(ids.length>2){ + if(ids.length>1){ region2 = ids[1]; regionLast = region2; } - if(ids.length>3){ + if(ids.length>2){ region3 = ids[2]; regionLast = region3; } - if(ids.length>4){ + if(ids.length>3){ region4 = ids[3]; regionLast = region4; } - supplier.setRegionFirst(region1); - supplier.setRegionSecond(region2); - supplier.setRegionThird(region3); - supplier.setRegionFirst(region4); - supplier.setRegionLast(regionLast); - bmsSupplierMapper.updateById(supplier); + for (BmsSupplier supplier : regionSupplierList) { + supplier.setRegionFirst(region1); + supplier.setRegionSecond(region2); + supplier.setRegionThird(region3); + supplier.setRegionFourthly(region4); + supplier.setRegionLast(regionLast); + bmsSupplierMapper.updateById(supplier); + } } - } } return b; diff --git a/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java b/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java index 64f81cfa..ffacc267 100644 --- a/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java @@ -13,6 +13,8 @@ import com.qs.serve.modules.bms.entity.BmsRegion; import com.qs.serve.modules.bms.entity.BmsRegion2; import com.qs.serve.modules.bms.entity.BmsRegionUser; import com.qs.serve.modules.bms.entity.BmsSupplier; +import com.qs.serve.modules.bms.mapper.BmsRegion2Mapper; +import com.qs.serve.modules.bms.mapper.BmsRegionMapper; import com.qs.serve.modules.bms.service.BmsRegion2Service; import com.qs.serve.modules.bms.service.BmsRegionService; import com.qs.serve.modules.bms.service.BmsRegionUserService; @@ -39,8 +41,8 @@ import java.util.stream.Collectors; public class HisUserSupplierServiceImpl extends ServiceImpl implements HisUserSupplierService { private BmsSupplierService bmsSupplierService; - private BmsRegionService saleRegionService; - private BmsRegion2Service bizRegionService; + private BmsRegionMapper saleRegionMapper; + private BmsRegion2Mapper bmsRegion2Mapper; private BmsRegionUserService regionUserService; private SysPostUserService sysPostUserService; @@ -152,7 +154,7 @@ public class HisUserSupplierServiceImpl extends ServiceImpl0){ - List saleRegions = saleRegionService.listByIds(regionSaleIds); + List saleRegions = saleRegionMapper.selectBatchIds(regionSaleIds); Map> saleRegionsMap = saleRegions.stream().collect(Collectors.groupingBy(BmsRegion::getLevel)); for (Integer level : saleRegionsMap.keySet()) { List saleRegionListByLevel = saleRegionsMap.get(level); @@ -165,7 +167,7 @@ public class HisUserSupplierServiceImpl extends ServiceImpl0){ - List bizRegions = bizRegionService.listByIds(regionBizIds); + List bizRegions = bmsRegion2Mapper.selectBatchIds(regionBizIds); Map> saleRegionsMap = bizRegions.stream().collect(Collectors.groupingBy(BmsRegion2::getLevel)); for (Integer level : saleRegionsMap.keySet()) { List region2List = saleRegionsMap.get(level);