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 482c429..4493e3b 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,7 +10,6 @@ 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; @@ -40,8 +39,6 @@ public class MoneyBillService extends ServiceImpl paging(PageParam pageParam, MoneyBillEntity moneyBillEntity) { Page page = new Page<>(pageParam.getCurrent(), pageParam.getSize()); - List stationIds = orderInfoService.getStationIds(); - if (!stationIds.isEmpty()) { - moneyBillEntity.setStationId(null); - } - IPage result = baseMapper.selectMoneyBillWithNames(page, moneyBillEntity, stationIds); + // List stationIds = orderInfoService.getStationIds(); + // if (!stationIds.isEmpty()) { + // moneyBillEntity.setStationId(null); + // } + IPage result = baseMapper.selectMoneyBillWithNames(page, moneyBillEntity, null); return PageResult.of(result); } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderPagingResult.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderPagingResult.java index dca1e87..a1e732f 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderPagingResult.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderPagingResult.java @@ -549,4 +549,9 @@ public class OrderPagingResult { * 派车方式:项目-->project 平台-->platform 自选-->optional */ private CarWay carWay; + + /** + * 区审批人角色名称 + */ + private String roleName; } 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 c6184a8..98f6fa4 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 @@ -240,10 +240,10 @@ public class OrderInfoService extends ServiceImpl page = pageParam.toPage(); Long stationId = orderPagingSearchParam.getStationId(); - List stationIds = this.getStationIds(); - if (!stationIds.isEmpty()) { - stationId = null; - } + // List stationIds = this.getStationIds(); + // if (!stationIds.isEmpty()) { + // stationId = null; + // } String area = orderPagingSearchParam.getArea(); OrderCategory orderCategory = orderPagingSearchParam.getOrderCategory(); String transCompanyName = orderPagingSearchParam.getTransCompanyName(); @@ -254,7 +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) + // .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) @@ -1897,7 +1897,17 @@ public class OrderInfoService extends ServiceImpl