Merge branch 'develop' into devTee

src/api/05_placement/api.placement.ts

@@ -11,6 +11,7 @@ const placemenRelocation = `${placement}/relocation`;
 const placemenOther = `${env.API_URI}/retirement/other`;
 const placemenAppointment = `${placement}/appointment`;
 const orgSearchCommand = `${env.API_URI}/org/profile/search/profile/command`;
+const report = `${env.API_PLACEMENT_URI}/placement/report`;
 
 export default {
   MainDetail: (year: number) => `${placement}/exam/${year}`,
@@ -178,4 +179,7 @@ export default {
   appointEmployeeOrder: (typeId: string) =>
     `${placement}/appointment/temp/report/${typeId}`,
   apppointmentPositionUse: () => `${placement}/appointment/temp/use`,
+
+  //รายงาน
+  placementReport: `${report}`,
 };

src/api/05_placement/api.probation.ts

@@ -7,6 +7,7 @@ const evaluate = `${env.API_PROBATION_URI}`;
 const appointMain = `${env.API_PROBATION_URI}/appoint`;
 const orgProfile = `${env.API_URI}/org`;
 const probation = `${env.API_URI}/probation`;
+const report = `${env.API_URI}/probation/report`;
 
 export default {
   competencyOptions: (personalId: string) =>
@@ -87,9 +88,12 @@ export default {
     `${orgProfile}/profile/probation/${profileId}`,
 
   appointMain,
-  appointMainList:(id:string)=>`${appointMain}/list/${id}`,
+  appointMainList: (id: string) => `${appointMain}/list/${id}`,
 
-  orgProfileDirector:`${orgProfile}/profile/commander-director`,
+  orgProfileDirector: `${orgProfile}/profile/commander-director`,
 
-  permissionsCheck:(id:string)=>`${probation}/permissions/${id}`
+  permissionsCheck: (id: string) => `${probation}/permissions/${id}`,
+
+  //รายงาน
+  probationReport: `${report}`,
 };

src/api/06_retirement/api.retirement.ts

@@ -3,6 +3,7 @@ const retirement = `${env.API_URI}/retirement`;
 const retirementDischarge = `${retirement}/discharge`;
 const retirementExpulsion = `${retirement}/expulsion`;
 const retirementOut = `${retirement}/out`;
+const report = `${retirement}/report`;
 
 export default {
   profile: (type: string, year: string) =>
@@ -72,4 +73,7 @@ export default {
   editDetail: (retireId: string) => `${retirement}/detail/${retireId}`,
   // ตำถาม Exit interview
   questionnaireList: () => `${retirement}/resign/questionnaire/question/admin`,
+
+  //รายงาน
+  retirementReport: `${report}`,
 };