Merge

lib/model/job.g.dart

@@ -56,7 +56,7 @@ const JobSchema = CollectionSchema(
     r'ver': PropertySchema(
       id: 7,
       name: r'ver',
-      type: IsarType.string,
+      type: IsarType.long,
     ),
     r'vhtId': PropertySchema(
       id: 8,
@@ -105,7 +105,6 @@ int _jobEstimateSize(
       bytesCount += JobTourSchema.estimateSize(value, offsets, allOffsets);
     }
   }
-  bytesCount += 3 + object.ver.length * 3;
   return bytesCount;
 }
 
@@ -127,7 +126,7 @@ void _jobSerialize(
     JobTourSchema.serialize,
     object.tours,
   );
-  writer.writeString(offsets[7], object.ver);
+  writer.writeLong(offsets[7], object.ver);
   writer.writeLong(offsets[8], object.vhtId);
 }
 
@@ -152,7 +151,7 @@ Job _jobDeserialize(
         JobTour(),
       ) ??
       [];
-  object.ver = reader.readString(offsets[7]);
+  object.ver = reader.readLong(offsets[7]);
   object.vhtId = reader.readLong(offsets[8]);
   return object;
 }
@@ -185,7 +184,7 @@ P _jobDeserializeProp<P>(
           ) ??
           []) as P;
     case 7:
-      return (reader.readString(offset)) as P;
+      return (reader.readLong(offset)) as P;
     case 8:
       return (reader.readLong(offset)) as P;
     default:
@@ -929,55 +928,46 @@ extension JobQueryFilter on QueryBuilder<Job, Job, QFilterCondition> {
     });
   }
 
-  QueryBuilder<Job, Job, QAfterFilterCondition> verEqualTo(
-    String value, {
-    bool caseSensitive = true,
-  }) {
+  QueryBuilder<Job, Job, QAfterFilterCondition> verEqualTo(int value) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
         property: r'ver',
         value: value,
-        caseSensitive: caseSensitive,
       ));
     });
   }
 
   QueryBuilder<Job, Job, QAfterFilterCondition> verGreaterThan(
-    String value, {
+    int value, {
     bool include = false,
-    bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         include: include,
         property: r'ver',
         value: value,
-        caseSensitive: caseSensitive,
       ));
     });
   }
 
   QueryBuilder<Job, Job, QAfterFilterCondition> verLessThan(
-    String value, {
+    int value, {
     bool include = false,
-    bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.lessThan(
         include: include,
         property: r'ver',
         value: value,
-        caseSensitive: caseSensitive,
       ));
     });
   }
 
   QueryBuilder<Job, Job, QAfterFilterCondition> verBetween(
-    String lower,
-    String upper, {
+    int lower,
+    int upper, {
     bool includeLower = true,
     bool includeUpper = true,
-    bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.between(
@@ -986,73 +976,6 @@ extension JobQueryFilter on QueryBuilder<Job, Job, QFilterCondition> {
         includeLower: includeLower,
         upper: upper,
         includeUpper: includeUpper,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<Job, Job, QAfterFilterCondition> verStartsWith(
-    String value, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.startsWith(
-        property: r'ver',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<Job, Job, QAfterFilterCondition> verEndsWith(
-    String value, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.endsWith(
-        property: r'ver',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<Job, Job, QAfterFilterCondition> verContains(String value,
-      {bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.contains(
-        property: r'ver',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<Job, Job, QAfterFilterCondition> verMatches(String pattern,
-      {bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.matches(
-        property: r'ver',
-        wildcard: pattern,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<Job, Job, QAfterFilterCondition> verIsEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'ver',
-        value: '',
-      ));
-    });
-  }
-
-  QueryBuilder<Job, Job, QAfterFilterCondition> verIsNotEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.greaterThan(
-        property: r'ver',
-        value: '',
       ));
     });
   }
@@ -1368,9 +1291,9 @@ extension JobQueryWhereDistinct on QueryBuilder<Job, Job, QDistinct> {
     });
   }
 
-  QueryBuilder<Job, Job, QDistinct> distinctByVer({bool caseSensitive = true}) {
+  QueryBuilder<Job, Job, QDistinct> distinctByVer() {
     return QueryBuilder.apply(this, (query) {
-      return query.addDistinctBy(r'ver', caseSensitive: caseSensitive);
+      return query.addDistinctBy(r'ver');
     });
   }
 
@@ -1430,7 +1353,7 @@ extension JobQueryProperty on QueryBuilder<Job, Job, QQueryProperty> {
     });
   }
 
-  QueryBuilder<Job, String, QQueryOperations> verProperty() {
+  QueryBuilder<Job, int, QQueryOperations> verProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addPropertyName(r'ver');
     });
@@ -1460,7 +1383,7 @@ Map<String, dynamic> _$JobsPayloadToJson(JobsPayload instance) =>
 
 Job _$JobFromJson(Map<String, dynamic> json) => Job()
   ..id = json['id'] as int
-  ..ver = json['ver'] as String
+  ..ver = json['ver'] as int
   ..state = json['state'] as int
   ..crFilter = json['cr_filter'] as String?
   ..ordertime = json['ordertime'] as String