@ningboyz/types 1.1.48 → 1.1.50

package/package.json

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

package/src/enums/editMode.ts

@@ -16,4 +16,6 @@ export enum TEditMode {
   emSend, // 送审
   emReview, // 复核
   emAccept, // 验收
+  emWriteReport // 填报
+
 }

package/src/gzzd/IGzzdMainResponse.ts

@@ -1,4 +1,6 @@
+import { TFlowDataResponse } from "../flow/IFlowDataResponse";
 import { IGzzdBillResponse } from "./IGzzdBillResponse";
+import _ from "lodash";
 
 export interface IGzzdMainResponse {
   whoBuild: number;
@@ -169,4 +171,39 @@ export class TGzzdMainResponse implements IGzzdMainResponse {
   fromGzjgQueuesBy: number = 0; // 工资结构按照Y中的顺序进行排序
   taskPara: string = "";
   listBill: Array<IGzzdBillResponse> = [];
+
+  constructor(card: keyof IGzzdMainResponse | object) {
+    if (card) {
+      _.merge(this, _.pick(card, Object.keys(this)));
+    }
+  }
+
+  static toFlowDatas(card: IGzzdMainResponse[]): TFlowDataResponse[] {
+    return card.map((u) => this.toFlowData(u));
+  }
+
+  //#进入流程
+  static toFlowData(myoa: IGzzdMainResponse): TFlowDataResponse {
+    const result = new TFlowDataResponse();
+    result.whoBuild = myoa.whoBuild;
+    result.userIndx = myoa.userIndx;
+    result.flowMain = myoa.flowMain;
+    result.flowNode = myoa.flowNode;
+    // result.notified = Const.Todo.CONST_STR_TODO_TYPE_TO_HTQD_WAIT;
+    result.entityID = myoa.entityID;
+    result.billMain = myoa.gzzdIndx;
+    result.billCode = myoa.gzzdCode;
+    result.billMemo = myoa.gzzdMemo;
+    result.billUses = "";
+    result.ysxmText = "";
+    result.outMoney = 0;
+    result.createAt = myoa.createAt;
+    result.mastName = myoa.mastName;
+    result.createBy = myoa.createBy;
+    result.unitMain = myoa.unitMain;
+    result.menuUUID = myoa.menuUUID;
+    result.deptMain = myoa.deptMain;
+    result.flowStat = myoa.gzzdStat;
+    return result;
+  }
 }

package/src/noti/INotiMainResponse.ts

@@ -126,78 +126,86 @@ export interface INotiMainResponse {
   unitArray?: number[];
   diskArray?: number[];
 
-  /** 
+  /**
    * 栏目名称
    */
   columnBy: string;
-  /** 
+  /**
    * 编辑排版
    */
   editedBy: string;
-  /** 
+  /**
    * 服务对象
    */
   directAt: number;
-  /** 
+  /**
    * 截止日期
    */
   endedDay: number;
-  /** 
+  /**
    * 撰稿人
    */
   sqyhText: string;
-  /** 
+  /**
    * 印发份数
    */
   issueCnt: number;
-  /** 
+  /**
    * 行政规范性文件
    */
   zdField1: number;
-  /** 
+  /**
    * 党的规范性文件
    */
   zdField2: number;
-  /** 
+  /**
    * 市场公平竞争审查意见
    */
   zdField3: number;
-  /** 
+  /**
    * 信息公开审查意见
    */
   zdField4: number;
-  /** 
+  /**
    * 密级
    */
   secretID: string;
-  /** 
+  /**
    * 保密期限
    */
   secretAt: number;
-  /** 
+  /**
    * 紧急程度
    */
   urgentID: number;
-  /** 
+  /**
    * 是否督办
    */
   deadLock: number;
-  /** 
+  /**
    * 来文日期
    */
   fileDate: number;
-  /** 
+  /**
    * 纸质分送
    */
   usePaper: string;
-  /** 
+  /**
    * 办理提醒
    */
   usesNoti: string;
-  /** 
+  /**
    * 申请科室
    */
   deptName: string;
+  /**
+   * 文件条码
+   */
+  scanCode: string;
+  /**
+   * 来文单位
+   */
+  fileFrom: string;
 }
 
 export class TNotiMainResponse implements INotiMainResponse {
@@ -336,6 +344,8 @@ export class TNotiMainResponse implements INotiMainResponse {
   usePaper: string = "";
   usesNoti: string = "";
   deptName: string = "";
+  scanCode: string = "";
+  fileFrom: string = "";
 
   constructor(card: any = {}) {
     if (card) {