@ningboyz/types 1.2.152 → 1.2.153

package/package.json

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

package/src/const/const_hznk.ts

@@ -1,25 +1,24 @@
 export const CONST_HZNK_DATA_DATA_TYPE_TO_个人荣誉 = 1001;
 export const CONST_HZNK_DATA_DATA_TYPE_TO_人才称号 = 1002;
 
+export const CONST_HZNK_DATA_DATA_TYPE_TO_知识产权 = 1003;
+export const CONST_HZNK_DATA_DATA_TYPE_TO_论文著作 = 1004;
+export const CONST_HZNK_DATA_DATA_TYPE_TO_软著专利 = 1005;
+export const CONST_HZNK_DATA_DATA_TYPE_TO_品种技术 = 1017;
+export const CONST_HZNK_DATA_DATA_TYPE_TO_发布标准 = 1006;
+export const CONST_HZNK_DATA_DATA_TYPE_TO_获奖申请 = 1007;
+export const CONST_HZNK_DATA_DATA_TYPE_TO_获奖成果 = 1008;
+export const CONST_HZNK_DATA_DATA_TYPE_TO_领导批示 = 1009;
 // #Note
 export const CONST_HZNK_DATA_DATA_TYPE_TO_实施方案 = 1001; //#实施方案
 export const CONST_HZNK_DATA_DATA_TYPE_TO_工作计划 = 1002; //#工作计划
 export const CONST_HZNK_DATA_DATA_TYPE_TO_工作总结 = 1003; //#工作总结
 export const CONST_HZNK_DATA_DATA_TYPE_TO_年终汇报 = 1004; //#年终汇报
 
-export const CONST_HZNK_DATA_DATA_TYPE_TO_知识产权 = 1003
-export const CONST_HZNK_DATA_DATA_TYPE_TO_论文著作 = 1004
-export const CONST_HZNK_DATA_DATA_TYPE_TO_软著专利 = 1005
-export const CONST_HZNK_DATA_DATA_TYPE_TO_品种技术 = 1017
-export const CONST_HZNK_DATA_DATA_TYPE_TO_发布标准 = 1006
-export const CONST_HZNK_DATA_DATA_TYPE_TO_获奖申请 = 1007
-export const CONST_HZNK_DATA_DATA_TYPE_TO_获奖成果 = 1008
-export const CONST_HZNK_DATA_DATA_TYPE_TO_领导批示 = 1009
-
-export const CONST_HZNK_DATA_DATA_TYPE_TO_信息宣传 = 1010
-export const CONST_HZNK_DATA_DATA_TYPE_TO_对口帮扶 = 1011
-export const CONST_HZNK_DATA_DATA_TYPE_TO_对外培训 = 1012
-export const CONST_HZNK_DATA_DATA_TYPE_TO_科技特派 = 1013
-export const CONST_HZNK_DATA_DATA_TYPE_TO_学术交流 = 1014
-export const CONST_HZNK_DATA_DATA_TYPE_TO_平台创建 = 1015
-export const CONST_HZNK_DATA_DATA_TYPE_TO_创建团队 = 1016
+export const CONST_HZNK_DATA_DATA_TYPE_TO_信息宣传 = 1010;
+export const CONST_HZNK_DATA_DATA_TYPE_TO_对口帮扶 = 1011;
+export const CONST_HZNK_DATA_DATA_TYPE_TO_对外培训 = 1012;
+export const CONST_HZNK_DATA_DATA_TYPE_TO_科技特派 = 1013;
+export const CONST_HZNK_DATA_DATA_TYPE_TO_学术交流 = 1014;
+export const CONST_HZNK_DATA_DATA_TYPE_TO_平台创建 = 1015;
+export const CONST_HZNK_DATA_DATA_TYPE_TO_创建团队 = 1016;

package/src/hznk/IHznkDataItemResponse.ts

@@ -1,4 +1,5 @@
 import { IUserLiteResponse } from "../core";
+import _ from "lodash";
 
 export interface IHznkDataItemResponse {
   whoBuild: number;
@@ -57,4 +58,10 @@ export class THznkDataItemResponse implements IHznkDataItemResponse {
   dictName: string = "";
 
   listUser: IUserLiteResponse[] = [];
+
+  constructor(data: Partial<IHznkDataItemResponse> = {}) {
+    if (data) {
+      _.merge(this, _.pick(data, Object.keys(this)));
+    }
+  }
 }

package/src/hznk/IHznkFydwResponse.ts

@@ -2,6 +2,7 @@ import { IPathResponse } from "../core/IPathResponse";
 import { TFlowDataResponse } from "../flow";
 import { IHznkFydwBillResponse } from "./IHznkFydwBillResponse";
 import { IHznkFydwItemResponse } from "./IHznkFydwItemResponse";
+import { IHznkFydwWbdwResponse } from "./IHznkFydwWbdwResponse";
 import { IHznkMainResponse } from "./IHznkMainResponse";
 
 export interface IHznkFydwResponse {
@@ -67,18 +68,20 @@ export interface IHznkFydwResponse {
   lastMemo: string;
   userName: string;
   userGUID: string;
-  // 联系方式
+  /**联系方式 */
   dContact: string;
-  // 联系人
+  /**联系人 */
   wContact: string;
   /**附件 */
   listPath: IPathResponse[];
-  // 赋分信息区
+  /**赋分信息区 */
   listItem: IHznkFydwItemResponse[];
-  // 到位经费信息区
+  /**到位经费信息区 */
   listBill: IHznkFydwBillResponse[];
-  // 项目信息区
+  /**项目信息区 */
   listFrom: IHznkMainResponse[];
+  /**当年外拨经费 */
+  listWBDW: IHznkFydwWbdwResponse[];
 }
 
 export class THznkFydwResponse implements IHznkFydwResponse {
@@ -147,6 +150,7 @@ export class THznkFydwResponse implements IHznkFydwResponse {
   listItem: IHznkFydwItemResponse[] = [];
   listBill: IHznkFydwBillResponse[] = [];
   listFrom: IHznkMainResponse[] = [];
+  listWBDW: IHznkFydwWbdwResponse[] = [];
 
   static toFlowDatas(card: IHznkFydwResponse[]): TFlowDataResponse[] {
     return card.map((u) => this.toFlowData(u));

package/src/hznk/IHznkFydwWbdwResponse.ts

@@ -0,0 +1,57 @@
+export interface IHznkFydwWbdwResponse {
+  whoBuild: number;
+  userIndx: number;
+  fydwIndx: number;
+  idEntity: number;
+  wbdwMain: number;
+  dataStat: number;
+  dataHide: number;
+  dataOrdr: number;
+  dataFrom: number;
+  dataType: number;
+  dataDate: number;
+  dataTime: number;
+  createBy: string;
+  createAt: number;
+  updateBy: string;
+  updateAt: number;
+  deleteBy: string;
+  deleteAt: number;
+  queuesBy: number;
+  fydwDate: number;
+  totalVal: number;
+  innerVal: number;
+  outerVal: number;
+  nowMoney: number;
+  ratioVal: number;
+  limitVal: number;
+}
+
+export class THznkFydwWbdwResponse implements IHznkFydwWbdwResponse {
+  whoBuild: number = 0;
+  userIndx: number = 0;
+  fydwIndx: number = 0;
+  idEntity: number = 0;
+  wbdwMain: number = 0;
+  dataStat: number = 0;
+  dataHide: number = 0;
+  dataOrdr: number = 0;
+  dataFrom: number = 0;
+  dataType: number = 0;
+  dataDate: number = 0;
+  dataTime: number = 0;
+  createBy: string = "";
+  createAt: number = 0;
+  updateBy: string = "";
+  updateAt: number = 0;
+  deleteBy: string = "";
+  deleteAt: number = 0;
+  queuesBy: number = 0;
+  fydwDate: number = 0;
+  totalVal: number = 0;
+  innerVal: number = 0;
+  outerVal: number = 0;
+  nowMoney: number = 0;
+  ratioVal: number = 0;
+  limitVal: number = 0;
+}

package/src/hznk/IHznkFytqResponse.ts

@@ -1,6 +1,7 @@
 import { IUserAcnoResponse } from "../core";
 import { IPathResponse } from "../core/IPathResponse";
 import { IHznkFytqBillResponse } from "./IHznkFytqBillResponse";
+import { IHznkFytqWbdwResponse } from "./IHznkFytqWbdwResponse";
 import { IHznkMainResponse } from "./IHznkMainResponse";
 
 export interface IHznkFytqResponse {

package/src/hznk/IHznkNoteResponse.ts

@@ -53,6 +53,10 @@ export interface IHznkNoteResponse {
   baseUses: string;
   /**备注信息 */
   baseMemo: string;
+  /**联系人 */
+  wContact: string;
+  /**联系方式 */
+  dContact: string;  
 
   /**附件 */
   listPath: IPathResponse[];
@@ -110,11 +114,12 @@ export class THznkNoteResponse implements IHznkNoteResponse {
   flowMain: number = 0;
   flowNode: number = 0;
   flowStat: number = 0;
+  wContact: string = "";
+  dContact: string = "";
 
   listPath: IPathResponse[] = [];
   listFrom: IHznkMainResponse[] = [];
 
-
   static toFlowDatas(card: IHznkNoteResponse[]): TFlowDataResponse[] {
     return card.map((u) => this.toFlowData(u));
   }

package/src/hznk/index.ts

@@ -10,10 +10,12 @@ import { IHznkBaseWbdwResponse, THznkBaseWbdwResponse } from "./IHznkBaseWbdwRes
 import { IHznkBasePathResponse, THznkBasePathResponse } from "./IHznkBasePathResponse";
 
 import { IHznkFydwResponse, THznkFydwResponse } from "./IHznkFydwResponse";
+import { IHznkFydwWbdwResponse, THznkFydwWbdwResponse } from "./IHznkFydwWbdwResponse";
 import { IHznkFydwBillResponse, THznkFydwBillResponse } from "./IHznkFydwBillResponse";
 import { IHznkFydwFromResponse, THznkFydwFromResponse } from "./IHznkFydwFromResponse";
 import { IHznkFydwItemResponse, THznkFydwItemResponse } from "./IHznkFydwItemResponse";
 import { IHznkFydwPathResponse, THznkFydwPathResponse } from "./IHznkFydwPathResponse";
+
 import { IHznkDataNbyhResponse, THznkDataNbyhResponse } from "./IHznkDataNbyhResponse";
 import { IHznkMainResponse, THznkMainResponse } from "./IHznkMainResponse";
 
@@ -46,6 +48,7 @@ export {
   THznkFydwFromResponse,
   THznkFydwItemResponse,
   THznkFydwPathResponse,
+  THznkFydwWbdwResponse,
   THznkDataNbyhResponse,
   THznkMainResponse,
   THznkNoteResponse,
@@ -71,6 +74,7 @@ export {
   type IHznkFydwFromResponse,
   type IHznkFydwItemResponse,
   type IHznkFydwPathResponse,
+  type IHznkFydwWbdwResponse,
   type IHznkDataNbyhResponse,
   type IHznkMainResponse,
   type IHznkNoteResponse,

package/src/tabl/ITablMainResponse.ts

@@ -145,7 +145,6 @@ export class TTablMainResponse implements ITablMainResponse {
   unitType: number = 0;
   unitTypeText: string = "";
   taskMain: number = 0;
-
   listData: Array<ITablDataResponse> = [];
 
   constructor(card: keyof ITablMainResponse | object) {
@@ -154,6 +153,10 @@ export class TTablMainResponse implements ITablMainResponse {
     }
   }
 
+  static merge = (slef: ITablMainResponse, tabl: TTablMainResponse | object) => {
+    _.merge(slef, _.pick(tabl, Object.keys(slef)));
+  };
+
   static toFlowDatas(card: ITablMainResponse[]): TFlowDataResponse[] {
     return card.map((u) => this.toFlowData(u));
   }