ผูก API สอบสวน

src/modules/11_discipline/interface/index/Main.ts

@@ -9,14 +9,14 @@ interface DataNumberOption {
 }
 
 interface InvestigatefactsDataRowType {
-  id:string,
+  id: string;
   title: string;
   respondentType: string;
-  offenseDetails: string,
-  investigationDetail: string,
-  dateInvestigate: string,
-  investigationStatusResult: string,
-  status: string
+  offenseDetails: string;
+  investigationDetail: string;
+  dateInvestigate: string;
+  investigationStatusResult: string;
+  status: string;
 }
 
 interface investigateDisDataRowType {
@@ -32,23 +32,29 @@ interface investigateDisDataRowType {
 }
 
 interface directorType {
-  id:string
-  prefix:string
-  firstName:string
-  lastName:string
+  id: string;
+  directorId: string;
+  prefix: string;
+  firstName: string;
+  lastName: string;
   position: string;
   email: string;
   phone: string;
+  total: number;
+  duty: string;
 }
 interface responseType {
-  id:string
-  name:string
-  prefix:string
-  firstName:string
-  lastName:string
-  position:string
-  email:string
-  phone:string
+  id: string;
+  directorId: string;
+  name: string;
+  prefix: string;
+  firstName: string;
+  lastName: string;
+  position: string;
+  email: string;
+  phone: string;
+  total: number;
+  duty: string;
 }
 
 interface FileLists {

src/modules/11_discipline/interface/request/disciplinary.ts

@@ -1,50 +1,104 @@
+interface Persons {
+  personId: string; //id อ้างอิง profile
+  idcard: string; //รหัสบัตรประชาชน
+  prefix: string; //คำนำหน้า
+  firstName: string; //ชื่อ
+  lastName: string; //นามสกุล
+  posNo: string; //เลขที่ตำแหน่ง
+  position: string; //ตำแหน่ง
+  positionLevel: string; //ระดับ
+  salary: number; //เงินเดือน
+  organization: string; //สังกัด
+  name: string;
+}
+interface Director {
+  directorId: string;
+  duty: string;
+  email: string;
+  firstName: string;
+  id: string;
+  lastName: string;
+  phone: string;
+  position: string;
+  prefix: string;
+  total: number;
+}
+// interface Persons {
+//   personId: string; //id อ้างอิง profile
+//   idcard: string; //รหัสบัตรประชาชน
+//   prefix: string; //คำนำหน้า
+//   firstName: string; //ชื่อ
+//   lastName: string; //นามสกุล
+//   posNo: string; //เลขที่ตำแหน่ง
+//   position: string; //ตำแหน่ง
+//   positionLevel: string; //ระดับ
+//   salary: number; //เงินเดือน
+//   organization: string; //สังกัด
+// }
+
 interface FormData {
-  complaint: string;
   respondentType: string;
-  dateInvestigate: Date | null;
-  dateAllegation: Date | null;
-  dateEvident: Date | null;
-  filesEvidence: File | null;
-  filesRecordAccuser: File | null;
-  filesWitnesses: File | null;
-  filesEtc: File | null;
-  casefault: string;
-  typefault: string;
-  faultLevel: string;
-  refLaw: string;
-  detailComplaint: string;
-  whereInvestigate: string;
-  trueDetail: string;
-  evidence: string;
-  recordAccuser: string;
-  witnesses: string;
-  InvestResults: string;
-  complaintStatus: string;
   organizationId: string;
   consideredAgency: string;
+  disciplinaryDateAllegation: Date | null;
+  disciplinaryDateEvident: Date | null;
+  disciplinaryCaseFault: string;
+  disciplinaryInvestigateAt: string;
+  disciplinaryFaultLevel: string;
+  disciplinaryRefLaw: string;
+  disciplinarySummaryEvidence: string;
+  disciplinaryRecordAccuser: string;
+  disciplinaryWitnesses: string;
+  result: string;
+  directors: Director[];
+  persons: Persons[];
+
+  // filesWitnesses: File | null;
+  // filesEtc: File | null;
+  // casefault: string;
+  // typefault: string;
+  // faultLevel: string;
+  // refLaw: string;
+  // detailComplaint: string;
+  // whereInvestigate: string;
+  // trueDetail: string;
+  // evidence: string;
+  // recordAccuser: string;
+  // witnesses: string;
+  // InvestResults: string;
+  // complaintStatus: string;
+
+  // consideredAgency: string;
 }
 
-interface disciplinaryRef {
-  complaint: object | null;
-  dateInvestigate: object | null;
-  dateAllegation: object | null;
-  dateEvident: object | null;
-  filesEvidence: object | null;
-  filesRecordAccuser: object | null;
-  filesWitnesses: object | null;
-  filesEtc: object | null;
-  casefault: object | null;
-  typefault: object | null;
-  faultLevel: object | null;
-  refLaw: object | null;
-  detailComplaint: object | null;
-  whereInvestigate: object | null;
-  trueDetail: object | null;
-  evidence: object | null;
-  recordAccuser: object | null;
-  witnesses: object | null;
-  InvestResults: object | null;
+interface DisciplinaryRef {
+  respondentType: object | null;
+  organizationId: object | null;
+  disciplinaryDateAllegation: object | null;
+  disciplinaryDateEvident: object | null;
+  disciplinaryCaseFault: object | null;
+  disciplinaryInvestigateAt: object | null;
+  disciplinaryFaultLevel: object | null;
+  disciplinaryRefLaw: object | null;
+  disciplinarySummaryEvidence: object | null;
+  disciplinaryRecordAccuser: object | null;
+  disciplinaryWitnesses: object | null;
+  result: object | null;
+  // filesRecordAccuser: object | null;
+  // filesWitnesses: object | null;
+  // filesEtc: object | null;
+  // casefault: object | null;
+  // typefault: object | null;
+  // faultLevel: object | null;
+  // refLaw: object | null;
+  // detailComplaint: object | null;
+  // whereInvestigate: object | null;
+  // trueDetail: object | null;
+  // evidence: object | null;
+  // recordAccuser: object | null;
+  // witnesses: object | null;
+  // InvestResults: object | null;
   [key: string]: any;
 }
 
-export type { FormData, disciplinaryRef };
+export type { FormData, DisciplinaryRef, Persons, Director };

src/modules/11_discipline/interface/response/Main.ts

@@ -0,0 +1,6 @@
+interface DataOptionRes {
+  organizationId: string;
+  organizationName: string;
+}
+
+export type { DataOptionRes };