@ningboyz/types 1.0.140 → 1.0.142

package/package.json

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

package/src/myoa/IMyoaMainResponse.ts

@@ -10,6 +10,7 @@ import { IYzcgMainResponse } from "../yzcg/IYzcgMainResponse";
 import { IMyoaCashResponse } from "./IMyoaCashResponse";
 import { IMyoaPGDWResponse } from "./IMyoaPGDWResponse";
 import _ from "lodash";
+import {TCore} from "../../index.ts";
 
 export interface IMyoaMainResponse {
   typeName: string;
@@ -142,7 +143,7 @@ export interface IMyoaMainResponse {
   /**
    * 领用标志
    * */
-  mrokStat: string;
+  mrokStat: number;
   /**
    * 入仓/领用原卡片
    * */
@@ -288,7 +289,7 @@ export class TMyoaMainResponse implements IMyoaMainResponse {
   cardSize: number = 0;
   totalVal: number = 0;
   reasonBy: string = "";
-  mrokStat: string = "";
+  mrokStat: number = 0;
   listBeforeAsset: ICardMainResponse[] = [];
   listAfterAsset: ICardMainResponse[] = [];
 
@@ -399,4 +400,34 @@ export class TMyoaMainResponse implements IMyoaMainResponse {
 
     return result;
   }
+
+ /**
+  * 用来记录操作
+  * */
+  static toTravel(card: IMyoaMainResponse): TCore.ISysTravelResponse {
+    const travel = new TCore.TSysTravelResponse();
+    travel.whoBuild = card.whoBuild;
+    travel.flowMain = card.flowMain;
+    travel.flowNode = card.flowNode;
+    travel.billUUID = card.entityID;
+    travel.billMain = card.myoaIndx;
+    travel.billCode = card.myoaCode;
+    travel.mastName = card.mastName;
+    travel.createBy = card.createBy;
+    travel.menuUUID = card.menuUUID;
+    return travel;
+  }
+
+  /** 转换成记录日志需要的数据（第一层，不包含菜单） */
+  static toTravelData(card?: IMyoaMainResponse | IMyoaMainResponse[]): TCore.ISysTravelResponse[] {
+    if (_.isNil(card)) {
+      return [];
+    }
+    if (_.isArray(card)) {
+      return card.map((u) => {
+        return this.toTravel(u);
+      });
+    }
+    return [this.toTravel(card)];
+  }
 }

package/src/yzcg/IYzcgMainResponse.ts

@@ -286,6 +286,7 @@ export class TYzcgMainResponse implements IYzcgMainResponse {
     const result = new TFlowDataResponse();
     result.whoBuild = yzcg.whoBuild;
     result.userIndx = yzcg.userIndx;
+    result.userMain = yzcg.userMain;
     result.flowMain = yzcg.flowMain;
     result.flowNode = yzcg.flowNode;
     result.notified = Const.Todo.CONST_STR_TODO_TYPE_TO_YZCG_WAIT;