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

1

localizer
lzq 2025-09-22 01:01:51 +08:00
parent 54acb0aa15
commit 14a9bcf909
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -351,13 +351,22 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
String bizObjStr = userDetail.getBizObj();
if (BizObj.isSiBang(bizObjStr)) {
CheckStatus checkStatus = orderPagingSearchParam.getCheckStatus();
String orderStatus = orderPagingSearchParam.getOrderStatus();
Assert.isTrue(checkStatus != null || orderStatus != null, () -> Exceptions.clierr("未指定订单状态或勘料状态"));
ew
.eq("a.station_id", orderPagingSearchParam.getStationId())
.eq(checkStatus != null, "a.check_status", checkStatus)
.ne(orderStatus != null, "a.order_status", orderStatus)
;
if (checkStatus == CheckStatus.YiKanLiao) {
ew
.eq("a.check_status", checkStatus)
.in("a.order_status", OrderStatus.YiJinChang, OrderStatus.YiChuChang, OrderStatus.YiWanCheng)
;
} else if (checkStatus == CheckStatus.WeiKanLiao) {
ew
.eq("a.check_status", checkStatus)
.in("a.order_status", OrderStatus.YiJinChang)
;
} else {
ew
.in("a.order_status", OrderStatus.QingYunZhong);
}
return;
}
}