Merge branch 'develop' of ssh://121.40.92.176:29418/screen-frontend into de...

沈斌

2018-03-08 f320f1970e5d80a423f377fb3253628bd1e7f5bf

 src/app/business/services/util/example.service.ts

@@ -8,15 +8,15 @@
       return this.conditions;
     }

     public addCondition(condition: string, colName:string, ...values: any[]){
     public addCondition(condition: string, colName: string, ...values: any[]) {
        const split = Criteria.CONDITION_SPLIT; // '||'
        this.conditions.push(condition+split + colName + split + values.join(split));
        this.conditions.push(condition + split + colName + split + values.join(split));
     }
     public andLike(col: { name: string, value: any}): Criteria{
     public andLike(col: { name: string, value: any}): Criteria {
         this.addCondition('andLike', col.name, col.value);
         return this;
     }
     public andEqualTo(col: { name: string, value: any}): Criteria{
     public andEqualTo(col: { name: string, value: any}): Criteria {
        this.addCondition('andEqualTo', col.name, col.value);
        return this;
     }
@@ -30,7 +30,7 @@
  
  public getSqlParam(): string {
      let whereSql = '';
     for (const cri of this.criterion){
     for (const cri of this.criterion) {
            const conditions = cri.getConditions();
            whereSql += ExampleService.OR_SPLIT + conditions.join(ExampleService.CRITERIA_SPLIT);
     }