feat(types): 统一修改subject为gather

types/src/interface/subjectExecutor.ts

@@ -5,9 +5,9 @@ export interface IExecutorApprovaledPermission {
   permission: string[];
 }
 
-export interface ISubjectExecutor {
+export interface IGatherExecutor {
   ID: string;
-  subjectID: string;
+  gatherID: string;
   name: string;
   setType: string;
   businessType: BusinessTypeKey;

types/src/interface/index.ts

@@ -30,7 +30,7 @@ export * from './editLog';
 export * from './institutionRole';
 export * from './subjectUnit';
 // export * from './executor';
-export * from './subjectExecutor';
+export * from './gatherExecutor';
 export * from './matter';
 export * from './loginLog';
 export * from './budgetData';

types/src/interface/matter.ts

@@ -2,7 +2,7 @@ import { BusinessTypeKey, MatterTypeKey } from './subjectUnit';
 // 事项
 export interface IMatter {
     ID: string;
-    subjectID: string;
+    gatherID: string;
     businessType: BusinessTypeKey;
     matterType: MatterTypeKey;
     parentID: string;
@@ -12,13 +12,13 @@ export interface IMatter {
     assembly: string[];
 }
 
-export interface ISubjectMatter extends IMatter {
+export interface IGatherMatter extends IMatter {
     businessID: string;
 }
 
 export interface IStepMatter {
     ID: string;
-    subjectID: string;
+    gatherID: string;
     businessType: BusinessTypeKey;
     stepID: string;
     matterID: string;
@@ -27,14 +27,14 @@ export interface IStepMatter {
     profilePermission: string[];
 }
 
-export interface ISubjectStepMatter extends IStepMatter {
+export interface IGatherStepMatter extends IStepMatter {
     businessID: string;
 }
 
 export interface IYsProfileTemplate {
     ID: string;
     parentID: string;
-    subjectID: string;
+    gatherID: string;
     businessType: BusinessTypeKey;
     name: string;
     sort: string;
@@ -44,6 +44,6 @@ export interface IYsProfileTemplate {
     mode: string[];
 }
 
-export interface ISubjectYsProfileTemplate extends IYsProfileTemplate {
+export interface IGatherYsProfileTemplate extends IYsProfileTemplate {
     businessID: string;
 }

types/src/interface/process.ts

@@ -1,7 +1,7 @@
 import { ReportTree } from './report';
 import { CptModelName, SubModelName, ActionType } from './base';
 import { BusinessTypeKey } from './subjectUnit';
-import { IExecutorApprovaledPermission } from './subjectExecutor';
+import { IExecutorApprovaledPermission } from './gatherExecutor';
 import { executorMember } from './approvalStatus';
 
 // 环节类型
@@ -125,12 +125,19 @@ export interface IExecutor {
   ID: string;
   permission: string[];
   configure: string[];
-  members?: {
-    ID: string;
-    approvalStatus: string;
-    approvalTime: number | string;
-    approvalComment: string;
-  }[];
+  businessType: BusinessTypeKey;
+  gatherID: string;
+  setType: string;
+  name: string;
+  approvaledPermission: IExecutorApprovaledPermission[];
+  // 这里维持原本类型，在gatherExecutor使用对象数据
+  members: string[];
+  // members?: {
+  //   ID: string;
+  //   approvalStatus: string;
+  //   approvalTime: number | string;
+  //   approvalComment: string;
+  // }[];
 }
 
 // 3合1参与者信息