diff --git a/lib/model/tour_task.dart b/lib/model/tour_task.dart index a17e0c5..e0d69b5 100644 --- a/lib/model/tour_task.dart +++ b/lib/model/tour_task.dart @@ -10,8 +10,10 @@ class TourTask { late int sId; late int type; late String topic; - late bool opt = true; - late bool reenter = false; + @JsonKey(name: 'opt', defaultValue: false) + late bool? opt; + @JsonKey(name: 'reenter', defaultValue: false) + late bool? reenter; late int? min; late int? max; @JsonKey(name: 'max_len') diff --git a/lib/model/tour_task.g.dart b/lib/model/tour_task.g.dart index 2a484ca..aea8d19 100644 --- a/lib/model/tour_task.g.dart +++ b/lib/model/tour_task.g.dart @@ -170,8 +170,8 @@ TourTask _tourTaskDeserialize( object.max = reader.readLongOrNull(offsets[1]); object.maxLen = reader.readLongOrNull(offsets[2]); object.min = reader.readLongOrNull(offsets[3]); - object.opt = reader.readBool(offsets[4]); - object.reenter = reader.readBool(offsets[5]); + object.opt = reader.readBoolOrNull(offsets[4]); + object.reenter = reader.readBoolOrNull(offsets[5]); object.rt = reader.readBoolOrNull(offsets[6]); object.sId = reader.readLong(offsets[7]); object.taskArrival = reader.readLongOrNull(offsets[8]); @@ -204,9 +204,9 @@ P _tourTaskDeserializeProp

( case 3: return (reader.readLongOrNull(offset)) as P; case 4: - return (reader.readBool(offset)) as P; + return (reader.readBoolOrNull(offset)) as P; case 5: - return (reader.readBool(offset)) as P; + return (reader.readBoolOrNull(offset)) as P; case 6: return (reader.readBoolOrNull(offset)) as P; case 7: @@ -538,8 +538,24 @@ extension TourTaskQueryFilter }); } + QueryBuilder optIsNull() { + return QueryBuilder.apply(this, (query) { + return query.addFilterCondition(const FilterCondition.isNull( + property: r'opt', + )); + }); + } + + QueryBuilder optIsNotNull() { + return QueryBuilder.apply(this, (query) { + return query.addFilterCondition(const FilterCondition.isNotNull( + property: r'opt', + )); + }); + } + QueryBuilder optEqualTo( - bool value) { + bool? value) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.equalTo( property: r'opt', @@ -548,8 +564,24 @@ extension TourTaskQueryFilter }); } + QueryBuilder reenterIsNull() { + return QueryBuilder.apply(this, (query) { + return query.addFilterCondition(const FilterCondition.isNull( + property: r'reenter', + )); + }); + } + + QueryBuilder reenterIsNotNull() { + return QueryBuilder.apply(this, (query) { + return query.addFilterCondition(const FilterCondition.isNotNull( + property: r'reenter', + )); + }); + } + QueryBuilder reenterEqualTo( - bool value) { + bool? value) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.equalTo( property: r'reenter', @@ -1518,8 +1550,8 @@ TourTask _$TourTaskFromJson(Map json) => TourTask() ..sId = json['s_id'] as int ..type = json['type'] as int ..topic = json['topic'] as String - ..opt = json['opt'] as bool - ..reenter = json['reenter'] as bool + ..opt = json['opt'] as bool? ?? false + ..reenter = json['reenter'] as bool? ?? false ..min = json['min'] as int? ..max = json['max'] as int? ..maxLen = json['max_len'] as int?