From 2d4cbcc4f92edbc4f926d9710bdda64520039c2b Mon Sep 17 00:00:00 2001 From: fengxiang <110431245@qq.com> Date: Fri, 05 Jan 2018 11:21:44 +0800 Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop --- src/app/core/services/example.service.ts | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/app/core/services/example.service.ts b/src/app/core/services/example.service.ts index 823a581..9d32660 100644 --- a/src/app/core/services/example.service.ts +++ b/src/app/core/services/example.service.ts @@ -1,23 +1,22 @@ import { Injectable } from '@angular/core'; -import { Column } from '@core/entity/grid'; export class Criteria{ - private static CONDITION_SPLIT = "||"; + private static CONDITION_SPLIT = '||'; private conditions: string[] = []; public getConditions(): string[]{ return this.conditions; } public addCondition(condition: string,colName:string,...values: any[]){ - const split = Criteria.CONDITION_SPLIT;//'||' + const split = Criteria.CONDITION_SPLIT; // '||' this.conditions.push(condition+split+colName+split+ values.join(split)); } - public andLike(col:Column): Criteria{ + public andLike(col: { name: string, value: any}): Criteria{ this.addCondition('andLike',col.name,col.value); return this; } - public andEqualTo(col:Column): Criteria{ + public andEqualTo(col: { name: string, value: any}): Criteria{ this.addCondition('andEqualTo',col.name,col.value); return this; } -- Gitblit v1.8.0