From 2b5f6b00b63c5118d5bfcea7a3292b9795d4a2f0 Mon Sep 17 00:00:00 2001 From: Yen Date: Thu, 4 May 2023 17:17:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8C=BA=E5=9F=9F=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=BB=91=E5=AE=9A=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/bms/controller/BmsRegion2Controller.java | 6 +++--- .../bms/controller/BmsRegionUserController.java | 12 ++++++++++-- .../modules/his/controller/HistTestController.java | 4 ++-- .../service/impl/HisUserChannelPointServiceImpl.java | 10 +++++++++- .../his/service/impl/HisUserSupplierServiceImpl.java | 2 +- 5 files changed, 25 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegion2Controller.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsRegion2Controller.java index cde434ba..5db1e6cd 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegion2Controller.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsRegion2Controller.java @@ -282,9 +282,9 @@ public class BmsRegion2Controller { * @param regionBo * @return */ - @PostMapping("/editBatch") - @SysLog(module = SystemModule.BASE, title = "区域档案", biz = BizType.INSERT) - @PreAuthorize("hasRole('bms:region:insert')") + //@PostMapping("/editBatch") + //@SysLog(module = SystemModule.BASE, title = "区域档案", biz = BizType.INSERT) + //@PreAuthorize("hasRole('bms:region:insert')") public R editBatch(@RequestBody @Valid BmsRegionBatchBo regionBo){ ValidateTools.valid(regionBo.getRegionList()); for (BmsRegionBatchBo.BmsRegionBo BmsRegion2Bo : regionBo.getRegionList()) { diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionUserController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionUserController.java index fe7b2cad..97989198 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionUserController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionUserController.java @@ -155,7 +155,11 @@ public class BmsRegionUserController { List regionList = bmsRegionService.listByIds(param.getRegionIds()); for (BmsRegion region : regionList) { LambdaQueryWrapper pointLqw = new LambdaQueryWrapper<>(); - pointLqw.eq(BmsChannelPoint::getSaleRegionId,region.getId()); + pointLqw.and(plqw->{ + plqw.eq(BmsChannelPoint::getSaleRegionId,region.getId()) + .or() + .likeRight(BmsChannelPoint::getSaleRegionPathIds,region.getPathIds()+"_"); + }); pointLqw.select(BmsChannelPoint::getId); //区域有那些网点 List pointList = channelPointService.list(pointLqw); @@ -168,7 +172,11 @@ public class BmsRegionUserController { List regionList = bmsRegion2Service.listByIds(param.getRegionIds()); for (BmsRegion2 region : regionList) { LambdaQueryWrapper pointLqw = new LambdaQueryWrapper<>(); - pointLqw.eq(BmsChannelPoint::getBizRegionId,region.getId()); + pointLqw.and(plqw->{ + plqw.eq(BmsChannelPoint::getBizRegionId,region.getId()) + .or() + .likeRight(BmsChannelPoint::getBizRegionPathIds,region.getPathIds()+"_"); + }); pointLqw.select(BmsChannelPoint::getId); //区域有那些网点 List pointList = channelPointService.list(pointLqw); diff --git a/src/main/java/com/qs/serve/modules/his/controller/HistTestController.java b/src/main/java/com/qs/serve/modules/his/controller/HistTestController.java index 9aed512d..37122188 100644 --- a/src/main/java/com/qs/serve/modules/his/controller/HistTestController.java +++ b/src/main/java/com/qs/serve/modules/his/controller/HistTestController.java @@ -22,8 +22,8 @@ import java.util.List; */ @Slf4j @AllArgsConstructor -//@RestController -//@RequestMapping("his/dev") +@RestController +@RequestMapping("his/dev") public class HistTestController { HisUserChannelPointService hisUserChannelPointService; diff --git a/src/main/java/com/qs/serve/modules/his/service/impl/HisUserChannelPointServiceImpl.java b/src/main/java/com/qs/serve/modules/his/service/impl/HisUserChannelPointServiceImpl.java index 01f80e39..81b23bf7 100644 --- a/src/main/java/com/qs/serve/modules/his/service/impl/HisUserChannelPointServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/his/service/impl/HisUserChannelPointServiceImpl.java @@ -63,6 +63,7 @@ public class HisUserChannelPointServiceImpl extends ServiceImpl masterUserLqw2 = new LambdaQueryWrapper<>(); + masterUserLqw2.eq(BmsMasterUser::getType, MasterUserType.Channel); + List masterUsersByChannel = masterUserMapper.selectList(masterUserLqw2); + for (BmsMasterUser masterUser : masterUsersByChannel) { + this.flushByChannelId(Long.parseLong(masterUser.getTargetId())); + } + //4.区域管理人 this.initSetupByPointId(0L); } 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 99ea5f7b..3dc16107 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 @@ -55,7 +55,7 @@ public class HisUserSupplierServiceImpl extends ServiceImpl(); } HisUserSupplier userSupplier = param.toHisUserSupplier(null,null);