更新rpc

src/jsonrpc/services/servicePack.m.js

@@ -294,7 +294,7 @@ exports.CreateServiceItemRequest = CreateServiceItemRequest;
 var ServiceItemDTO = /** @class */ (function (_super) {
     __extends(ServiceItemDTO, _super);
     function ServiceItemDTO(_a) {
-        var code = _a.code, name = _a.name, content = _a.content, serviceItemType = _a.serviceItemType, serviceNumber = _a.serviceNumber, department = _a.department, guidancePrice = _a.guidancePrice, adjustedPrice = _a.adjustedPrice, totalPrice = _a.totalPrice, priceExplanation = _a.priceExplanation, organizationCode = _a.organizationCode, _b = _a.isDelete, isDelete = _b === void 0 ? false : _b, createTime = _a.createTime, updateTime = _a.updateTime;
+        var code = _a.code, name = _a.name, content = _a.content, serviceItemType = _a.serviceItemType, serviceNumber = _a.serviceNumber, department = _a.department, guidancePrice = _a.guidancePrice, adjustedPrice = _a.adjustedPrice, totalPrice = _a.totalPrice, priceExplanation = _a.priceExplanation, organizationCode = _a.organizationCode, organizationName = _a.organizationName, _b = _a.isDelete, isDelete = _b === void 0 ? false : _b, createTime = _a.createTime, updateTime = _a.updateTime;
         var _this = _super.call(this, {
             isDelete: isDelete,
             createTime: createTime,
@@ -311,6 +311,7 @@ var ServiceItemDTO = /** @class */ (function (_super) {
         _this.totalPrice = totalPrice;
         _this.priceExplanation = priceExplanation;
         _this.organizationCode = organizationCode;
+        _this.organizationName = organizationName;
         _this.isDelete = isDelete || false;
         _this.createTime = createTime;
         _this.updateTime = updateTime;
@@ -328,6 +329,7 @@ var ServiceItemDTO = /** @class */ (function (_super) {
             totalPrice: map['TotalPrice'],
             priceExplanation: map['PriceExplanation'],
             organizationCode: map['OrganizationCode'],
+            organizationName: map['OrganizationName'],
             isDelete: map['IsDelete'],
             createTime: map['CreateTime'] !== null ? new Date(map['CreateTime']) : null,
             updateTime: map['UpdateTime'] !== null ? new Date(map['UpdateTime']) : null,
@@ -356,6 +358,8 @@ var ServiceItemDTO = /** @class */ (function (_super) {
             map['PriceExplanation'] = this.priceExplanation;
         if (this.organizationCode != null)
             map['OrganizationCode'] = this.organizationCode;
+        if (this.organizationName != null)
+            map['OrganizationName'] = this.organizationName;
         return map;
     };
     return ServiceItemDTO;
@@ -389,13 +393,14 @@ exports.GetServiceItemRequest = GetServiceItemRequest;
 var GetServiceItemPageRequest = /** @class */ (function (_super) {
     __extends(GetServiceItemPageRequest, _super);
     function GetServiceItemPageRequest(_a) {
-        var code = _a.code, 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 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.code = code;
+        _this.filterDefaultItems = filterDefaultItems || false;
         _this.organizationCode = organizationCode;
         _this.pageIndex = pageIndex || 0;
         _this.pageSize = pageSize || 0;
@@ -404,6 +409,7 @@ var GetServiceItemPageRequest = /** @class */ (function (_super) {
     }
     GetServiceItemPageRequest.fromJson = function (map) {
         return new GetServiceItemPageRequest({ code: map['Code'],
+            filterDefaultItems: map['FilterDefaultItems'],
             organizationCode: map['OrganizationCode'],
             pageIndex: map['PageIndex'],
             pageSize: map['PageSize'],
@@ -414,6 +420,7 @@ var GetServiceItemPageRequest = /** @class */ (function (_super) {
         var map = _super.prototype.toJson.call(this);
         if (this.code != null)
             map['Code'] = this.code;
+        map['FilterDefaultItems'] = this.filterDefaultItems;
         if (this.organizationCode != null)
             map['OrganizationCode'] = this.organizationCode;
         return map;

src/jsonrpc/services/servicePack.m.ts

@@ -362,6 +362,7 @@ export class ServiceItemDTO extends BaseDTO {
 	totalPrice: String;
 	priceExplanation: String;
 	organizationCode: String;
+	organizationName: String;
 
 	constructor({
 		code,
@@ -375,6 +376,7 @@ export class ServiceItemDTO extends BaseDTO {
 		totalPrice,
 		priceExplanation,
 		organizationCode,
+		organizationName,
 		isDelete= false,
 		createTime,
 		updateTime,
@@ -395,6 +397,7 @@ export class ServiceItemDTO extends BaseDTO {
 		this.totalPrice = totalPrice;
 		this.priceExplanation = priceExplanation;
 		this.organizationCode = organizationCode;
+		this.organizationName = organizationName;
 		this.isDelete = isDelete||false;
 		this.createTime = createTime;
 		this.updateTime = updateTime;
@@ -413,6 +416,7 @@ export class ServiceItemDTO extends BaseDTO {
 			totalPrice: map['TotalPrice'],
 			priceExplanation: map['PriceExplanation'],
 			organizationCode: map['OrganizationCode'],
+			organizationName: map['OrganizationName'],
 			isDelete: map['IsDelete'],
 			createTime: map['CreateTime'] !== null ? new Date(map['CreateTime']) : null,
 			updateTime: map['UpdateTime'] !== null ? new Date(map['UpdateTime']) : null,
@@ -442,6 +446,8 @@ export class ServiceItemDTO extends BaseDTO {
 			map['PriceExplanation'] = this.priceExplanation;
 		if(this.organizationCode != null)
 			map['OrganizationCode'] = this.organizationCode;
+		if(this.organizationName != null)
+			map['OrganizationName'] = this.organizationName;
 		return map;
 	}
 }
@@ -477,10 +483,12 @@ export class GetServiceItemRequest extends TokenRequest {
 
 export class GetServiceItemPageRequest extends PageRequest {
 	code: String;
+	filterDefaultItems: boolean;
 	organizationCode: String;
 
 	constructor({
 		code,
+		filterDefaultItems,
 		organizationCode,
 		pageIndex= 0,
 		pageSize= 0,
@@ -492,6 +500,7 @@ export class GetServiceItemPageRequest extends PageRequest {
 		token,
 		});
 		this.code = code;
+		this.filterDefaultItems = filterDefaultItems||false;
 		this.organizationCode = organizationCode;
 		this.pageIndex = pageIndex||0;
 		this.pageSize = pageSize||0;
@@ -501,6 +510,7 @@ export class GetServiceItemPageRequest extends PageRequest {
 	static fromJson(map: { [key: string]: any }): GetServiceItemPageRequest {
 		return new GetServiceItemPageRequest( 
 { 			code: map['Code'],
+			filterDefaultItems: map['FilterDefaultItems'],
 			organizationCode: map['OrganizationCode'],
 			pageIndex: map['PageIndex'],
 			pageSize: map['PageSize'],
@@ -512,6 +522,7 @@ export class GetServiceItemPageRequest extends PageRequest {
 		const map: Record<string, unknown> = super.toJson();
 		if(this.code != null)
 			map['Code'] = this.code;
+		map['FilterDefaultItems'] = this.filterDefaultItems;
 		if(this.organizationCode != null)
 			map['OrganizationCode'] = this.organizationCode;
 		return map;