|
@@ -1,4 +1,4 @@
|
|
|
-from sqlalchemy import and_, or_, desc
|
|
|
+from sqlalchemy import and_, or_, desc, func, Integer
|
|
|
from datetime import datetime
|
|
|
from typing import Optional
|
|
|
|
|
@@ -115,8 +115,10 @@ class ProjectQuotaStore:
|
|
|
|
|
|
# 分页
|
|
|
query = (
|
|
|
- query.order_by(ProjectQuotaModel.item_code.asc())
|
|
|
- .order_by(ProjectQuotaModel.sort.asc())
|
|
|
+ query.order_by(
|
|
|
+ func.cast(func.substr(ProjectQuotaModel.ex_cell, 2), Integer).asc(),
|
|
|
+ ProjectQuotaModel.sort.asc(),
|
|
|
+ )
|
|
|
.offset((page - 1) * page_size)
|
|
|
.limit(page_size)
|
|
|
)
|