From 5a4d79d9765dfca8812638b57d5f5fe21f7a06ee Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 16 七月 2024 17:05:25 +0800
Subject: [PATCH] 工单下发更新
---
src/api/tigerapi/system.ts | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/src/api/tigerapi/system.ts b/src/api/tigerapi/system.ts
index ca7dd52..de350ff 100644
--- a/src/api/tigerapi/system.ts
+++ b/src/api/tigerapi/system.ts
@@ -31,6 +31,7 @@
} from './model/systemModel';
import { defHttp } from '/@/utils/http/axios';
import { isArray, isNullOrEmpty, isTimeViaRegExp8601 } from '/@/utils/is';
+import { isNumber } from 'xe-utils';
export enum Api {
QueryUrl = '/Base/Query',
@@ -709,17 +710,21 @@
if (!isNullOrEmpty(params['order'])) {
order = params['order'] == 'descend' ? params['field'] + ' desc' : params['field'];
}
- const rParams = genAction(params['TABLE_NAME'], {
- QueryAble_T: '',
- where: sqlcmd,
- order: order,
- page: {
- pageAble_T: 'string',
- draw: 1,
- pageIndex: params['page'],
- pageSize: params['pageSize'],
+ const rParams = genAction(
+ params['TABLE_NAME'],
+ {
+ QueryAble_T: '',
+ where: sqlcmd,
+ order: order,
+ page: {
+ pageAble_T: 'string',
+ draw: 1,
+ pageIndex: params['page'],
+ pageSize: params['pageSize'],
+ },
},
- });
+ params['option'],
+ );
return getListByPageAsync(rParams);
}
async function getListByPageAsync(params: any) {
@@ -759,6 +764,8 @@
if (!isNullOrEmpty(params[Keys[k]].length) && isTimeViaRegExp8601(params[Keys[k]][0])) {
sqlcmd += ` And ${Keys[k]} > '${params[Keys[k]][0]}'`;
sqlcmd += ` And ${Keys[k]} < '${params[Keys[k]][1]}'`;
+ } else if (isNumber(params[Keys[k]])) {
+ sqlcmd += `And ${Keys[k]} = ${params[Keys[k]]}`;
} else {
sqlcmd += `And ${Keys[k]} like '%${params[Keys[k]]}%'`;
}
--
Gitblit v1.9.3