feat(packing,waybill): 列表时间筛选统一为 between 区间写法,兼容旧拆分字段

This commit is contained in:
liufumingren 2026-08-16 17:42:08 +08:00
parent 2e417f1c27
commit d5c5c641d2
5 changed files with 127 additions and 12 deletions

View File

@ -26,7 +26,8 @@ class OrderPackingMethodService extends MainService {
* @param {Object} [data.where] 筛选条件。
* 支持字段:status(任务状态)、pack_mode(打包模式)、waybill_code(运单号)、wave_no(波次号)、
* order_id(订单ID)、workbench_id(工作台ID)、quickWhere(快捷搜索:波次号直接匹配 + 运单号通过express→order→wave链路解析)、
* start_time_start / start_time_end(开始打包时间范围)。
* start_time(开始打包时间范围,{operator:'between', value:[start,end]})、end_time(结束打包时间范围)、create_time(创建时间范围);
* start_time_start / start_time_end 为开始时间范围的兼容旧写法。
* @param {Object} [data.sort] 排序参数 { sortField, sortOrder }
* @return {Promise<Object>} 统一成功包装响应
*/

View File

@ -53,8 +53,11 @@ class OrderPackingService extends Service {
* @param {Object} [where.order_id] 订单ID(精确匹配)
* @param {Object} [where.workbench_id] 工作台ID(精确匹配)
* @param {Object} [where.quickWhere] 快捷搜索:支持波次号模糊匹配;运单号通过 express→order→wave 链路解析(团购按波次号查、散单按订单ID查)
* @param {Object} [where.start_time_start] 开始打包时间起始
* @param {Object} [where.start_time_end] 开始打包时间结束
* @param {Object} [where.start_time] 开始打包时间范围,支持 {operator:'between', value:[start,end]}
* @param {Object} [where.start_time_start] 开始打包时间起始(兼容旧写法)
* @param {Object} [where.start_time_end] 开始打包时间结束(兼容旧写法)
* @param {Object} [where.end_time] 结束打包时间范围,支持 {operator:'between', value:[start,end]}
* @param {Object} [where.create_time] 创建时间范围,支持 {operator:'between', value:[start,end]}
* @param {Object} pagination 分页参数 { page, pageSize }
* @param {Object} sort 排序参数 { sortField, sortOrder }
* @return {Promise<Object>} 打包任务列表与分页信息
@ -300,7 +303,27 @@ class OrderPackingService extends Service {
}
}
// 开始打包时间范围
// 时间范围筛选:start_time / end_time / create_time
// 支持 {operator:'between', value:[start,end]} 或直接传 [start,end]
const applyTimeRangeFilter = (field, cond) => {
if (!cond) return;
const operator = String(cond?.operator || '').toLowerCase();
let range = cond?.value ?? cond;
if (!Array.isArray(range) && operator === 'between' && range && typeof range === 'object') {
range = [ range.start ?? range.from ?? range.begin, range.end ?? range.to ?? range.finish ];
}
if (!Array.isArray(range)) return;
const [ startVal, endVal ] = range;
if (startVal !== undefined && startVal !== null && String(startVal).trim() !== '') {
queryWhere[field] = { ...(queryWhere[field] || {}), [Op.gte]: new Date(startVal) };
}
if (endVal !== undefined && endVal !== null && String(endVal).trim() !== '') {
queryWhere[field] = { ...(queryWhere[field] || {}), [Op.lte]: new Date(endVal) };
}
};
// 开始打包时间范围(统一 between 写法 + 兼容旧拆分写法)
applyTimeRangeFilter('start_time', where.start_time);
if (where.start_time_start) {
const startTimeStart = where.start_time_start?.value ?? where.start_time_start;
if (startTimeStart) {
@ -314,6 +337,12 @@ class OrderPackingService extends Service {
}
}
// 结束打包时间范围
applyTimeRangeFilter('end_time', where.end_time);
// 创建时间范围
applyTimeRangeFilter('create_time', where.create_time);
// 排序
const sortField = sort.sortField || 'create_time';
const sortOrder = String(sort.sortOrder || 'DESC').toUpperCase() === 'ASC' ? 'ASC' : 'DESC';

View File

@ -154,7 +154,7 @@ class WaybillService extends MainService {
* 主单号通过 SELF JOIN 同 order_id 下 business_key=1 的记录获取。
*
* @param {Object} [options={}] 查询参数。
* @param {Object} [options.where] 筛选条件,支持 waybillCode / mainWaybillCode / orderId / orderNo / logisticsCode / logisticsInterfaceId / platformCode / status / isBack / isIntercept / isGalaxyReceive / packageMaterialId / hasWeighingWeight / keyword / createdAtStart / createdAtEnd。
* @param {Object} [options.where] 筛选条件,支持 waybillCode / mainWaybillCode / orderId / orderNo / logisticsCode / logisticsInterfaceId / platformCode / status / isBack / isIntercept / isGalaxyReceive / packageMaterialId / hasWeighingWeight / keyword / createdAt({operator:'between', value:[start,end]},兼容 createAt 别名)/ createdAtStart / createdAtEnd(旧写法兼容)。
* @param {Object} [options.pagination] 分页参数 { page, pageSize },默认 page=1, pageSize=20。
* @param {Object} [options.sort] 排序参数 { field, order },默认 create_at desc。
* @return {Promise<Object>} 运单列表与分页信息 { list, pagination }。
@ -322,7 +322,18 @@ class WaybillService extends MainService {
queryWhere.waybill_code = { [Op.like]: `%${String(keyword).trim()}%` };
}
// 创建时间范围
// 创建时间范围:createdAt 支持 {operator:'between', value:[start,end]}(兼容 createAt 别名)
const createdAtRange = val(where.createdAt) ?? val(where.createAt);
if (Array.isArray(createdAtRange)) {
const [ unifiedCreateAtStart, unifiedCreateAtEnd ] = createdAtRange;
if (unifiedCreateAtStart && String(unifiedCreateAtStart).trim()) {
queryWhere.create_at = { ...(queryWhere.create_at || {}), [Op.gte]: new Date(unifiedCreateAtStart) };
}
if (unifiedCreateAtEnd && String(unifiedCreateAtEnd).trim()) {
queryWhere.create_at = { ...(queryWhere.create_at || {}), [Op.lte]: new Date(unifiedCreateAtEnd) };
}
}
// 兼容旧写法:createdAtStart / createdAtEnd
const createdAtStart = val(where.createdAtStart);
if (createdAtStart && String(createdAtStart).trim()) {
const startDate = this.normalizeDate(String(createdAtStart).trim(), false);
@ -813,6 +824,18 @@ class WaybillService extends MainService {
if (keywordExport && String(keywordExport).trim()) {
queryWhere.waybill_code = { [Op.like]: `%${String(keywordExport).trim()}%` };
}
// 创建时间范围:createdAt 支持 {operator:'between', value:[start,end]}(兼容 createAt 别名)
const createdAtRangeExport = val(where.createdAt) ?? val(where.createAt);
if (Array.isArray(createdAtRangeExport)) {
const [ unifiedCreateAtStartExport, unifiedCreateAtEndExport ] = createdAtRangeExport;
if (unifiedCreateAtStartExport && String(unifiedCreateAtStartExport).trim()) {
queryWhere.create_at = { ...(queryWhere.create_at || {}), [Op.gte]: new Date(unifiedCreateAtStartExport) };
}
if (unifiedCreateAtEndExport && String(unifiedCreateAtEndExport).trim()) {
queryWhere.create_at = { ...(queryWhere.create_at || {}), [Op.lte]: new Date(unifiedCreateAtEndExport) };
}
}
// 兼容旧写法:createdAtStart / createdAtEnd
const createdAtStartExport = val(where.createdAtStart);
if (createdAtStartExport && String(createdAtStartExport).trim()) {
const startDate = this.normalizeDate(String(createdAtStartExport).trim(), false);

View File

@ -1,4 +1,34 @@
[
{
"version": "2026.08.16-waybill-createAt-between",
"date": "2026-08-16",
"type": "enhanced",
"summary": "waybill.warehouse.list / export 创建时间筛选统一为 between 区间写法:where.createdAt 支持 {operator:\"between\", value:[起始,结束]},保留 createdAtStart/createdAtEnd 旧写法兼容",
"methods": [
"waybill.warehouse.list",
"waybill.warehouse.export"
],
"notes": [
"app/service/systems/waybill.js list/export:createdAt 数组区间两端可单独为空,分别落 create_at gte/lte;同时兼容 createAt 别名与 createdAtStart/createdAtEnd 旧写法",
"同步更新 methods/system.json 中 waybill.warehouse.list / export 的 where.createdAt 参数文档"
],
"module": "waybill.warehouse"
},
{
"version": "2026.08.16-order-packing-list-time-filter",
"date": "2026-08-16",
"type": "enhanced",
"summary": "order.packing.list 时间筛选统一为 between 区间写法:start_time / end_time / create_time 支持 {operator:\"between\", value:[起始,结束]},与已有 start_time_start/start_time_end 旧写法兼容",
"methods": [
"order.packing.list"
],
"notes": [
"app/service/systems/order_packing.js list:新增 applyTimeRangeFilter,统一处理 start_time/end_time/create_time 的 between 区间条件(数组两端可单独为空,按 gte/lte 拼接),与 warehouse_id 隔离及其他筛选叠加",
"保留 start_time_start/start_time_end 旧拆分写法的兼容处理",
"同步更新 methods/system.json 中 order.packing.list 的 where 参数文档"
],
"module": "order.packing"
},
{
"version": "2026.08.16-waybill-export-ids",
"date": "2026-08-16",

View File

@ -6833,17 +6833,35 @@
"required": false,
"description": "快捷搜索:波次号模糊匹配 + 运单号通过 express→order→wave 链路解析"
},
{
"name": "start_time",
"type": "object",
"required": false,
"description": "开始打包时间范围:{operator:\"between\", value:[起始时间, 结束时间]},value 为 ISO 8601 或 \"YYYY-MM-DD HH:mm:ss\" 字符串数组"
},
{
"name": "start_time_start",
"type": "string",
"required": false,
"description": "开始打包时间范围起始(ISO 8601)"
"description": "开始打包时间范围起始(ISO 8601,兼容旧写法)"
},
{
"name": "start_time_end",
"type": "string",
"required": false,
"description": "开始打包时间范围结束(ISO 8601)"
"description": "开始打包时间范围结束(ISO 8601,兼容旧写法)"
},
{
"name": "end_time",
"type": "object",
"required": false,
"description": "结束打包时间范围:{operator:\"between\", value:[起始时间, 结束时间]},value 为 ISO 8601 或 \"YYYY-MM-DD HH:mm:ss\" 字符串数组"
},
{
"name": "create_time",
"type": "object",
"required": false,
"description": "创建时间范围:{operator:\"between\", value:[起始时间, 结束时间]},value 为 ISO 8601 或 \"YYYY-MM-DD HH:mm:ss\" 字符串数组"
},
{
"name": "has_video",
@ -30911,19 +30929,26 @@
"source": "body.where",
"description": "关键词搜索:同时匹配运单号(waybill_code)、主单号、订单号"
},
{
"name": "where.createdAt",
"type": "object",
"required": false,
"source": "body.where",
"description": "创建时间范围:{operator:\"between\", value:[起始时间, 结束时间]},value 为 ISO 8601 或 \"YYYY-MM-DD HH:mm:ss\" 字符串数组"
},
{
"name": "where.createdAtStart",
"type": "string",
"required": false,
"source": "body.where",
"description": "创建时间起始,格式 YYYY-MM-DD"
"description": "创建时间起始,格式 YYYY-MM-DD(兼容旧写法)"
},
{
"name": "where.createdAtEnd",
"type": "string",
"required": false,
"source": "body.where",
"description": "创建时间截止,格式 YYYY-MM-DD"
"description": "创建时间截止,格式 YYYY-MM-DD(兼容旧写法)"
},
{
"name": "sort",
@ -31732,19 +31757,26 @@
"source": "body.where",
"description": "关键词搜索"
},
{
"name": "where.createdAt",
"type": "object",
"required": false,
"source": "body.where",
"description": "创建时间范围:{operator:\"between\", value:[起始时间, 结束时间]},value 为 ISO 8601 或 \"YYYY-MM-DD HH:mm:ss\" 字符串数组"
},
{
"name": "where.createdAtStart",
"type": "string",
"required": false,
"source": "body.where",
"description": "创建时间起始,格式 YYYY-MM-DD"
"description": "创建时间起始,格式 YYYY-MM-DD(兼容旧写法)"
},
{
"name": "where.createdAtEnd",
"type": "string",
"required": false,
"source": "body.where",
"description": "创建时间截止,格式 YYYY-MM-DD"
"description": "创建时间截止,格式 YYYY-MM-DD(兼容旧写法)"
},
{
"name": "sort",