- return remark in GetStoreOpRequests
This commit is contained in:
@@ -1004,7 +1004,7 @@ func GetStoreOpRequests(ctx *jxcontext.Context, fromTime, toTime time.Time, keyw
|
|||||||
sql := `
|
sql := `
|
||||||
SELECT SQL_CALC_FOUND_ROWS
|
SELECT SQL_CALC_FOUND_ROWS
|
||||||
t1.id, t1.created_at, t1.updated_at, t1.last_operator, t1.deleted_at,
|
t1.id, t1.created_at, t1.updated_at, t1.last_operator, t1.deleted_at,
|
||||||
t1.type, t1.store_id, t1.item_id, t1.status, t1.user_id, t1.int_param1, t1.int_param2,
|
t1.type, t1.store_id, t1.item_id, t1.status, t1.user_id, t1.int_param1, t1.int_param2, t1.remark
|
||||||
t2.name store_name, t3.prefix sku_name_prefix, t3.name sku_name_name, MAX(t5.unit_price) unit_price
|
t2.name store_name, t3.prefix sku_name_prefix, t3.name sku_name_name, MAX(t5.unit_price) unit_price
|
||||||
FROM store_op_request t1
|
FROM store_op_request t1
|
||||||
JOIN store t2 ON t1.store_id = t2.id
|
JOIN store t2 ON t1.store_id = t2.id
|
||||||
@@ -1051,7 +1051,7 @@ func GetStoreOpRequests(ctx *jxcontext.Context, fromTime, toTime time.Time, keyw
|
|||||||
}
|
}
|
||||||
|
|
||||||
sql += `
|
sql += `
|
||||||
GROUP BY 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
|
GROUP BY 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16
|
||||||
LIMIT ? OFFSET ?`
|
LIMIT ? OFFSET ?`
|
||||||
pageSize = jxutils.FormalizePageSize(pageSize)
|
pageSize = jxutils.FormalizePageSize(pageSize)
|
||||||
sqlOffset := offset
|
sqlOffset := offset
|
||||||
|
|||||||
Reference in New Issue
Block a user