jeremy 10 сар өмнө
parent
commit
c359ac06a7

+ 2 - 0
src/jsonrpc/services/authentication.m.js

@@ -9302,6 +9302,8 @@ var CustomerRpcCode;
     CustomerRpcCode[CustomerRpcCode["RepeatedContract"] = 9018] = "RepeatedContract";
     CustomerRpcCode[CustomerRpcCode["DataRepeat"] = 9019] = "DataRepeat";
     CustomerRpcCode[CustomerRpcCode["LicenseURMConfigOrExpireError"] = 9020] = "LicenseURMConfigOrExpireError";
+    CustomerRpcCode[CustomerRpcCode["LicenseBindAgencyExist"] = 9021] = "LicenseBindAgencyExist";
+    CustomerRpcCode[CustomerRpcCode["LicenseIdOrDongleIdOrAgencyNameOrContentEmptyError"] = 9022] = "LicenseIdOrDongleIdOrAgencyNameOrContentEmptyError";
 })(CustomerRpcCode || (exports.CustomerRpcCode = CustomerRpcCode = {}));
 var ValidateTokenResult = /** @class */ (function () {
     function ValidateTokenResult(_a) {

+ 2 - 0
src/jsonrpc/services/authentication.m.ts

@@ -9397,6 +9397,8 @@ export enum CustomerRpcCode {
 	RepeatedContract,
 	DataRepeat,
 	LicenseURMConfigOrExpireError,
+	LicenseBindAgencyExist,
+	LicenseIdOrDongleIdOrAgencyNameOrContentEmptyError,
 }
 
 export class ValidateTokenResult {

+ 13 - 7
src/jsonrpc/services/exam.m.js

@@ -727,22 +727,28 @@ var UpdateExamByBatchNumberRequest = /** @class */ (function (_super) {
     return UpdateExamByBatchNumberRequest;
 }(authentication_m_1.TokenRequest));
 exports.UpdateExamByBatchNumberRequest = UpdateExamByBatchNumberRequest;
-var GetExamListByPhysicalExamNumberRequest = /** @class */ (function () {
+var GetExamListByPhysicalExamNumberRequest = /** @class */ (function (_super) {
+    __extends(GetExamListByPhysicalExamNumberRequest, _super);
     function GetExamListByPhysicalExamNumberRequest(_a) {
-        var physicalExamNumber = _a.physicalExamNumber;
-        this.physicalExamNumber = physicalExamNumber;
+        var physicalExamNumber = _a.physicalExamNumber, token = _a.token;
+        var _this = _super.call(this, {
+            token: token,
+        }) || this;
+        _this.physicalExamNumber = physicalExamNumber;
+        _this.token = token;
+        return _this;
     }
     GetExamListByPhysicalExamNumberRequest.fromJson = function (map) {
         return new GetExamListByPhysicalExamNumberRequest({ physicalExamNumber: map['PhysicalExamNumber'],
+            token: map['Token'],
         });
     };
     GetExamListByPhysicalExamNumberRequest.prototype.toJson = function () {
-        var map = {};
-        if (this.physicalExamNumber !== null) {
+        var map = _super.prototype.toJson.call(this);
+        if (this.physicalExamNumber != null)
             map['PhysicalExamNumber'] = this.physicalExamNumber;
-        }
         return map;
     };
     return GetExamListByPhysicalExamNumberRequest;
-}());
+}(authentication_m_1.TokenRequest));
 exports.GetExamListByPhysicalExamNumberRequest = GetExamListByPhysicalExamNumberRequest;

+ 11 - 8
src/jsonrpc/services/exam.m.ts

@@ -931,28 +931,31 @@ export class UpdateExamByBatchNumberRequest extends TokenRequest {
 	}
 }
 
-export class GetExamListByPhysicalExamNumberRequest {
-	 physicalExamNumber: String|null;
+export class GetExamListByPhysicalExamNumberRequest extends TokenRequest {
+	physicalExamNumber: String;
 
 	constructor({
 		physicalExamNumber,
-	}: {
-	 physicalExamNumber: String|null;
+		token,
 	}) {
+		super({
+		token,
+		});
 		this.physicalExamNumber = physicalExamNumber;
+		this.token = token;
 	}
 
 	static fromJson(map: { [key: string]: any }): GetExamListByPhysicalExamNumberRequest {
 		return new GetExamListByPhysicalExamNumberRequest( 
 { 			physicalExamNumber: map['PhysicalExamNumber'],
+			token: map['Token'],
 }		);
 	}
 
-	toJson(): { [key: string]: any } {
-		const map: { [key: string]: any } = {};
-		if (this.physicalExamNumber !== null) {
+	toJson(): Record<string, unknown> {
+		const map: Record<string, unknown> = super.toJson();
+		if(this.physicalExamNumber != null)
 			map['PhysicalExamNumber'] = this.physicalExamNumber;
-		}
 		return map;
 	}
 }

+ 14 - 2
src/jsonrpc/services/servicePack.m.js

@@ -393,12 +393,15 @@ exports.GetServiceItemRequest = GetServiceItemRequest;
 var GetServiceItemPageRequest = /** @class */ (function (_super) {
     __extends(GetServiceItemPageRequest, _super);
     function GetServiceItemPageRequest(_a) {
-        var code = _a.code, filterDefaultItems = _a.filterDefaultItems, organizationCode = _a.organizationCode, _b = _a.pageIndex, pageIndex = _b === void 0 ? 0 : _b, _c = _a.pageSize, pageSize = _c === void 0 ? 0 : _c, token = _a.token;
+        var keyword = _a.keyword, startTime = _a.startTime, endTime = _a.endTime, code = _a.code, filterDefaultItems = _a.filterDefaultItems, organizationCode = _a.organizationCode, _b = _a.pageIndex, pageIndex = _b === void 0 ? 0 : _b, _c = _a.pageSize, pageSize = _c === void 0 ? 0 : _c, token = _a.token;
         var _this = _super.call(this, {
             pageIndex: pageIndex,
             pageSize: pageSize,
             token: token,
         }) || this;
+        _this.keyword = keyword;
+        _this.startTime = startTime;
+        _this.endTime = endTime;
         _this.code = code;
         _this.filterDefaultItems = filterDefaultItems || false;
         _this.organizationCode = organizationCode;
@@ -408,7 +411,10 @@ var GetServiceItemPageRequest = /** @class */ (function (_super) {
         return _this;
     }
     GetServiceItemPageRequest.fromJson = function (map) {
-        return new GetServiceItemPageRequest({ code: map['Code'],
+        return new GetServiceItemPageRequest({ keyword: map['Keyword'],
+            startTime: map['StartTime'] !== null ? new Date(map['StartTime']) : null,
+            endTime: map['EndTime'] !== null ? new Date(map['EndTime']) : null,
+            code: map['Code'],
             filterDefaultItems: map['FilterDefaultItems'],
             organizationCode: map['OrganizationCode'],
             pageIndex: map['PageIndex'],
@@ -418,6 +424,12 @@ var GetServiceItemPageRequest = /** @class */ (function (_super) {
     };
     GetServiceItemPageRequest.prototype.toJson = function () {
         var map = _super.prototype.toJson.call(this);
+        if (this.keyword != null)
+            map['Keyword'] = this.keyword;
+        if (this.startTime != null)
+            map['StartTime'] = JsonRpcUtils_1.default.dateFormat(this.startTime);
+        if (this.endTime != null)
+            map['EndTime'] = JsonRpcUtils_1.default.dateFormat(this.endTime);
         if (this.code != null)
             map['Code'] = this.code;
         map['FilterDefaultItems'] = this.filterDefaultItems;

+ 19 - 1
src/jsonrpc/services/servicePack.m.ts

@@ -482,11 +482,17 @@ export class GetServiceItemRequest extends TokenRequest {
 }
 
 export class GetServiceItemPageRequest extends PageRequest {
+	keyword: String;
+	startTime: Date|null;
+	endTime: Date|null;
 	code: String;
 	filterDefaultItems: boolean;
 	organizationCode: String;
 
 	constructor({
+		keyword,
+		startTime,
+		endTime,
 		code,
 		filterDefaultItems,
 		organizationCode,
@@ -499,6 +505,9 @@ export class GetServiceItemPageRequest extends PageRequest {
 		pageSize,
 		token,
 		});
+		this.keyword = keyword;
+		this.startTime = startTime;
+		this.endTime = endTime;
 		this.code = code;
 		this.filterDefaultItems = filterDefaultItems||false;
 		this.organizationCode = organizationCode;
@@ -509,7 +518,10 @@ export class GetServiceItemPageRequest extends PageRequest {
 
 	static fromJson(map: { [key: string]: any }): GetServiceItemPageRequest {
 		return new GetServiceItemPageRequest( 
-{ 			code: map['Code'],
+{ 			keyword: map['Keyword'],
+			startTime: map['StartTime'] !== null ? new Date(map['StartTime']) : null,
+			endTime: map['EndTime'] !== null ? new Date(map['EndTime']) : null,
+			code: map['Code'],
 			filterDefaultItems: map['FilterDefaultItems'],
 			organizationCode: map['OrganizationCode'],
 			pageIndex: map['PageIndex'],
@@ -520,6 +532,12 @@ export class GetServiceItemPageRequest extends PageRequest {
 
 	toJson(): Record<string, unknown> {
 		const map: Record<string, unknown> = super.toJson();
+		if(this.keyword != null)
+			map['Keyword'] = this.keyword;
+		if(this.startTime != null)
+			map['StartTime'] = JsonRpcUtils.dateFormat(this.startTime!);
+		if(this.endTime != null)
+			map['EndTime'] = JsonRpcUtils.dateFormat(this.endTime!);
 		if(this.code != null)
 			map['Code'] = this.code;
 		map['FilterDefaultItems'] = this.filterDefaultItems;