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

导出

dev
lzq 2026-01-21 18:55:47 +08:00
parent 4d13c6b822
commit 5965d35fd3
2 changed files with 40 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1781,23 +1781,42 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
String driverName = searchParam.getDriverName(); String driverName = searchParam.getDriverName();
OrderCategory orderCategory = searchParam.getOrderCategory(); OrderCategory orderCategory = searchParam.getOrderCategory();
String area = searchParam.getArea(); String area = searchParam.getArea();
QueryWrapper<OrderPagingResult> ew = Wrappers.query(); Long goodsId = searchParam.getGoodsId();
ew.eq(null != searchParam.getStationId() && searchParam.getStationId() > 0, "a.station_id", searchParam.getStationId()); String sn = searchParam.getSn();
ew.like(StrUtil.isNotBlank(searchParam.getSn()), "a.sn", searchParam.getSn()); // 客户名称
ew.like(StrUtil.isNotBlank(searchParam.getLicensePlate()), "d.license_plate", searchParam.getLicensePlate()); String nickname = searchParam.getNickname();
ew.like(StrUtil.isNotBlank(searchParam.getPhone()), "a.phone", searchParam.getPhone()); // 产废单位
ew.like(StrUtil.isNotBlank(searchParam.getNickname()), "a.contacts", searchParam.getNickname()); String companyName = searchParam.getCompanyName();
ew.like(StrUtil.isNotBlank(transCompanyName), "g.company_name", transCompanyName); String licensePlate = searchParam.getLicensePlate();
ew.like(StrUtil.isNotBlank(driverName), "f.driver_name", driverName); LocalDateTime startOutTime = searchParam.getStartOutTime();
ew.ge(startTime != null, "a.create_time", startTime); LocalDateTime endOutTime = searchParam.getEndOutTime();
ew.le(endTime != null, "a.create_time", endTime); QueryWrapper<OrderPagingResult> ew = Wrappers.<OrderPagingResult>query()
ew.eq(orderCategory != null, "a.order_category", orderCategory); .eq(null != searchParam.getStationId() && searchParam.getStationId() > 0, "a.station_id", searchParam.getStationId())
ew.eq(null != searchParam.getTransCompanyId(), "a.trans_company_id", searchParam.getTransCompanyId()); .like(StrUtil.isNotBlank(searchParam.getSn()), "a.sn", searchParam.getSn())
ew.eq("a.deleted", 0); .like(StrUtil.isNotBlank(searchParam.getLicensePlate()), "d.license_plate", searchParam.getLicensePlate())
ew.eq(StrUtil.isNotBlank(area), "h.area", area); .like(StrUtil.isNotBlank(searchParam.getPhone()), "a.phone", searchParam.getPhone())
.like(StrUtil.isNotBlank(searchParam.getNickname()), "a.contacts", searchParam.getNickname())
.like(StrUtil.isNotBlank(transCompanyName), "g.company_name", transCompanyName)
.like(StrUtil.isNotBlank(driverName), "f.driver_name", driverName)
.ge(startTime != null, "a.create_time", startTime)
.le(endTime != null, "a.create_time", endTime)
.eq(orderCategory != null, "a.order_category", orderCategory)
.eq(null != searchParam.getTransCompanyId(), "a.trans_company_id", searchParam.getTransCompanyId())
.eq("a.deleted", 0)
.eq(StrUtil.isNotBlank(area), "h.area", area)
.eq("og.origin_goods_id", goodsId)
.like(StrUtil.isNotBlank(sn), "a.sn", sn)
.like(StrUtil.isNotBlank(nickname), "a.contacts", nickname)
.like(StrUtil.isNotBlank(companyName), "j.company_name", companyName)
.like(StrUtil.isNotBlank(transCompanyName), "g.company_name", transCompanyName)
.like(StrUtil.isNotBlank(licensePlate), "d.license_plate", licensePlate)
.ge(startOutTime != null, "ocio.out_time", startOutTime)
.le(endOutTime != null, "ocio.out_time", endOutTime);
historyEW(searchParam, null, ew); historyEW(searchParam, null, ew);
List<OrderExportResult> list = baseMapper.exportList(ew); List<OrderExportResult> list = baseMapper.exportList(ew);
List<OrderExportDetailResult> detailResults = baseMapper.exportDetailList(ew); List<OrderExportDetailResult> detailResults = baseMapper.exportDetailList(Wrappers.<OrderPagingResult>query()
.in("oei.order_id", list.stream().map(OrderExportResult::getId).collect(Collectors.toList()))
);
List<Map<String, Object>> downList = new ArrayList<>(); List<Map<String, Object>> downList = new ArrayList<>();
List<DictItemEntity> dictItems = dictItemService.list(Wrappers.<DictItemEntity>lambdaQuery() List<DictItemEntity> dictItems = dictItemService.list(Wrappers.<DictItemEntity>lambdaQuery()
.eq(DictItemEntity::getDictKey, "expense_item_category") .eq(DictItemEntity::getDictKey, "expense_item_category")
@ -2357,7 +2376,8 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
.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)
.ge(startOutTime != null, "d.out_time", startOutTime) .ge(startOutTime != null, "d.out_time", startOutTime)
.le(endOutTime != null, "d.out_time", endOutTime); .le(endOutTime != null, "d.out_time", endOutTime)
.eq("a.order_status", OrderStatus.YiWanCheng);
return PageResult.of(baseMapper.paging(page, ew)); return PageResult.of(baseMapper.paging(page, ew));
} }
} }

10
njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml
View File

@ -265,18 +265,17 @@
f.driver_name, f.driver_name,
a.checker_memo, a.checker_memo,
og.goods_name og.goods_name
FROM FROM order_info a
order_info a
LEFT JOIN biz_company b ON b.id = a.station_id LEFT JOIN biz_company b ON b.id = a.station_id
LEFT JOIN biz_company g ON g.id = a.trans_company_id LEFT JOIN biz_company g ON g.id = a.trans_company_id
LEFT JOIN biz_truck d ON d.id = a.truck_id LEFT JOIN biz_truck d ON d.id = a.truck_id
LEFT JOIN sys_dict_item e ON d.truck_category = e.val LEFT JOIN sys_dict_item e ON d.truck_category = e.val AND e.dict_key = 'vehicle_type'
AND e.dict_key = 'vehicle_type'
LEFT JOIN order_car_in_out ocio ON ocio.id = a.car_in_out_id LEFT JOIN order_car_in_out ocio ON ocio.id = a.car_in_out_id
LEFT JOIN sys_user su ON a.user_id = su.id LEFT JOIN sys_user su ON a.user_id = su.id
LEFT JOIN order_cargo_place h ON h.id = a.cargo_place_id LEFT JOIN order_cargo_place h ON h.id = a.cargo_place_id
LEFT JOIN biz_driver f ON f.id = a.driver_id LEFT JOIN biz_driver f ON f.id = a.driver_id
LEFT JOIN order_goods og ON og.id = a.goods_id LEFT JOIN order_goods og ON og.id = a.goods_id
LEFT JOIN biz_company j ON j.user_id = a.user_id
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''"> <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment} ${ew.customSqlSegment}
</if> </if>
@ -290,8 +289,7 @@
oei.expense_item_category, oei.expense_item_category,
oei.expense_item_name, oei.expense_item_name,
oei.settle_money oei.settle_money
FROM FROM order_expense_items oei
order_expense_items oei
LEFT JOIN order_info a ON a.id = oei.order_id LEFT JOIN order_info a ON a.id = oei.order_id
LEFT JOIN biz_company g ON g.id = a.trans_company_id LEFT JOIN biz_company g ON g.id = a.trans_company_id
LEFT JOIN biz_truck d ON d.id = a.truck_id LEFT JOIN biz_truck d ON d.id = a.truck_id