@ningboyz/types 1.2.0 → 1.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ningboyz/types",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "private": false,
   "description": "宁波甬政类型库",
   "author": "nbyt-syq",

package/src/hzcb/IHzcbXmtzBillResponse.ts

@@ -18,23 +18,27 @@ export interface IHzcbXmtzBillResponse {
   queuesBy: number;
   /** 年度 */
   yearFrom: number;
-  /** 申报数 */
+  /** 合同计划支付金额 */
   payMoney: number;
-  /** 审核数 */
+  /** 合同实际支付金额 */
   expMoney: number;
-	/** 一般公共预算资金 */
+  /** 合计 */
+  hjMoney1: number;
+  hjMoney2: number;
+  hjMoney3: number;
+  /** 一般公共预算资金 */
   ybMoney1: number;
   ybMoney2: number;
   ybMoney3: number;
-	/** 政府性基金 */
+  /** 政府性基金 */
   zfMoney1: number;
   zfMoney2: number;
   zfMoney3: number;
-	/** 财政专户 */
+  /** 财政专户 */
   czMoney1: number;
   czMoney2: number;
   czMoney3: number;
-	/** 其他本级 */
+  /** 其他本级 */
   qtMoney1: number;
   qtMoney2: number;
   qtMoney3: number;
@@ -60,23 +64,27 @@ export class THzcbXmtzBillResponse implements IHzcbXmtzBillResponse {
   queuesBy: number = 0;
   /** 年度 */
   yearFrom: number = 0;
-  /** 申报数 */
+  /** 合同计划支付金额 */
   payMoney: number = 0;
-  /** 审核数 */
+  /** 合同实际支付金额 */
   expMoney: number = 0;
-	/** 一般公共预算资金 */
+  /** 合计 */
+  hjMoney1: number = 0;
+  hjMoney2: number = 0;
+  hjMoney3: number = 0;
+  /** 一般公共预算资金 */
   ybMoney1: number = 0;
   ybMoney2: number = 0;
   ybMoney3: number = 0;
-	/** 政府性基金 */
+  /** 政府性基金 */
   zfMoney1: number = 0;
   zfMoney2: number = 0;
   zfMoney3: number = 0;
-	/** 财政专户 */
+  /** 财政专户 */
   czMoney1: number = 0;
   czMoney2: number = 0;
   czMoney3: number = 0;
-	/** 其他本级 */
+  /** 其他本级 */
   qtMoney1: number = 0;
   qtMoney2: number = 0;
   qtMoney3: number = 0;

package/src/hzcb/IHzcbXmtzResponse.ts

@@ -1,12 +1,14 @@
 import { Const } from "../..";
 import { IPathResponse } from "../core";
 import { TFlowDataResponse } from "../flow";
+import { IHzcbMainResponse } from "./IHzcbMainResponse";
 import { IHzcbXmtzBillResponse } from "./IHzcbXmtzBillResponse";
 
 export interface IHzcbXmtzResponse {
   whoBuild: number;
   userIndx: number;
   xmtzIndx: number;
+  hzcbMain: number;
   parentID: number;
   hashCode: number;
   dataLevl: number;
@@ -63,6 +65,9 @@ export interface IHzcbXmtzResponse {
   userName: string;
   userGUID: string;
 
+  hzcbName: string;
+
+  listFrom: IHzcbMainResponse[];
   listBill: IHzcbXmtzBillResponse[];
   listPath: IPathResponse[];
 }
@@ -71,6 +76,7 @@ export class THzcbXmtzResponse implements IHzcbXmtzResponse {
   whoBuild: number = 0;
   userIndx: number = 0;
   xmtzIndx: number = 0;
+  hzcbMain: number = 0;
   parentID: number = 0;
   hashCode: number = 0;
   dataLevl: number = 0;
@@ -127,6 +133,9 @@ export class THzcbXmtzResponse implements IHzcbXmtzResponse {
   userName: string = "";
   userGUID: string = "";
 
+  hzcbName: string = "";
+
+  listFrom: IHzcbMainResponse[] = [];
   listBill: IHzcbXmtzBillResponse[] = [];
   listPath: IPathResponse[] = [];
 

package/src/hzcb/IHzcbXmykResponse.ts

@@ -1,12 +1,15 @@
 import { Const } from "../..";
-import { IPathResponse } from "../core";
+import { IPathResponse, IUnitResponse } from "../core";
 import { TFlowDataResponse } from "../flow";
 import { IYzhtBillResponse } from "../yzht";
+import _ from "lodash";
+import { IHzcbMainResponse } from "./IHzcbMainResponse";
 
 export interface IHzcbXmykResponse {
   whoBuild: number;
   userIndx: number;
   xmykIndx: number;
+  hzcbMain: number;
   parentID: number;
   hashCode: number;
   dataLevl: number;
@@ -62,7 +65,10 @@ export interface IHzcbXmykResponse {
   lastMemo: string;
   userName: string;
   userGUID: string;
-
+  hzcbName: string;
+  
+  listFrom: IHzcbMainResponse[];
+  listUnit: IUnitResponse[];
   listBill: IYzhtBillResponse[];
   listPath: IPathResponse[];
 }
@@ -71,6 +77,7 @@ export class THzcbXmykResponse implements IHzcbXmykResponse {
   whoBuild: number = 0;
   userIndx: number = 0;
   xmykIndx: number = 0;
+  hzcbMain: number = 0;
   parentID: number = 0;
   hashCode: number = 0;
   dataLevl: number = 0;
@@ -82,34 +89,34 @@ export class THzcbXmykResponse implements IHzcbXmykResponse {
   dataType: number = 0;
   dataDate: number = 0;
   dataTime: number = 0;
-  dataGUID: string = '';
-  mastName: string = '';
-  mastGUID: string = '';
+  dataGUID: string = "";
+  mastName: string = "";
+  mastGUID: string = "";
   userMain: number = 0;
-  createBy: string = '';
+  createBy: string = "";
   createAt: number = 0;
-  updateBy: string = '';
+  updateBy: string = "";
   updateAt: number = 0;
-  deleteBy: string = '';
+  deleteBy: string = "";
   deleteAt: number = 0;
   queuesBy: number = 0;
-  entityID: string = '';
+  entityID: string = "";
   sourceND: number = 0;
   unitMain: number = 0;
   deptMain: number = 0;
   flowUndo: number = 0;
-  flowUser: string = '';
-  flowText: string = '';
+  flowUser: string = "";
+  flowText: string = "";
   menuMain: number = 0;
-  menuUUID: string = '';
-  sqbmText: string = '';
-  sqyhText: string = '';
-  xmykCode: string = '';
-  xmykName: string = '';
+  menuUUID: string = "";
+  sqbmText: string = "";
+  sqyhText: string = "";
+  xmykCode: string = "";
+  xmykName: string = "";
   xmykDate: number = 0;
   xmykStat: number = 0;
-  xmykUses: string = '';
-  xmykMemo: string = '';
+  xmykUses: string = "";
+  xmykMemo: string = "";
 
   coverURL: string = "";
   touchURL: string = "";
@@ -127,26 +134,40 @@ export class THzcbXmykResponse implements IHzcbXmykResponse {
   userName: string = "";
   userGUID: string = "";
 
+  hzcbName: string = "";
+
+  listFrom: IHzcbMainResponse[] = [];
   listBill: IYzhtBillResponse[] = [];
   listPath: IPathResponse[] = [];
-  
-    static toFlowData(xmyk: THzcbXmykResponse): TFlowDataResponse {
-      let result = new TFlowDataResponse();
-      result.whoBuild = xmyk.whoBuild;
-      result.userIndx = xmyk.userIndx;
-      result.flowMain = xmyk.flowMain;
-      result.flowNode = xmyk.flowNode;
-      result.notified = Const.Todo.CONST_STR_TODO_TYPE_TO_HZCB_XMYK_WAIT;
-      result.entityID = xmyk.entityID;
-      result.billMain = xmyk.xmykIndx;
-      result.billCode = xmyk.xmykCode;
-      result.billMemo = xmyk.xmykMemo;
-      result.outMoney =0;
-      result.createAt = xmyk.createAt;
-      result.mastName = xmyk.mastName;
-      result.createBy = xmyk.createBy;
-      result.unitMain = xmyk.unitMain;
-      result.deptMain = xmyk.deptMain;
-      return result;
+  listUnit: IUnitResponse[] = [];
+
+  constructor(card: any = {}) {
+    if (card) {
+      _.merge(this, _.pick(card, Object.keys(this)));
     }
+  }
+
+  static toFlowDatas(card: THzcbXmykResponse[]): TFlowDataResponse[] {
+    return card.map((u) => this.toFlowData(u));
+  }
+
+  static toFlowData(xmyk: THzcbXmykResponse): TFlowDataResponse {
+    let result = new TFlowDataResponse();
+    result.whoBuild = xmyk.whoBuild;
+    result.userIndx = xmyk.userIndx;
+    result.flowMain = xmyk.flowMain;
+    result.flowNode = xmyk.flowNode;
+    result.notified = Const.Todo.CONST_STR_TODO_TYPE_TO_HZCB_XMYK_WAIT;
+    result.entityID = xmyk.entityID;
+    result.billMain = xmyk.xmykIndx;
+    result.billCode = xmyk.xmykCode;
+    result.billMemo = xmyk.xmykMemo;
+    result.outMoney = 0;
+    result.createAt = xmyk.createAt;
+    result.mastName = xmyk.mastName;
+    result.createBy = xmyk.createBy;
+    result.unitMain = xmyk.unitMain;
+    result.deptMain = xmyk.deptMain;
+    return result;
+  }
 }

package/src/yzht/IYzhtBillResponse.ts

@@ -65,6 +65,10 @@ export interface IYzhtBillResponse {
 
   /** 项目名称 */
   hzcbName: string;
+  /** 支付方式名称 */
+  yzhtZffsText: string;
+  /** 用款计划 */
+  xmykIndx: number;
 }
 
 export class TYzhtBillResponse implements IYzhtBillResponse {
@@ -133,4 +137,8 @@ export class TYzhtBillResponse implements IYzhtBillResponse {
 
   /** 项目名称 */
   hzcbName: string = "";
+  /** 支付方式名称 */
+  yzhtZffsText: string = "";
+  /** 用款计划 */
+  xmykIndx: number = 0;
 }

package/src/yzht/IYzhtMainResponse.ts

@@ -149,6 +149,7 @@ export interface IYzhtMainResponse {
   periodOn: number; //是否按期控制支付
 
   yzhtZffs: number; //支付方式
+  yzhtZffsText: string;//支付方式名称
 
   userMain: number;
   coverURL: string;
@@ -299,6 +300,7 @@ export class TYzhtMainResponse implements IYzhtMainResponse {
   periodOn: number = 0;
 
   yzhtZffs: number = 0; //支付方式
+  yzhtZffsText: string = "";//支付方式名称
 
   yzhtType: number = 0;
   yzhtTypeText: string = "";