@ningboyz/types 1.2.187 → 1.2.188

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ningboyz/types",
   "type": "module",
-  "version": "1.2.187",
+  "version": "1.2.188",
   "private": false,
   "description": "宁波甬政类型库",
   "author": "nbyt-syq",

package/src/hzcb/IHzcbNdjhResponse.ts

@@ -53,6 +53,8 @@ export interface IHzcbNdjhResponse {
   ndjhName: string;
   /**申请用途 */
   ndjhUses: string;
+  /**基地ID */
+  hzcbMain: number;
   /**基地名称 */
   hzcbName: string;
   /**备注说明 */
@@ -123,6 +125,7 @@ export class THzcbNdjhResponse implements IHzcbNdjhResponse {
   ndjhCode: string = "";
   ndjhName: string = "";
   ndjhUses: string = "";
+  hzcbMain: number = 0;
   hzcbName: string = "";
   ndjhMemo: string = "";
 

package/src/hznj/IHznjBillResponse.ts

@@ -1,3 +1,5 @@
+import _ from "lodash";
+
 export interface IHznjBillResponse {
   whoBuild: number;
   userIndx: number;
@@ -64,4 +66,10 @@ export class THznjBillResponse implements IHznjBillResponse {
   fromWhoBuild: number = 0;
   fromUserIndx: number = 0;
   fromNotiBill: number = 0;
+
+  constructor(data: Partial<IHznjBillResponse> = {}) {
+    if (data) {
+      _.merge(this, _.pick(data, Object.keys(this)));
+    }
+  }
 }

package/src/hznj/IHznjMainResponse.ts

@@ -1,4 +1,6 @@
 import { THznj, TCore } from "..";
+import _ from "lodash";
+import {TFlowDataResponse} from "../flow";
 
 export interface IHznjMainResponse {
   whoBuild: number;
@@ -63,6 +65,8 @@ export interface IHznjMainResponse {
   lastMemo: string;
   userName: string;
   userGUID: string;
+  flowMain: number;
+  flowNode: number;
 
   /**附件 */
   listPath: TCore.IPathResponse[];
@@ -133,8 +137,42 @@ export class THznjMainResponse implements IHznjMainResponse {
   lastMemo: string = "";
   userName: string = "";
   userGUID: string = "";
+  flowMain: number = 0;
+  flowNode: number = 0;
+
 
   listPath: TCore.IPathResponse[] = [];
   listBill: THznj.IHznjBillResponse[] = [];
   listFrom: THznj.IHznjNotiResponse[] = [];
+
+  constructor(data: Partial<IHznjMainResponse> = {}) {
+    if (data) {
+      _.merge(this, _.pick(data, Object.keys(this)));
+    }
+  }
+
+  static toFlowData(data: IHznjMainResponse): TFlowDataResponse {
+    const result = new TFlowDataResponse();
+    result.whoBuild = data.whoBuild;
+    result.userIndx = data.userIndx;
+    result.flowMain = data.flowMain;
+    result.flowNode = data.flowNode;
+    result.notified = "";
+    result.entityID = data.entityID;
+    result.billMain = data.hznjIndx;
+    result.billCode = data.hznjCode;
+    result.billMemo = data.hznjMemo;
+    result.flowStat = data.hznjStat;
+    result.createAt = data.createAt;
+    result.mastName = data.mastName;
+    result.createBy = data.createBy;
+    result.unitMain = data.unitMain;
+    result.deptMain = data.deptMain;
+    result.menuUUID = data.menuUUID;
+    return result;
+  }
+
+  static toFlowDatas(list: IHznjMainResponse[]): TFlowDataResponse[] {
+    return list.map((data) => this.toFlowData(data));
+  }
 }

package/src/hznj/IHznjZbthResponse.ts

@@ -1,6 +1,6 @@
 import { THznj, TCore } from "..";
 import _ from "lodash";
-import {TFlowDataResponse} from "../flow";
+import { TFlowDataResponse } from "../flow";
 
 export interface IHznjZbthResponse {
   whoBuild: number;
@@ -73,8 +73,8 @@ export interface IHznjZbthResponse {
   /**附件 */
   listPath: TCore.IPathResponse[];
   listBill: THznj.IHznjZbthBillResponse[];
-  /** 关联结果 */
-  listFrom: THznj.IHznjZbjgResponse[];
+  /** 关联领用 */
+  listFrom: THznj.IHznjZblyResponse[];
 }
 
 export class THznjZbthResponse implements IHznjZbthResponse {
@@ -140,7 +140,7 @@ export class THznjZbthResponse implements IHznjZbthResponse {
 
   listPath: TCore.IPathResponse[] = [];
   listBill: THznj.IHznjZbthBillResponse[] = [];
-  listFrom: THznj.IHznjZbjgResponse[] = [];
+  listFrom: THznj.IHznjZblyResponse[] = [];
 
   constructor(data: Partial<IHznjZbthResponse> = {}) {
     if (data) {