feat(pl): add rechargeTypeNe filter for vehicle recharge lists

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
wuzilongandCursor committed 2026-11-12 18:50:41 +08:00
1 parent 9f65cd447f
commit 738f76c486
6 files changed
+52

No files matched your search

+10
View File
@@ -113,6 +113,7 @@ def _apply_list_kwargs(params: dict) -> dict:
license_plate=_param_get(params, "licensePlate", "license_plate"),
recharge_type=_param_get(params, "rechargeType", "recharge_type"),
recharge_type_in=_param_get(params, "rechargeTypeIn", "recharge_type_in"),
recharge_type_ne=_param_get(params, "rechargeTypeNe", "recharge_type_ne"),
status=_param_get(params, "status"),
status_in=_param_get(params, "statusIn", "status_in"),
apply_date_from=_param_get(params, "applyDateFrom", "apply_date_from"),
@@ -139,6 +140,7 @@ def _disburse_list_kwargs(params: dict) -> dict:
license_plate=_param_get(params, "licensePlate", "license_plate"),
recharge_type=_param_get(params, "rechargeType", "recharge_type"),
recharge_type_in=_param_get(params, "rechargeTypeIn", "recharge_type_in"),
recharge_type_ne=_param_get(params, "rechargeTypeNe", "recharge_type_ne"),
apply_status=_param_get(params, "applyStatus", "apply_status"),
apply_status_in=_param_get(params, "applyStatusIn", "apply_status_in"),
apply_date_from=_param_get(params, "applyDateFrom", "apply_date_from"),
@@ -170,6 +172,7 @@ def list_applies(
request: Request,
q: Optional[str] = Query(default=None),
recharge_type: Optional[str] = Query(default=None, alias="rechargeType"),
recharge_type_ne: Optional[str] = Query(default=None, alias="rechargeTypeNe"),
status: Optional[str] = Query(default=None),
apply_date_from: Optional[date] = Query(default=None, alias="applyDateFrom"),
apply_date_to: Optional[date] = Query(default=None, alias="applyDateTo"),
@@ -185,6 +188,7 @@ def list_applies(
request,
q=q,
rechargeType=recharge_type,
rechargeTypeNe=recharge_type_ne,
status=status,
applyDateFrom=apply_date_from,
applyDateTo=apply_date_to,
@@ -233,6 +237,7 @@ RECHARGE_APPLY_EXPORT_COLUMNS = [
class RechargeApplyExportBody(BaseModel):
q: Optional[str] = None
recharge_type: Optional[str] = Field(default=None, alias="rechargeType")
recharge_type_ne: Optional[str] = Field(default=None, alias="rechargeTypeNe")
status: Optional[str] = None
apply_date_from: Optional[date] = Field(default=None, alias="applyDateFrom")
apply_date_to: Optional[date] = Field(default=None, alias="applyDateTo")
@@ -422,6 +427,7 @@ def delete_applies(
def list_records(
q: Optional[str] = Query(default=None),
recharge_type: Optional[str] = Query(default=None, alias="rechargeType"),
recharge_type_ne: Optional[str] = Query(default=None, alias="rechargeTypeNe"),
recharge_date_from: Optional[date] = Query(default=None, alias="rechargeDateFrom"),
recharge_date_to: Optional[date] = Query(default=None, alias="rechargeDateTo"),
gas_station: Optional[str] = Query(default=None, alias="gasStation"),
@@ -438,6 +444,7 @@ def list_records(
user,
q=q,
recharge_type=recharge_type,
recharge_type_ne=recharge_type_ne,
recharge_date_from=recharge_date_from,
recharge_date_to=recharge_date_to,
gas_station=gas_station,
@@ -455,6 +462,7 @@ def list_disburse_board(
request: Request,
q: Optional[str] = Query(default=None),
recharge_type: Optional[str] = Query(default=None, alias="rechargeType"),
recharge_type_ne: Optional[str] = Query(default=None, alias="rechargeTypeNe"),
apply_status: Optional[str] = Query(default=None, alias="applyStatus"),
apply_date_from: Optional[date] = Query(default=None, alias="applyDateFrom"),
apply_date_to: Optional[date] = Query(default=None, alias="applyDateTo"),
@@ -470,6 +478,7 @@ def list_disburse_board(
request,
q=q,
rechargeType=recharge_type,
rechargeTypeNe=recharge_type_ne,
applyStatus=apply_status,
applyDateFrom=apply_date_from,
applyDateTo=apply_date_to,
@@ -513,6 +522,7 @@ RECHARGE_DISBURSE_EXPORT_COLUMNS = [
class RechargeDisburseExportBody(BaseModel):
q: Optional[str] = None
recharge_type: Optional[str] = Field(default=None, alias="rechargeType")
recharge_type_ne: Optional[str] = Field(default=None, alias="rechargeTypeNe")
apply_status: Optional[str] = Field(default=None, alias="applyStatus")
apply_date_from: Optional[date] = Field(default=None, alias="applyDateFrom")
apply_date_to: Optional[date] = Field(default=None, alias="applyDateTo")
@@ -42,6 +42,7 @@ def _approval_list_kwargs(params: dict) -> dict:
license_plate=_param_get(params, "licensePlate", "license_plate"),
recharge_type=_param_get(params, "rechargeType", "recharge_type"),
recharge_type_in=_param_get(params, "rechargeTypeIn", "recharge_type_in"),
recharge_type_ne=_param_get(params, "rechargeTypeNe", "recharge_type_ne"),
status=_param_get(params, "status"),
status_in=_param_get(params, "statusIn", "status_in"),
apply_date_from=_param_get(params, "applyDateFrom", "apply_date_from"),
@@ -61,6 +62,7 @@ def _approval_list_kwargs(params: dict) -> dict:
@approval_router.get("/pending", response_model=VehicleRechargeApplyListResponse)
def list_pending(
request: Request,
recharge_type_ne: Optional[str] = Query(default=None, alias="rechargeTypeNe"),
apply_date_from: Optional[date] = Query(default=None, alias="applyDateFrom"),
apply_date_to: Optional[date] = Query(default=None, alias="applyDateTo"),
page: int = Query(default=1, ge=1),
@@ -71,6 +73,7 @@ def list_pending(
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
params = _merge_query(
request,
rechargeTypeNe=recharge_type_ne,
applyDateFrom=apply_date_from,
applyDateTo=apply_date_to,
)
@@ -90,6 +93,7 @@ def list_pending(
@approval_router.get("/done", response_model=VehicleRechargeApplyListResponse)
def list_done(
request: Request,
recharge_type_ne: Optional[str] = Query(default=None, alias="rechargeTypeNe"),
apply_date_from: Optional[date] = Query(default=None, alias="applyDateFrom"),
apply_date_to: Optional[date] = Query(default=None, alias="applyDateTo"),
page: int = Query(default=1, ge=1),
@@ -100,6 +104,7 @@ def list_done(
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
params = _merge_query(
request,
rechargeTypeNe=recharge_type_ne,
applyDateFrom=apply_date_from,
applyDateTo=apply_date_to,
)