lzq
/
njzscloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

dev
ljw 2026-05-14 10:57:31 +08:00
parent 719134447d
commit 522233db35
3 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/service/MoneyBillService.java
View File

@ -10,7 +10,6 @@ import com.njzscloud.supervisory.biz.pojo.result.SearchCompanyResult;
import com.njzscloud.supervisory.money.mapper.MoneyBillMapper; import com.njzscloud.supervisory.money.mapper.MoneyBillMapper;
import com.njzscloud.supervisory.money.pojo.entity.MoneyBillEntity; import com.njzscloud.supervisory.money.pojo.entity.MoneyBillEntity;
import com.njzscloud.supervisory.money.pojo.result.MoneyBillResult; 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.order.utils.FileUtil;
import com.njzscloud.supervisory.sys.auth.mapper.AuthMapper; import com.njzscloud.supervisory.sys.auth.mapper.AuthMapper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@ -40,8 +39,6 @@ public class MoneyBillService extends ServiceImpl<MoneyBillMapper, MoneyBillEnti
private final AuthMapper authMapper; private final AuthMapper authMapper;
private final OrderInfoService orderInfoService;
/** /**
* 新增 * 新增
*/ */
@ -76,11 +73,11 @@ public class MoneyBillService extends ServiceImpl<MoneyBillMapper, MoneyBillEnti
*/ */
public PageResult<MoneyBillEntity> paging(PageParam pageParam, MoneyBillEntity moneyBillEntity) { public PageResult<MoneyBillEntity> paging(PageParam pageParam, MoneyBillEntity moneyBillEntity) {
Page<MoneyBillEntity> page = new Page<>(pageParam.getCurrent(), pageParam.getSize()); Page<MoneyBillEntity> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
List<Long> stationIds = orderInfoService.getStationIds(); // List<Long> stationIds = orderInfoService.getStationIds();
if (!stationIds.isEmpty()) { // if (!stationIds.isEmpty()) {
moneyBillEntity.setStationId(null); // moneyBillEntity.setStationId(null);
} // }
IPage<MoneyBillEntity> result = baseMapper.selectMoneyBillWithNames(page, moneyBillEntity, stationIds); IPage<MoneyBillEntity> result = baseMapper.selectMoneyBillWithNames(page, moneyBillEntity, null);
return PageResult.of(result); return PageResult.of(result);
} }

5
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderPagingResult.java
View File

@ -549,4 +549,9 @@ public class OrderPagingResult {
* 派车方式：项目-->project 平台-->platform 自选-->optional * 派车方式：项目-->project 平台-->platform 自选-->optional
*/ */
private CarWay carWay; private CarWay carWay;
/**
* 区审批人角色名称
*/
private String roleName;
} }

22
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java
View File

@ -240,10 +240,10 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
Long goodsId = orderPagingSearchParam.getGoodsId(); Long goodsId = orderPagingSearchParam.getGoodsId();
Page<OrderPagingResult> page = pageParam.toPage(); Page<OrderPagingResult> page = pageParam.toPage();
Long stationId = orderPagingSearchParam.getStationId(); Long stationId = orderPagingSearchParam.getStationId();
List<Long> stationIds = this.getStationIds(); // List<Long> stationIds = this.getStationIds();
if (!stationIds.isEmpty()) { // if (!stationIds.isEmpty()) {
stationId = null; // stationId = null;
} // }
String area = orderPagingSearchParam.getArea(); String area = orderPagingSearchParam.getArea();
OrderCategory orderCategory = orderPagingSearchParam.getOrderCategory(); OrderCategory orderCategory = orderPagingSearchParam.getOrderCategory();
String transCompanyName = orderPagingSearchParam.getTransCompanyName(); String transCompanyName = orderPagingSearchParam.getTransCompanyName();
@ -254,7 +254,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
LocalDateTime endOutTime = orderPagingSearchParam.getEndOutTime(); LocalDateTime endOutTime = orderPagingSearchParam.getEndOutTime();
QueryWrapper<OrderPagingResult> ew = Wrappers.<OrderPagingResult>query() QueryWrapper<OrderPagingResult> ew = Wrappers.<OrderPagingResult>query()
.eq(stationId != null && stationId > 0, "a.station_id", stationId) .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(sn), "a.sn", sn)
.like(StrUtil.isNotBlank(licensePlate), "e.license_plate", licensePlate) .like(StrUtil.isNotBlank(licensePlate), "e.license_plate", licensePlate)
.like(StrUtil.isNotBlank(nickname), "a.contacts", nickname) .like(StrUtil.isNotBlank(nickname), "a.contacts", nickname)
@ -1897,7 +1897,17 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
} }
public OrderPagingResult obtainWeighBill(Long orderId) { public OrderPagingResult obtainWeighBill(Long orderId) {
return baseMapper.obtainWeighBill(orderId); OrderPagingResult result = baseMapper.obtainWeighBill(orderId);
BizAuditConfigEntity bizAuditConfigEntity = bizAuditConfigService.getOne(Wrappers.lambdaQuery(BizAuditConfigEntity.class)
.eq(BizAuditConfigEntity::getArea, result.getArea()));
if (null != bizAuditConfigEntity && !Strings.isNullOrEmpty(bizAuditConfigEntity.getAreaRole())) {
RoleEntity roleEntity = roleService.getOne(Wrappers.lambdaQuery(RoleEntity.class).eq(
RoleEntity::getRoleCode, bizAuditConfigEntity.getAreaRole()));
if (null != roleEntity && null != roleEntity.getId()) {
result.setRoleName(roleEntity.getRoleName());
}
}
return result;
} }
public TrainBillResult trainBill(Long orderId) { public TrainBillResult trainBill(Long orderId) {