xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

红点：抽卡推送修改

Browse Source
This commit is contained in:
luying
2021-06-15 15:42:21 +08:00
parent 15ffdf5e47
commit f908bdccee
5 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
shared/db/Serverlist.ts
View File

@@ -92,15 +92,20 @@ export default class Serverlist extends BaseModel {
return server;
}
public static async findByCondition(page: number, pageSize: number, sortField: string, sortOrder: string, id: number, serverId: string|number, name: string, groupName: string, groupId: number, serverType: string) {
private static getSearchObj(form: { id?: number, serverId?: string|number, name?: string, groupName?: string, groupId?: number, serverType?: string }) {
let searchObj = {};
if (id != undefined) searchObj['id'] = id;
if (serverId != undefined) searchObj['groupId'] = groupId;
if (name != undefined) searchObj['name'] = name;
if (groupName != undefined) searchObj['groupName'] = groupName;
if (serverType != undefined) searchObj['serverType'] = serverType;
if (form.id != undefined) searchObj['id'] = form.id;
if (form.serverId != undefined) searchObj['groupId'] = form.groupId;
if (form.name != undefined) searchObj['name'] = { $regex: new RegExp(form.name.toString(), 'i') };
if (form.groupName != undefined) searchObj['groupName'] = { $regex: new RegExp(form.groupName.toString(), 'i') };
if (form.serverType != undefined) searchObj['serverType'] = form.serverType;
return searchObj
}
public static async findByCondition(page: number, pageSize: number, sortField: string, sortOrder: string, form: { id?: number, serverId?: string|number, name?: string, groupName?: string, groupId?: number, serverType?: string } = {}) {
let searchObj = ServerlistModel.getSearchObj(form);
console.log(searchObj, form)
let sort = {};
if(sortField && sortOrder) {
if(sortOrder == 'ascend') {
@@ -114,14 +119,9 @@ export default class Serverlist extends BaseModel {
}
public static async countByCondition(id: number, serverId: string|number, name: string, groupName: string, groupId: number, serverType: string) {
let searchObj = {};
if (id != undefined) searchObj['id'] = id;
if (serverId != undefined) searchObj['groupId'] = groupId;
if (name != undefined) searchObj['name'] = name;
if (groupName != undefined) searchObj['groupName'] = groupName;
if (serverType != undefined) searchObj['serverType'] = serverType;
public static async countByCondition(form: { id?: number, serverId?: string|number, name?: string, groupName?: string, groupId?: number, serverType?: string } = {}) {
let searchObj = ServerlistModel.getSearchObj(form);
const result = await ServerlistModel.count(searchObj);
return result;
}