diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/mapper/MoneyBillMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/mapper/MoneyBillMapper.java index 094e03e..f8e4580 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/mapper/MoneyBillMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/mapper/MoneyBillMapper.java @@ -19,13 +19,13 @@ public interface MoneyBillMapper extends BaseMapper { /** * 分页查询对账单(关联用户、站点、产品信息) */ - IPage selectMoneyBillWithNames(Page page, @Param("entity") MoneyBillEntity entity); + IPage selectMoneyBillWithNames(Page page, @Param("entity") MoneyBillEntity entity, @Param("stationIds") List stationIds); /** * 查询对账单列表(关联用户、公司、订单信息) */ List selectMoneyBillList(@Param("entity") MoneyBillResult entity); - List selectMoneyBillWithNames(@Param("entity") MoneyBillEntity entity); + List selectMoneyBillWithNames(@Param("entity") MoneyBillEntity entity, @Param("stationIds") List stationIds); } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/service/MoneyBillService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/service/MoneyBillService.java index 8964565..482c429 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/service/MoneyBillService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/service/MoneyBillService.java @@ -10,6 +10,7 @@ import com.njzscloud.supervisory.biz.pojo.result.SearchCompanyResult; import com.njzscloud.supervisory.money.mapper.MoneyBillMapper; import com.njzscloud.supervisory.money.pojo.entity.MoneyBillEntity; import com.njzscloud.supervisory.money.pojo.result.MoneyBillResult; +import com.njzscloud.supervisory.order.service.OrderInfoService; import com.njzscloud.supervisory.order.utils.FileUtil; import com.njzscloud.supervisory.sys.auth.mapper.AuthMapper; import lombok.RequiredArgsConstructor; @@ -39,6 +40,8 @@ public class MoneyBillService extends ServiceImpl paging(PageParam pageParam, MoneyBillEntity moneyBillEntity) { Page page = new Page<>(pageParam.getCurrent(), pageParam.getSize()); - IPage result = baseMapper.selectMoneyBillWithNames(page, moneyBillEntity); + List stationIds = orderInfoService.getStationIds(); + if (!stationIds.isEmpty()) { + moneyBillEntity.setStationId(null); + } + IPage result = baseMapper.selectMoneyBillWithNames(page, moneyBillEntity, stationIds); return PageResult.of(result); } @@ -87,7 +94,7 @@ public class MoneyBillService extends ServiceImpl result = new Page<>(); if (null != company) { moneyBillEntity.setStationId(company.getId()); - result = baseMapper.selectMoneyBillWithNames(page, moneyBillEntity); + result = baseMapper.selectMoneyBillWithNames(page, moneyBillEntity, null); } return PageResult.of(result); } @@ -143,7 +150,7 @@ public class MoneyBillService extends ServiceImpl list = baseMapper.selectMoneyBillWithNames(entity); + List list = baseMapper.selectMoneyBillWithNames(entity, null); List> downList = new ArrayList<>(); int i = 1; for (MoneyBillEntity result : list) { diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java index 7192d95..c6184a8 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java @@ -120,7 +120,6 @@ public class OrderInfoService extends ServiceImpl page = pageParam.toPage(); Long stationId = orderPagingSearchParam.getStationId(); + List stationIds = this.getStationIds(); + if (!stationIds.isEmpty()) { + stationId = null; + } String area = orderPagingSearchParam.getArea(); OrderCategory orderCategory = orderPagingSearchParam.getOrderCategory(); String transCompanyName = orderPagingSearchParam.getTransCompanyName(); @@ -251,6 +254,7 @@ public class OrderInfoService extends ServiceImpl ew = Wrappers.query() .eq(stationId != null && stationId > 0, "a.station_id", stationId) + .in(!stationIds.isEmpty(), "a.station_id", stationIds) .like(StrUtil.isNotBlank(sn), "a.sn", sn) .like(StrUtil.isNotBlank(licensePlate), "e.license_plate", licensePlate) .like(StrUtil.isNotBlank(nickname), "a.contacts", nickname) @@ -2531,4 +2535,16 @@ public class OrderInfoService extends ServiceImpl getStationIds() { + MyResult userDetail = SecurityUtil.loginUser(); + List stationManageEntityList = stationManageService.list(Wrappers.lambdaQuery(StationManageEntity.class) + .eq(StationManageEntity::getUserId, userDetail.getUserId())); + if (CollUtil.isEmpty(stationManageEntityList)) { + throw Exceptions.clierr("当前用户不是站点管理员"); + } + return stationManageEntityList.stream() + .map(StationManageEntity::getStationId) + .collect(Collectors.toList()); + } } diff --git a/njzscloud-svr/src/main/resources/mapper/money/MoneyBillMapper.xml b/njzscloud-svr/src/main/resources/mapper/money/MoneyBillMapper.xml index 5e8310e..dbc6a8c 100644 --- a/njzscloud-svr/src/main/resources/mapper/money/MoneyBillMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/money/MoneyBillMapper.xml @@ -33,6 +33,12 @@ LEFT JOIN sys_user u ON mb.user_id = u.id LEFT JOIN biz_company bc ON mb.station_id = bc.id + + AND mb.station_id IN + + #{id} + + AND mb.user_id = #{entity.userId}