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

Merge branch 'dev' of https://git.njzscloud.com/lzq/njzscloud into dev

master
ljw 2025-11-24 10:41:06 +08:00
parent 6f30570604 0c2bb58cca
commit 572ba946fd
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/param/OrderPagingSearchParam.java
View File

@ -2,6 +2,7 @@ package com.njzscloud.supervisory.order.pojo.param;
import com.njzscloud.supervisory.biz.constant.AuditStatus; import com.njzscloud.supervisory.biz.constant.AuditStatus;
import com.njzscloud.supervisory.order.contant.CheckStatus; import com.njzscloud.supervisory.order.contant.CheckStatus;
import com.njzscloud.supervisory.order.contant.OrderCategory;
import com.njzscloud.supervisory.order.contant.OrderViewType; import com.njzscloud.supervisory.order.contant.OrderViewType;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
@ -20,6 +21,10 @@ public class OrderPagingSearchParam {
*/ */
private AuditStatus auditStatus; private AuditStatus auditStatus;
/**
* 订单类型; 字典代码：order_category
*/
private OrderCategory orderCategory;
/** /**
* 订单状态; 字典代码：order_status * 订单状态; 字典代码：order_status
*/ */

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

@ -224,6 +224,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
Page<OrderPagingResult> page = pageParam.toPage(); Page<OrderPagingResult> page = pageParam.toPage();
Long stationId = orderPagingSearchParam.getStationId(); Long stationId = orderPagingSearchParam.getStationId();
String area = orderPagingSearchParam.getArea(); String area = orderPagingSearchParam.getArea();
OrderCategory orderCategory = orderPagingSearchParam.getOrderCategory();
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)
.like(StrUtil.isNotBlank(sn), "a.sn", sn) .like(StrUtil.isNotBlank(sn), "a.sn", sn)
@ -232,6 +233,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
.like(StrUtil.isNotBlank(phone), "a.phone", phone) .like(StrUtil.isNotBlank(phone), "a.phone", phone)
.ge(startTime != null, "a.create_time", startTime) .ge(startTime != null, "a.create_time", startTime)
.le(endTime != null, "a.create_time", endTime) .le(endTime != null, "a.create_time", endTime)
.le(orderCategory != null, "a.order_category", orderCategory)
.eq(null != transCompanyId, "a.trans_company_id", transCompanyId) .eq(null != transCompanyId, "a.trans_company_id", transCompanyId)
.eq("a.deleted", 0) .eq("a.deleted", 0)
.eq(StrUtil.isNotBlank(area), "b.area", area) .eq(StrUtil.isNotBlank(area), "b.area", area)