修复条件查询报错

This commit is contained in:
zhaoqing
2026-05-15 15:20:04 +08:00
parent 206c85aaf7
commit 151aa4f8b4
4 changed files with 11 additions and 13 deletions
@@ -672,8 +672,8 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
@ApiModelProperty("$column.columnComment")
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
// @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date documentDate;
@@ -98,10 +98,8 @@ public class OriginalImportExportDocumentApi extends BaseController {
PageHelper.startPage(pageNo, pageSize);
List<BusinessDocumentOrderPO> orderList = businessDocumentOrderApplicationService.queryListAndMaterial(businessDocumentOrderDO);
// ✅ 批量查询货物列表并设置到订单
fillCargoInfo(orderList);
// ✅ 获取分页信息
Page<BusinessDocumentOrderPO> page = (Page<BusinessDocumentOrderPO>) orderList;
List<OrderWithMaterialDTO> resultList = convertToOrderWithMaterialList(orderList);