Browse Source

1、更新jsonrpc

guanxinyi 1 year ago
parent
commit
32affa467f

+ 1 - 1
lib/services/authentication.m.dart

@@ -2240,7 +2240,7 @@ enum CustomerRpcCode {
 	DeviceNameNotExisted,
 	DevicePasswordErr,
 	DeviceDescriptionEmpty,
-	placeHolder_2038,
+	DeviceCannotRestart,
 	placeHolder_2039,
 	placeHolder_2040,
 	placeHolder_2041,

+ 8 - 0
lib/services/device.m.dart

@@ -171,6 +171,8 @@ class DeviceExtendInfoDTO extends DeviceInfoDTO{
 	String? organizationDirectorFullName;
 	List<DictionaryLanguageConfigDTO >? languageConfigs;
 	bool isEmergencyDevice;
+	bool isCanRemoteMaintenance;
+	bool isCanRestart;
 
 	DeviceExtendInfoDTO({
 		this.organizationName,
@@ -182,6 +184,8 @@ class DeviceExtendInfoDTO extends DeviceInfoDTO{
 		this.organizationDirectorFullName,
 		this.languageConfigs,
 		this.isEmergencyDevice = false,
+		this.isCanRemoteMaintenance = false,
+		this.isCanRestart = false,
 		String? deviceCode,
 		String? serialNumber,
 		String? password,
@@ -258,6 +262,8 @@ class DeviceExtendInfoDTO extends DeviceInfoDTO{
 			organizationDirectorFullName: map['OrganizationDirectorFullName'],
 			languageConfigs: map['LanguageConfigs'] != null ? (map['LanguageConfigs'] as List).map((e)=>DictionaryLanguageConfigDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
 			isEmergencyDevice: map['IsEmergencyDevice'],
+			isCanRemoteMaintenance: map['IsCanRemoteMaintenance'],
+			isCanRestart: map['IsCanRestart'],
 			deviceCode: map['DeviceCode'],
 			serialNumber: map['SerialNumber'],
 			password: map['Password'],
@@ -309,6 +315,8 @@ class DeviceExtendInfoDTO extends DeviceInfoDTO{
 		if(languageConfigs != null)
 			map['LanguageConfigs'] = languageConfigs;
 		map['IsEmergencyDevice'] = isEmergencyDevice;
+		map['IsCanRemoteMaintenance'] = isCanRemoteMaintenance;
+		map['IsCanRestart'] = isCanRestart;
 		return map;
 	}
 }

+ 74 - 34
lib/services/education.m.dart

@@ -183,6 +183,38 @@ enum CourseAudienceTypeEnum {
 	PrivateClass,
 }
 
+class ValueType {
+
+	ValueType();
+
+	factory ValueType.fromJson(Map<String, dynamic> map) {
+		return ValueType( 
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		return map;
+	}
+}
+
+class Decimal extends ValueType{
+
+	Decimal(
+	) : super(
+		);
+
+	factory Decimal.fromJson(Map<String, dynamic> map) {
+		return Decimal( 
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = super.toJson();
+		return map;
+	}
+}
+
 enum CourseAppearTypeEnum {
 	Unknown,
 	Independent,
@@ -202,7 +234,7 @@ class ApplyCourseRequest extends TokenRequest{
 	List<String >? caseLabelCodes;
 	List<String >? courseLabelCodes;
 	List<String >? userGroupCodes;
-	double price;
+	Decimal? price;
 	List<String >? courseVideoCodes;
 	List<String >? courseMaterialCodes;
 	List<String >? bindExams;
@@ -226,7 +258,7 @@ class ApplyCourseRequest extends TokenRequest{
 		this.caseLabelCodes,
 		this.courseLabelCodes,
 		this.userGroupCodes,
-		this.price = 0,
+		this.price,
 		this.courseVideoCodes,
 		this.courseMaterialCodes,
 		this.bindExams,
@@ -255,7 +287,7 @@ class ApplyCourseRequest extends TokenRequest{
 			caseLabelCodes: map['CaseLabelCodes'] != null ? map['CaseLabelCodes'].cast<String>().toList() : null,
 			courseLabelCodes: map['CourseLabelCodes'] != null ? map['CourseLabelCodes'].cast<String>().toList() : null,
 			userGroupCodes: map['UserGroupCodes'] != null ? map['UserGroupCodes'].cast<String>().toList() : null,
-			price: double.parse(map['Price'].toString()),
+			price: map['Price'] != null ? Decimal.fromJson(map['Price']) : null,
 			courseVideoCodes: map['CourseVideoCodes'] != null ? map['CourseVideoCodes'].cast<String>().toList() : null,
 			courseMaterialCodes: map['CourseMaterialCodes'] != null ? map['CourseMaterialCodes'].cast<String>().toList() : null,
 			bindExams: map['BindExams'] != null ? map['BindExams'].cast<String>().toList() : null,
@@ -292,7 +324,8 @@ class ApplyCourseRequest extends TokenRequest{
 			map['CourseLabelCodes'] = courseLabelCodes;
 		if(userGroupCodes != null)
 			map['UserGroupCodes'] = userGroupCodes;
-		map['Price'] = price;
+		if(price != null)
+			map['Price'] = price;
 		if(courseVideoCodes != null)
 			map['CourseVideoCodes'] = courseVideoCodes;
 		if(courseMaterialCodes != null)
@@ -669,7 +702,7 @@ class BaseCourseInfoDTO {
 	String? creatorCode;
 	String? organizationCode;
 	DateTime? createTime;
-	double price;
+	Decimal? price;
 	List<String >? courseLabelCodes;
 	List<String >? caseLabelCodes;
 	List<String >? userGroupCodes;
@@ -710,7 +743,7 @@ class BaseCourseInfoDTO {
 		this.creatorCode,
 		this.organizationCode,
 		this.createTime,
-		this.price = 0,
+		this.price,
 		this.courseLabelCodes,
 		this.caseLabelCodes,
 		this.userGroupCodes,
@@ -753,7 +786,7 @@ class BaseCourseInfoDTO {
 			creatorCode: map['CreatorCode'],
 			organizationCode: map['OrganizationCode'],
 			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
-			price: double.parse(map['Price'].toString()),
+			price: map['Price'] != null ? Decimal.fromJson(map['Price']) : null,
 			courseLabelCodes: map['CourseLabelCodes'] != null ? map['CourseLabelCodes'].cast<String>().toList() : null,
 			caseLabelCodes: map['CaseLabelCodes'] != null ? map['CaseLabelCodes'].cast<String>().toList() : null,
 			userGroupCodes: map['UserGroupCodes'] != null ? map['UserGroupCodes'].cast<String>().toList() : null,
@@ -810,7 +843,8 @@ class BaseCourseInfoDTO {
 			map['OrganizationCode'] = organizationCode;
 		if(createTime != null)
 			map['CreateTime'] = JsonRpcUtils.dateFormat(createTime!);
-		map['Price'] = price;
+		if(price != null)
+			map['Price'] = price;
 		if(courseLabelCodes != null)
 			map['CourseLabelCodes'] = courseLabelCodes;
 		if(caseLabelCodes != null)
@@ -1076,7 +1110,7 @@ class CourseInfoDetailDTO extends BaseCourseInfoDTO{
 		String? creatorCode,
 		String? organizationCode,
 		DateTime? createTime,
-		double price = 0,
+		Decimal? price,
 		List<String >? courseLabelCodes,
 		List<String >? caseLabelCodes,
 		List<String >? userGroupCodes,
@@ -1172,7 +1206,7 @@ class CourseInfoDetailDTO extends BaseCourseInfoDTO{
 			creatorCode: map['CreatorCode'],
 			organizationCode: map['OrganizationCode'],
 			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
-			price: double.parse(map['Price'].toString()),
+			price: map['Price'] != null ? Decimal.fromJson(map['Price']) : null,
 			courseLabelCodes: map['CourseLabelCodes'] != null ? map['CourseLabelCodes'].cast<String>().toList() : null,
 			caseLabelCodes: map['CaseLabelCodes'] != null ? map['CaseLabelCodes'].cast<String>().toList() : null,
 			userGroupCodes: map['UserGroupCodes'] != null ? map['UserGroupCodes'].cast<String>().toList() : null,
@@ -1333,7 +1367,7 @@ class UpdateCourseRequest extends TokenRequest{
 	List<String >? caseLabelCodes;
 	List<String >? courseLabelCodes;
 	List<String >? userGroupCodes;
-	double price;
+	Decimal? price;
 	List<String >? courseVideoCodes;
 	List<String >? bindExams;
 	bool isSmallClass;
@@ -1358,7 +1392,7 @@ class UpdateCourseRequest extends TokenRequest{
 		this.caseLabelCodes,
 		this.courseLabelCodes,
 		this.userGroupCodes,
-		this.price = 0,
+		this.price,
 		this.courseVideoCodes,
 		this.bindExams,
 		this.isSmallClass = false,
@@ -1388,7 +1422,7 @@ class UpdateCourseRequest extends TokenRequest{
 			caseLabelCodes: map['CaseLabelCodes'] != null ? map['CaseLabelCodes'].cast<String>().toList() : null,
 			courseLabelCodes: map['CourseLabelCodes'] != null ? map['CourseLabelCodes'].cast<String>().toList() : null,
 			userGroupCodes: map['UserGroupCodes'] != null ? map['UserGroupCodes'].cast<String>().toList() : null,
-			price: double.parse(map['Price'].toString()),
+			price: map['Price'] != null ? Decimal.fromJson(map['Price']) : null,
 			courseVideoCodes: map['CourseVideoCodes'] != null ? map['CourseVideoCodes'].cast<String>().toList() : null,
 			bindExams: map['BindExams'] != null ? map['BindExams'].cast<String>().toList() : null,
 			isSmallClass: map['IsSmallClass'],
@@ -1427,7 +1461,8 @@ class UpdateCourseRequest extends TokenRequest{
 			map['CourseLabelCodes'] = courseLabelCodes;
 		if(userGroupCodes != null)
 			map['UserGroupCodes'] = userGroupCodes;
-		map['Price'] = price;
+		if(price != null)
+			map['Price'] = price;
 		if(courseVideoCodes != null)
 			map['CourseVideoCodes'] = courseVideoCodes;
 		if(bindExams != null)
@@ -1520,7 +1555,7 @@ class CourseAlbumDTO extends BaseCourseAlbumDTO{
 	String? teacherCode;
 	String? teacherName;
 	CourseViewRangeEnum viewRange;
-	double price;
+	Decimal? price;
 	DateTime? createTime;
 	int sort;
 	bool isStick;
@@ -1533,7 +1568,7 @@ class CourseAlbumDTO extends BaseCourseAlbumDTO{
 		this.teacherCode,
 		this.teacherName,
 		this.viewRange = CourseViewRangeEnum.All,
-		this.price = 0,
+		this.price,
 		this.createTime,
 		this.sort = 0,
 		this.isStick = false,
@@ -1553,7 +1588,7 @@ class CourseAlbumDTO extends BaseCourseAlbumDTO{
 			teacherCode: map['TeacherCode'],
 			teacherName: map['TeacherName'],
 			viewRange: CourseViewRangeEnum.values.firstWhere((e) => e.index == map['ViewRange']),
-			price: double.parse(map['Price'].toString()),
+			price: map['Price'] != null ? Decimal.fromJson(map['Price']) : null,
 			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
 			sort: map['Sort'],
 			isStick: map['IsStick'],
@@ -1577,7 +1612,8 @@ class CourseAlbumDTO extends BaseCourseAlbumDTO{
 		if(teacherName != null)
 			map['TeacherName'] = teacherName;
 		map['ViewRange'] = viewRange.index;
-		map['Price'] = price;
+		if(price != null)
+			map['Price'] = price;
 		if(createTime != null)
 			map['CreateTime'] = JsonRpcUtils.dateFormat(createTime!);
 		map['Sort'] = sort;
@@ -3357,7 +3393,7 @@ class AddCourseAlbumRequest extends TokenRequest{
 	String? teacherCode;
 	String? teacherName;
 	CourseViewRangeEnum viewRange;
-	double price;
+	Decimal? price;
 
 	AddCourseAlbumRequest({
 		this.name,
@@ -3370,7 +3406,7 @@ class AddCourseAlbumRequest extends TokenRequest{
 		this.teacherCode,
 		this.teacherName,
 		this.viewRange = CourseViewRangeEnum.All,
-		this.price = 0,
+		this.price,
 		String? token,
 	}) : super(
 			token: token,
@@ -3388,7 +3424,7 @@ class AddCourseAlbumRequest extends TokenRequest{
 			teacherCode: map['TeacherCode'],
 			teacherName: map['TeacherName'],
 			viewRange: CourseViewRangeEnum.values.firstWhere((e) => e.index == map['ViewRange']),
-			price: double.parse(map['Price'].toString()),
+			price: map['Price'] != null ? Decimal.fromJson(map['Price']) : null,
 			token: map['Token'],
 		);
 	}
@@ -3412,7 +3448,8 @@ class AddCourseAlbumRequest extends TokenRequest{
 		if(teacherName != null)
 			map['TeacherName'] = teacherName;
 		map['ViewRange'] = viewRange.index;
-		map['Price'] = price;
+		if(price != null)
+			map['Price'] = price;
 		return map;
 	}
 }
@@ -3445,7 +3482,7 @@ class CourseCommonInfoDTO extends BaseCourseAlbumDTO{
 	String? teacherCode;
 	String? teacherName;
 	CourseViewRangeEnum viewRange;
-	double price;
+	Decimal? price;
 	CourseTypeEnum courseType;
 	List<BaseUserGroupDTO >? userGroupList;
 	List<BaseCourseAlbumDTO >? courseAlbumList;
@@ -3460,7 +3497,7 @@ class CourseCommonInfoDTO extends BaseCourseAlbumDTO{
 		this.teacherCode,
 		this.teacherName,
 		this.viewRange = CourseViewRangeEnum.All,
-		this.price = 0,
+		this.price,
 		this.courseType = CourseTypeEnum.Unknown,
 		this.userGroupList,
 		this.courseAlbumList,
@@ -3482,7 +3519,7 @@ class CourseCommonInfoDTO extends BaseCourseAlbumDTO{
 			teacherCode: map['TeacherCode'],
 			teacherName: map['TeacherName'],
 			viewRange: CourseViewRangeEnum.values.firstWhere((e) => e.index == map['ViewRange']),
-			price: double.parse(map['Price'].toString()),
+			price: map['Price'] != null ? Decimal.fromJson(map['Price']) : null,
 			courseType: CourseTypeEnum.values.firstWhere((e) => e.index == map['CourseType']),
 			userGroupList: map['UserGroupList'] != null ? (map['UserGroupList'] as List).map((e)=>BaseUserGroupDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
 			courseAlbumList: map['CourseAlbumList'] != null ? (map['CourseAlbumList'] as List).map((e)=>BaseCourseAlbumDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
@@ -3507,7 +3544,8 @@ class CourseCommonInfoDTO extends BaseCourseAlbumDTO{
 		if(teacherName != null)
 			map['TeacherName'] = teacherName;
 		map['ViewRange'] = viewRange.index;
-		map['Price'] = price;
+		if(price != null)
+			map['Price'] = price;
 		map['CourseType'] = courseType.index;
 		if(userGroupList != null)
 			map['UserGroupList'] = userGroupList;
@@ -3532,7 +3570,7 @@ class CourseAlbumExtendDTO extends BaseCourseAlbumDTO{
 	String? teacherCode;
 	String? teacherName;
 	CourseViewRangeEnum viewRange;
-	double price;
+	Decimal? price;
 	DateTime? createTime;
 	int sort;
 	bool isStick;
@@ -3550,7 +3588,7 @@ class CourseAlbumExtendDTO extends BaseCourseAlbumDTO{
 		this.teacherCode,
 		this.teacherName,
 		this.viewRange = CourseViewRangeEnum.All,
-		this.price = 0,
+		this.price,
 		this.createTime,
 		this.sort = 0,
 		this.isStick = false,
@@ -3575,7 +3613,7 @@ class CourseAlbumExtendDTO extends BaseCourseAlbumDTO{
 			teacherCode: map['TeacherCode'],
 			teacherName: map['TeacherName'],
 			viewRange: CourseViewRangeEnum.values.firstWhere((e) => e.index == map['ViewRange']),
-			price: double.parse(map['Price'].toString()),
+			price: map['Price'] != null ? Decimal.fromJson(map['Price']) : null,
 			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
 			sort: map['Sort'],
 			isStick: map['IsStick'],
@@ -3606,7 +3644,8 @@ class CourseAlbumExtendDTO extends BaseCourseAlbumDTO{
 		if(teacherName != null)
 			map['TeacherName'] = teacherName;
 		map['ViewRange'] = viewRange.index;
-		map['Price'] = price;
+		if(price != null)
+			map['Price'] = price;
 		if(createTime != null)
 			map['CreateTime'] = JsonRpcUtils.dateFormat(createTime!);
 		map['Sort'] = sort;
@@ -4054,7 +4093,7 @@ class UpdateCourseAlbumRequest extends TokenRequest{
 	String? teacherCode;
 	String? teacherName;
 	CourseViewRangeEnum viewRange;
-	double price;
+	Decimal? price;
 
 	UpdateCourseAlbumRequest({
 		this.name,
@@ -4068,7 +4107,7 @@ class UpdateCourseAlbumRequest extends TokenRequest{
 		this.teacherCode,
 		this.teacherName,
 		this.viewRange = CourseViewRangeEnum.All,
-		this.price = 0,
+		this.price,
 		String? token,
 	}) : super(
 			token: token,
@@ -4087,7 +4126,7 @@ class UpdateCourseAlbumRequest extends TokenRequest{
 			teacherCode: map['TeacherCode'],
 			teacherName: map['TeacherName'],
 			viewRange: CourseViewRangeEnum.values.firstWhere((e) => e.index == map['ViewRange']),
-			price: double.parse(map['Price'].toString()),
+			price: map['Price'] != null ? Decimal.fromJson(map['Price']) : null,
 			token: map['Token'],
 		);
 	}
@@ -4113,7 +4152,8 @@ class UpdateCourseAlbumRequest extends TokenRequest{
 		if(teacherName != null)
 			map['TeacherName'] = teacherName;
 		map['ViewRange'] = viewRange.index;
-		map['Price'] = price;
+		if(price != null)
+			map['Price'] = price;
 		return map;
 	}
 }

+ 41 - 34
lib/services/other.m.dart

@@ -2426,7 +2426,7 @@ class AdminApplyCourseRequest extends TokenRequest{
 	List<String >? caseLabelCodes;
 	List<String >? courseLabelCodes;
 	List<String >? userGroupCodes;
-	double price;
+	Decimal? price;
 	List<String >? courseVideoCodes;
 	List<CourseExaminationDTO >? bindExams;
 	bool isSmallClass;
@@ -2452,7 +2452,7 @@ class AdminApplyCourseRequest extends TokenRequest{
 		this.caseLabelCodes,
 		this.courseLabelCodes,
 		this.userGroupCodes,
-		this.price = 0,
+		this.price,
 		this.courseVideoCodes,
 		this.bindExams,
 		this.isSmallClass = false,
@@ -2483,7 +2483,7 @@ class AdminApplyCourseRequest extends TokenRequest{
 			caseLabelCodes: map['CaseLabelCodes'] != null ? map['CaseLabelCodes'].cast<String>().toList() : null,
 			courseLabelCodes: map['CourseLabelCodes'] != null ? map['CourseLabelCodes'].cast<String>().toList() : null,
 			userGroupCodes: map['UserGroupCodes'] != null ? map['UserGroupCodes'].cast<String>().toList() : null,
-			price: double.parse(map['Price'].toString()),
+			price: map['Price'] != null ? Decimal.fromJson(map['Price']) : null,
 			courseVideoCodes: map['CourseVideoCodes'] != null ? map['CourseVideoCodes'].cast<String>().toList() : null,
 			bindExams: map['BindExams'] != null ? (map['BindExams'] as List).map((e)=>CourseExaminationDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
 			isSmallClass: map['IsSmallClass'],
@@ -2523,7 +2523,8 @@ class AdminApplyCourseRequest extends TokenRequest{
 			map['CourseLabelCodes'] = courseLabelCodes;
 		if(userGroupCodes != null)
 			map['UserGroupCodes'] = userGroupCodes;
-		map['Price'] = price;
+		if(price != null)
+			map['Price'] = price;
 		if(courseVideoCodes != null)
 			map['CourseVideoCodes'] = courseVideoCodes;
 		if(bindExams != null)
@@ -2660,7 +2661,7 @@ class AdminUpdateCourseRequest extends TokenRequest{
 	List<String >? caseLabelCodes;
 	List<String >? courseLabelCodes;
 	List<String >? userGroupCodes;
-	double price;
+	Decimal? price;
 	List<String >? courseVideoCodes;
 	List<CourseExaminationDTO >? bindExams;
 	bool isSmallClass;
@@ -2687,7 +2688,7 @@ class AdminUpdateCourseRequest extends TokenRequest{
 		this.caseLabelCodes,
 		this.courseLabelCodes,
 		this.userGroupCodes,
-		this.price = 0,
+		this.price,
 		this.courseVideoCodes,
 		this.bindExams,
 		this.isSmallClass = false,
@@ -2719,7 +2720,7 @@ class AdminUpdateCourseRequest extends TokenRequest{
 			caseLabelCodes: map['CaseLabelCodes'] != null ? map['CaseLabelCodes'].cast<String>().toList() : null,
 			courseLabelCodes: map['CourseLabelCodes'] != null ? map['CourseLabelCodes'].cast<String>().toList() : null,
 			userGroupCodes: map['UserGroupCodes'] != null ? map['UserGroupCodes'].cast<String>().toList() : null,
-			price: double.parse(map['Price'].toString()),
+			price: map['Price'] != null ? Decimal.fromJson(map['Price']) : null,
 			courseVideoCodes: map['CourseVideoCodes'] != null ? map['CourseVideoCodes'].cast<String>().toList() : null,
 			bindExams: map['BindExams'] != null ? (map['BindExams'] as List).map((e)=>CourseExaminationDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
 			isSmallClass: map['IsSmallClass'],
@@ -2761,7 +2762,8 @@ class AdminUpdateCourseRequest extends TokenRequest{
 			map['CourseLabelCodes'] = courseLabelCodes;
 		if(userGroupCodes != null)
 			map['UserGroupCodes'] = userGroupCodes;
-		map['Price'] = price;
+		if(price != null)
+			map['Price'] = price;
 		if(courseVideoCodes != null)
 			map['CourseVideoCodes'] = courseVideoCodes;
 		if(bindExams != null)
@@ -3177,7 +3179,7 @@ class CourseMigratoryInfo extends BaseDTO{
 	List<String >? caseLabelCodes;
 	List<String >? courseLabelCodes;
 	List<String >? userGroupCodes;
-	double price;
+	Decimal? price;
 	List<String >? courseVideoCodes;
 	List<StudentInfoDTO >? assistants;
 	List<StudentInfoDTO >? experts;
@@ -3215,7 +3217,7 @@ class CourseMigratoryInfo extends BaseDTO{
 		this.caseLabelCodes,
 		this.courseLabelCodes,
 		this.userGroupCodes,
-		this.price = 0,
+		this.price,
 		this.courseVideoCodes,
 		this.assistants,
 		this.experts,
@@ -3260,7 +3262,7 @@ class CourseMigratoryInfo extends BaseDTO{
 			caseLabelCodes: map['CaseLabelCodes'] != null ? map['CaseLabelCodes'].cast<String>().toList() : null,
 			courseLabelCodes: map['CourseLabelCodes'] != null ? map['CourseLabelCodes'].cast<String>().toList() : null,
 			userGroupCodes: map['UserGroupCodes'] != null ? map['UserGroupCodes'].cast<String>().toList() : null,
-			price: double.parse(map['Price'].toString()),
+			price: map['Price'] != null ? Decimal.fromJson(map['Price']) : null,
 			courseVideoCodes: map['CourseVideoCodes'] != null ? map['CourseVideoCodes'].cast<String>().toList() : null,
 			assistants: map['Assistants'] != null ? (map['Assistants'] as List).map((e)=>StudentInfoDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
 			experts: map['Experts'] != null ? (map['Experts'] as List).map((e)=>StudentInfoDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
@@ -3320,7 +3322,8 @@ class CourseMigratoryInfo extends BaseDTO{
 			map['CourseLabelCodes'] = courseLabelCodes;
 		if(userGroupCodes != null)
 			map['UserGroupCodes'] = userGroupCodes;
-		map['Price'] = price;
+		if(price != null)
+			map['Price'] = price;
 		if(courseVideoCodes != null)
 			map['CourseVideoCodes'] = courseVideoCodes;
 		if(assistants != null)
@@ -9548,7 +9551,7 @@ class FindCourseAlbumPageRequest extends PageRequest{
 	String? teacherCode;
 	String? teacherName;
 	CourseViewRangeEnum viewRange;
-	double price;
+	Decimal? price;
 
 	FindCourseAlbumPageRequest({
 		this.keyword,
@@ -9557,7 +9560,7 @@ class FindCourseAlbumPageRequest extends PageRequest{
 		this.teacherCode,
 		this.teacherName,
 		this.viewRange = CourseViewRangeEnum.All,
-		this.price = 0,
+		this.price,
 		int pageIndex = 0,
 		int pageSize = 0,
 		String? token,
@@ -9575,7 +9578,7 @@ class FindCourseAlbumPageRequest extends PageRequest{
 			teacherCode: map['TeacherCode'],
 			teacherName: map['TeacherName'],
 			viewRange: CourseViewRangeEnum.values.firstWhere((e) => e.index == map['ViewRange']),
-			price: double.parse(map['Price'].toString()),
+			price: map['Price'] != null ? Decimal.fromJson(map['Price']) : null,
 			pageIndex: map['PageIndex'],
 			pageSize: map['PageSize'],
 			token: map['Token'],
@@ -9594,7 +9597,8 @@ class FindCourseAlbumPageRequest extends PageRequest{
 		if(teacherName != null)
 			map['TeacherName'] = teacherName;
 		map['ViewRange'] = viewRange.index;
-		map['Price'] = price;
+		if(price != null)
+			map['Price'] = price;
 		return map;
 	}
 }
@@ -18304,7 +18308,7 @@ class CourseAlbumView extends BaseDTO{
 	String? introduction;
 	List<CourseLabelDTO >? courseLabels;
 	CourseViewRangeEnum viewRange;
-	double price;
+	Decimal? price;
 	List<StudentView >? students;
 	int sort;
 	bool isStick;
@@ -18319,7 +18323,7 @@ class CourseAlbumView extends BaseDTO{
 		this.introduction,
 		this.courseLabels,
 		this.viewRange = CourseViewRangeEnum.All,
-		this.price = 0,
+		this.price,
 		this.students,
 		this.sort = 0,
 		this.isStick = false,
@@ -18341,7 +18345,7 @@ class CourseAlbumView extends BaseDTO{
 			introduction: map['Introduction'],
 			courseLabels: map['CourseLabels'] != null ? (map['CourseLabels'] as List).map((e)=>CourseLabelDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
 			viewRange: CourseViewRangeEnum.values.firstWhere((e) => e.index == map['ViewRange']),
-			price: double.parse(map['Price'].toString()),
+			price: map['Price'] != null ? Decimal.fromJson(map['Price']) : null,
 			students: map['Students'] != null ? (map['Students'] as List).map((e)=>StudentView.fromJson(e as Map<String,dynamic>)).toList() : null,
 			sort: map['Sort'],
 			isStick: map['IsStick'],
@@ -18369,7 +18373,8 @@ class CourseAlbumView extends BaseDTO{
 		if(courseLabels != null)
 			map['CourseLabels'] = courseLabels;
 		map['ViewRange'] = viewRange.index;
-		map['Price'] = price;
+		if(price != null)
+			map['Price'] = price;
 		if(students != null)
 			map['Students'] = students;
 		map['Sort'] = sort;
@@ -19907,7 +19912,7 @@ class OnlineTrainingDTO extends BaseDTO{
 	int duration;
 	CourseStatusEnum status;
 	CourseViewRangeEnum viewRange;
-	double price;
+	Decimal? price;
 	String? courseIntro;
 	CourseAudienceTypeEnum audienceType;
 	String? poster;
@@ -19956,7 +19961,7 @@ class OnlineTrainingDTO extends BaseDTO{
 		this.duration = 0,
 		this.status = CourseStatusEnum.Unknown,
 		this.viewRange = CourseViewRangeEnum.All,
-		this.price = 0,
+		this.price,
 		this.courseIntro,
 		this.audienceType = CourseAudienceTypeEnum.Unknown,
 		this.poster,
@@ -20012,7 +20017,7 @@ class OnlineTrainingDTO extends BaseDTO{
 			duration: map['Duration'],
 			status: CourseStatusEnum.values.firstWhere((e) => e.index == map['Status']),
 			viewRange: CourseViewRangeEnum.values.firstWhere((e) => e.index == map['ViewRange']),
-			price: double.parse(map['Price'].toString()),
+			price: map['Price'] != null ? Decimal.fromJson(map['Price']) : null,
 			courseIntro: map['CourseIntro'],
 			audienceType: CourseAudienceTypeEnum.values.firstWhere((e) => e.index == map['AudienceType']),
 			poster: map['Poster'],
@@ -20068,7 +20073,8 @@ class OnlineTrainingDTO extends BaseDTO{
 		map['Duration'] = duration;
 		map['Status'] = status.index;
 		map['ViewRange'] = viewRange.index;
-		map['Price'] = price;
+		if(price != null)
+			map['Price'] = price;
 		if(courseIntro != null)
 			map['CourseIntro'] = courseIntro;
 		map['AudienceType'] = audienceType.index;
@@ -20886,7 +20892,7 @@ class CourseAlbumDetailDTO extends CourseAlbumDTO{
 		String? teacherCode,
 		String? teacherName,
 		CourseViewRangeEnum viewRange = CourseViewRangeEnum.All,
-		double price = 0,
+		Decimal? price,
 		DateTime? createTime,
 		int sort = 0,
 		bool isStick = false,
@@ -20919,7 +20925,7 @@ class CourseAlbumDetailDTO extends CourseAlbumDTO{
 			teacherCode: map['TeacherCode'],
 			teacherName: map['TeacherName'],
 			viewRange: CourseViewRangeEnum.values.firstWhere((e) => e.index == map['ViewRange']),
-			price: double.parse(map['Price'].toString()),
+			price: map['Price'] != null ? Decimal.fromJson(map['Price']) : null,
 			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
 			sort: map['Sort'],
 			isStick: map['IsStick'],
@@ -20949,7 +20955,7 @@ class BaseCoursePageDTO {
 	CourseTypeEnum courseType;
 	CourseAudienceTypeEnum audienceType;
 	int duration;
-	double price;
+	Decimal? price;
 	List<BaseUserGroupDTO >? userGroupList;
 	List<BaseCourseAlbumDTO >? courseAlbumList;
 
@@ -20965,7 +20971,7 @@ class BaseCoursePageDTO {
 		this.courseType = CourseTypeEnum.Unknown,
 		this.audienceType = CourseAudienceTypeEnum.Unknown,
 		this.duration = 0,
-		this.price = 0,
+		this.price,
 		this.userGroupList,
 		this.courseAlbumList,
 	});
@@ -20983,7 +20989,7 @@ class BaseCoursePageDTO {
 			courseType: CourseTypeEnum.values.firstWhere((e) => e.index == map['CourseType']),
 			audienceType: CourseAudienceTypeEnum.values.firstWhere((e) => e.index == map['AudienceType']),
 			duration: map['Duration'],
-			price: double.parse(map['Price'].toString()),
+			price: map['Price'] != null ? Decimal.fromJson(map['Price']) : null,
 			userGroupList: map['UserGroupList'] != null ? (map['UserGroupList'] as List).map((e)=>BaseUserGroupDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
 			courseAlbumList: map['CourseAlbumList'] != null ? (map['CourseAlbumList'] as List).map((e)=>BaseCourseAlbumDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
 		);
@@ -21008,7 +21014,8 @@ class BaseCoursePageDTO {
 		map['CourseType'] = courseType.index;
 		map['AudienceType'] = audienceType.index;
 		map['Duration'] = duration;
-		map['Price'] = price;
+		if(price != null)
+			map['Price'] = price;
 		if(userGroupList != null)
 			map['UserGroupList'] = userGroupList;
 		if(courseAlbumList != null)
@@ -21031,7 +21038,7 @@ class CoursePageDTO extends BaseCoursePageDTO{
 		CourseTypeEnum courseType = CourseTypeEnum.Unknown,
 		CourseAudienceTypeEnum audienceType = CourseAudienceTypeEnum.Unknown,
 		int duration = 0,
-		double price = 0,
+		Decimal? price,
 		List<BaseUserGroupDTO >? userGroupList,
 		List<BaseCourseAlbumDTO >? courseAlbumList,
 	}) : super(
@@ -21064,7 +21071,7 @@ class CoursePageDTO extends BaseCoursePageDTO{
 			courseType: CourseTypeEnum.values.firstWhere((e) => e.index == map['CourseType']),
 			audienceType: CourseAudienceTypeEnum.values.firstWhere((e) => e.index == map['AudienceType']),
 			duration: map['Duration'],
-			price: double.parse(map['Price'].toString()),
+			price: map['Price'] != null ? Decimal.fromJson(map['Price']) : null,
 			userGroupList: map['UserGroupList'] != null ? (map['UserGroupList'] as List).map((e)=>BaseUserGroupDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
 			courseAlbumList: map['CourseAlbumList'] != null ? (map['CourseAlbumList'] as List).map((e)=>BaseCourseAlbumDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
 		);
@@ -21169,7 +21176,7 @@ class StudentInCoursePageDTO extends BaseCoursePageDTO{
 		CourseTypeEnum courseType = CourseTypeEnum.Unknown,
 		CourseAudienceTypeEnum audienceType = CourseAudienceTypeEnum.Unknown,
 		int duration = 0,
-		double price = 0,
+		Decimal? price,
 		List<BaseUserGroupDTO >? userGroupList,
 		List<BaseCourseAlbumDTO >? courseAlbumList,
 	}) : super(
@@ -21204,7 +21211,7 @@ class StudentInCoursePageDTO extends BaseCoursePageDTO{
 			courseType: CourseTypeEnum.values.firstWhere((e) => e.index == map['CourseType']),
 			audienceType: CourseAudienceTypeEnum.values.firstWhere((e) => e.index == map['AudienceType']),
 			duration: map['Duration'],
-			price: double.parse(map['Price'].toString()),
+			price: map['Price'] != null ? Decimal.fromJson(map['Price']) : null,
 			userGroupList: map['UserGroupList'] != null ? (map['UserGroupList'] as List).map((e)=>BaseUserGroupDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
 			courseAlbumList: map['CourseAlbumList'] != null ? (map['CourseAlbumList'] as List).map((e)=>BaseCourseAlbumDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
 		);

+ 20 - 3
lib/services/recordInfo.m.dart

@@ -513,7 +513,7 @@ enum ReferralTypeEnum {
 	ReferralOut,
 }
 
-class SimpleRecordInfoDTO {
+class SimpleRecordInfoDTO extends BaseDTO{
 	String? recordCode;
 	RecordStatusEnum recordStatus;
 	ReferralTypeEnum referralType;
@@ -542,7 +542,12 @@ class SimpleRecordInfoDTO {
 		this.rootOrganizationCode,
 		this.rootOrganizationName,
 		this.languge,
-	});
+		DateTime? createTime,
+		DateTime? updateTime,
+	}) : super(
+			createTime: createTime,
+			updateTime: updateTime,
+		);
 
 	factory SimpleRecordInfoDTO.fromJson(Map<String, dynamic> map) {
 		return SimpleRecordInfoDTO( 
@@ -559,11 +564,13 @@ class SimpleRecordInfoDTO {
 			rootOrganizationCode: map['RootOrganizationCode'],
 			rootOrganizationName: map['RootOrganizationName'],
 			languge: map['Languge'],
+			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
+			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
 		);
 	}
 
 	Map<String, dynamic> toJson() {
-		final map = Map<String, dynamic>();
+		final map = super.toJson();
 		if(recordCode != null)
 			map['RecordCode'] = recordCode;
 		map['RecordStatus'] = recordStatus.index;
@@ -614,6 +621,8 @@ class FindRecordPagesRequest extends PageRequest{
 	RecordProcessStateEnum recordProcessState;
 	String? language;
 	String? keyWord;
+	DateTime? startTime;
+	DateTime? endTime;
 
 	FindRecordPagesRequest({
 		this.organizationCodes,
@@ -622,6 +631,8 @@ class FindRecordPagesRequest extends PageRequest{
 		this.recordProcessState = RecordProcessStateEnum.All,
 		this.language,
 		this.keyWord,
+		this.startTime,
+		this.endTime,
 		int pageIndex = 0,
 		int pageSize = 0,
 		String? token,
@@ -639,6 +650,8 @@ class FindRecordPagesRequest extends PageRequest{
 			recordProcessState: RecordProcessStateEnum.values.firstWhere((e) => e.index == map['RecordProcessState']),
 			language: map['Language'],
 			keyWord: map['KeyWord'],
+			startTime: map['StartTime'] != null ? DateTime.parse(map['StartTime']) : null,
+			endTime: map['EndTime'] != null ? DateTime.parse(map['EndTime']) : null,
 			pageIndex: map['PageIndex'],
 			pageSize: map['PageSize'],
 			token: map['Token'],
@@ -657,6 +670,10 @@ class FindRecordPagesRequest extends PageRequest{
 			map['Language'] = language;
 		if(keyWord != null)
 			map['KeyWord'] = keyWord;
+		if(startTime != null)
+			map['StartTime'] = JsonRpcUtils.dateFormat(startTime!);
+		if(endTime != null)
+			map['EndTime'] = JsonRpcUtils.dateFormat(endTime!);
 		return map;
 	}
 }

+ 5 - 0
lib/services/remedical.m.dart

@@ -464,6 +464,7 @@ class DeviceFinishExamRequest extends TokenRequest{
 }
 
 class QueryExamInfoResult {
+	String? examCode;
 	DateTime? createTime;
 	String? deptName;
 	String? patientCode;
@@ -476,6 +477,7 @@ class QueryExamInfoResult {
 	RecordStatusEnum examStatus;
 
 	QueryExamInfoResult({
+		this.examCode,
 		this.createTime,
 		this.deptName,
 		this.patientCode,
@@ -490,6 +492,7 @@ class QueryExamInfoResult {
 
 	factory QueryExamInfoResult.fromJson(Map<String, dynamic> map) {
 		return QueryExamInfoResult( 
+			examCode: map['ExamCode'],
 			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
 			deptName: map['DeptName'],
 			patientCode: map['PatientCode'],
@@ -505,6 +508,8 @@ class QueryExamInfoResult {
 
 	Map<String, dynamic> toJson() {
 		final map = Map<String, dynamic>();
+		if(examCode != null)
+			map['ExamCode'] = examCode;
 		if(createTime != null)
 			map['CreateTime'] = JsonRpcUtils.dateFormat(createTime!);
 		if(deptName != null)