รวมไฟล์แก้งานงวด2

src/modules/04_registry/interface/request/Coin.ts

@@ -9,6 +9,8 @@ interface RequestItemsObject {
   issuer: string;
   detail: string;
   issueDate: Date;
+  refCommandNo: string;
+  refCommandDate: Date | null;
   createdFullName: string;
   createdAt: Date;
 }

src/modules/04_registry/interface/request/Discipline.ts

@@ -8,8 +8,9 @@ interface RequestItemsObject {
   id: string;
   level: string;
   detail: string;
+  unStigma: string;
   refCommandNo: string;
-  refCommandDate: Date;
+  refCommandDate: Date | null;
   date: Date;
   createdFullName: string;
   createdAt: Date;

src/modules/04_registry/interface/request/Education.ts

@@ -9,7 +9,7 @@ interface RequestItemsObject {
   level: string;
   levelId: string;
   positionPath: string;
-  positionPathId: string;
+  isEducation: boolean;
   institute: string;
   degree: string;
   field: string;
@@ -19,9 +19,12 @@ interface RequestItemsObject {
   durationYear: number;
   other: string;
   fundName: string;
+  isDate: string;
   finishDate: Date;
   startDate: number;
   endDate: number;
+  startDate2: Date;
+  endDate2: Date;
   createdFullName: string;
   createdAt: Date;
 }

src/modules/04_registry/interface/request/Insignia.ts

@@ -18,6 +18,8 @@ interface RequestItemsObject {
   page: string;
   receiveDate: Date;
   dateAnnounce: Date;
+  refCommandNo: string;
+  refCommandDate: Date | null;
   createdFullName: string;
   createdAt: Date;
 }

src/modules/04_registry/interface/request/Record.ts

@@ -9,6 +9,8 @@ interface RequestItemsObject {
   date: Date;
   detail: string;
   reference: string;
+  refCommandNo: string;
+  refCommandDate: Date | null;
   createdFullName: string;
   createdAt: Date;
 }

src/modules/04_registry/interface/request/Salary.ts

@@ -35,6 +35,8 @@ interface RequestItemsObject {
   positionExecutiveSideId: string;
   salaryClass: string;
   salaryRef: string;
+  refCommandNo: string;
+  //   refCommandDate: Date | null;
   createdFullName: string;
   createdAt: Date;
 }
@@ -47,7 +49,7 @@ interface RequestItemsEmployee {
   id: string;
   mouthSalaryAmount: number;
   oc: string | null;
-  ocId: string | null;
+  ocId: string;
   posNo: string | null;
   posNoId: string | null;
   posNoEmployee: string | null;
@@ -62,6 +64,8 @@ interface RequestItemsEmployee {
   positionSalaryAmount: number;
   salaryClass: string | null;
   salaryRef: string | null;
+  refCommandNo: string;
+  //   refCommandDate: Date | null;
 }
 
 //columns

src/modules/04_registry/interface/request/Talent.ts

@@ -9,8 +9,6 @@ interface RequestItemsObject {
   field: string;
   detail: string;
   remark: string;
-  dateStart: Date;
-  dateEnd: Date;
   reference: string;
   createdFullName: string;
   createdAt: Date;

src/modules/04_registry/interface/request/Work.ts

@@ -10,6 +10,8 @@ interface RequestItemsObject {
   dateEnd: Date;
   detail: string;
   reference: string;
+  refCommandNo: string;
+  refCommandDate: Date | null;
   createdFullName: string;
   createdAt: Date;
 }

src/modules/04_registry/interface/response/Coin.ts

@@ -4,6 +4,8 @@ interface ResponseObject {
   issuer: string;
   detail: string;
   issueDate: Date;
+  refCommandNo: string;
+  refCommandDate: Date | null;
   createdFullName: string;
   createdAt: Date;
 }

src/modules/04_registry/interface/response/Discipline.ts

@@ -3,6 +3,7 @@ interface ResponseObject {
   id: string;
   level: string;
   detail: string;
+  unStigma: string;
   refCommandNo: string;
   refCommandDate: Date;
   date: Date;

src/modules/04_registry/interface/response/Education.ts

@@ -4,7 +4,7 @@ interface ResponseObject {
   educationLevel: string;
   educationLevelId: string;
   positionPath: string;
-  positionPathId: string;
+  isEducation: boolean;
   institute: string;
   degree: string;
   field: string;
@@ -14,9 +14,12 @@ interface ResponseObject {
   durationYear: number;
   other: string;
   fundName: string;
+  isDate: string;
   finishDate: Date;
   startDate: number;
   endDate: number;
+  startDate2: Date;
+  endDate2: Date;
   createdFullName: string;
   createdAt: Date;
 }

src/modules/04_registry/interface/response/Family.ts

@@ -6,14 +6,20 @@ interface ResponseObject {
   coupleLastName: string | null;
   coupleLastNameOld: string | null;
   coupleCareer: string | null;
+  coupleLive: Boolean | null;
+  coupleCitizenId: string | null;
   fatherPrefixId: string | null;
   fatherFirstName: string | null;
   fatherLastName: string | null;
   fatherCareer: string | null;
+  fatherLive: Boolean | null;
+  fatherCitizenId: string | null;
   motherPrefixId: string | null;
   motherFirstName: string | null;
   motherLastName: string | null;
   motherCareer: string | null;
+  motherLive: Boolean | null;
+  motherCitizenId: string | null;
   createdFullName: string | null;
   createdAt: Date;
   childrens: childrenFamily[];
@@ -26,14 +32,20 @@ interface ResponseHistory {
   coupleLastName: string | null;
   coupleLastNameOld: string | null;
   coupleCareer: string | null;
+  coupleLive: string | null;
+  coupleCitizenId: string | null;
   fatherPrefixId: string | null;
   fatherFirstName: string | null;
   fatherLastName: string | null;
   fatherCareer: string | null;
+  fatherLive: string | null;
+  fatherCitizenId: string | null;
   motherPrefixId: string | null;
   motherFirstName: string | null;
   motherLastName: string | null;
   motherCareer: string | null;
+  motherLive: string | null;
+  motherCitizenId: string | null;
   createdFullName: string | null;
   createdAt: Date;
   childrens: childrenFamily[];
@@ -45,6 +57,8 @@ interface childrenFamily {
   childrenFirstName: string | null;
   childrenLastName: string | null;
   childrenCareer: string | null;
+  childrenLive: string | null;
+  childrenCitizenId: string | null;
 }
 
 export type { ResponseObject, childrenFamily, ResponseHistory };

src/modules/04_registry/interface/response/Insignia.ts

@@ -13,6 +13,8 @@ interface ResponseObject {
   page: string;
   receiveDate: Date;
   dateAnnounce: Date;
+  refCommandNo: string;
+  refCommandDate: Date | null;
   createdFullName: string;
   createdAt: Date;
 }

src/modules/04_registry/interface/response/Record.ts

@@ -4,6 +4,8 @@ interface ResponseObject {
   date: Date;
   detail: string;
   reference: string;
+  refCommandNo: string;
+  refCommandDate: Date | null;
   createdFullName: string;
   createdAt: Date;
 }

src/modules/04_registry/interface/response/Salary.ts

@@ -25,6 +25,8 @@ interface ResponseObject {
   positionExecutiveSideId: string;
   salaryClass: string;
   salaryRef: string;
+  refCommandNo: string;
+  //   refCommandDate: Date | null;
   createdFullName: string;
   createdAt: Date;
 }
@@ -37,7 +39,7 @@ interface ResponseObjectEmployee {
   id: string;
   mouthSalaryAmount: number;
   oc: string | null;
-  ocId: string | null;
+  ocId: string;
   posNo: string | null;
   posNoId: string | null;
   posNoEmployee: string | null;
@@ -52,6 +54,8 @@ interface ResponseObjectEmployee {
   positionSalaryAmount: number;
   salaryClass: string | null;
   salaryRef: string | null;
+  refCommandNo: string;
+  //   refCommandDate: Date | null;
 }
 
 export type { ResponseObject, ResponseObjectEmployee };

src/modules/04_registry/interface/response/Talent.ts

@@ -4,8 +4,6 @@ interface ResponseObject {
   field: string;
   detail: string;
   remark: string;
-  dateStart: Date;
-  dateEnd: Date;
   reference: string;
   createdFullName: string;
   createdAt: Date;

src/modules/04_registry/interface/response/Work.ts

@@ -5,6 +5,8 @@ interface ResponseObject {
   dateEnd: Date;
   detail: string;
   reference: string;
+  refCommandNo: string;
+  refCommandDate: Date | null;
   createdFullName: string;
   createdAt: Date;
 }