统计报表接口,数据梳理接口

This commit is contained in:
shuo.wang
2025-05-15 18:04:43 +08:00
parent bd3fa05bf2
commit 94e187df1c

View File

@@ -377,24 +377,23 @@ public class DecorationServiceImpl implements DecorationService {
@Override @Override
public PageInfo<fitmentCheckVO> getFitmentAcceptanceList(AcceptanceListRequest request, LoginUserInfo user) { public PageInfo<fitmentCheckVO> getFitmentAcceptanceList(AcceptanceListRequest request, LoginUserInfo user) {
// List<Long> regions = new ArrayList<>(); List<Long> regions = new ArrayList<>();
// if (!sysRoleService.checkIsAdmin(user.getUserId())) { if (!sysRoleService.checkIsAdmin(user.getUserId())) {
// List<String> authRegionIds = userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(user.getUserId()); List<String> authRegionIds = userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(user.getUserId());
// for (String authRegionId : authRegionIds) { for (String authRegionId : authRegionIds) {
// regions.add(Long.parseLong(authRegionId)); regions.add(Long.parseLong(authRegionId));
// } }
// if (regions.isEmpty()) { if (regions.isEmpty()) {
// log.info("该用户下权限没有管理区域"); log.info("该用户下权限没有管理区域");
// return new PageInfo<>(); return new PageInfo<>();
// } }
// } }
//判断是否是管理员 // //判断是否是管理员
Boolean isAdmin = sysRoleService.checkIsAdmin(user.getUserId()); // Boolean isAdmin = sysRoleService.checkIsAdmin(user.getUserId());
PageHelper.startPage(request.getPageNum(), request.getPageSize()); PageHelper.startPage(request.getPageNum(), request.getPageSize());
List<fitmentCheckVO> fitmentCheckVOList = new ArrayList<>(); List<fitmentCheckVO> fitmentCheckVOList = new ArrayList<>();
//shopId,lineid,regionid,shopname,storenum, //shopId,lineid,regionid,shopname,storenum,
//督导查询是自己的 List<ShopInfoDO> shopInfoDOS = shopInfoMapper.selectShopListByRegionId(regions, ShopSubStageEnum.SHOP_STAGE_12.getShopSubStage(), request.getSubStageStatus(), null);
List<ShopInfoDO> shopInfoDOS = shopInfoMapper.selectShopListByUser(isAdmin?null:user.getUserId(), ShopSubStageEnum.SHOP_STAGE_12.getShopSubStage(), request.getSubStageStatus(), null);
PageInfo pageInfo = new PageInfo<>(shopInfoDOS); PageInfo pageInfo = new PageInfo<>(shopInfoDOS);
if (shopInfoDOS.isEmpty()) { if (shopInfoDOS.isEmpty()) {
log.info("该工程部监理下门店为空"); log.info("该工程部监理下门店为空");