Merge branch 'warunee-dev' into develop

# Conflicts:
#	src/api/11_discipline/api.discipline.ts
This commit is contained in:
Warunee Tamkoo 2023-11-29 16:22:57 +07:00
commit ceaefc6043

View file

@ -1,32 +1,32 @@
import env from "../index"; import env from "../index";
const disciplineMain = `${env.API_URI}/discipline`;
const discipline = `${env.API_URI}/discipline/disciplinary`; const discipline = `${env.API_URI}/discipline/disciplinary`;
const investigate = `${env.API_URI}/discipline/investigate`; const investigate = `${env.API_URI}/discipline/investigate`;
const discipline2 = `${env.API_URI}/discipline`;
export default { export default {
directorList: (page: number, pageSize: number, keyword: string) => directorList: (page: number, pageSize: number, keyword: string) =>
`${discipline}/director?page=${page}&pageSize=${pageSize}&keyword=${keyword}`, `${disciplineMain}/director?page=${page}&pageSize=${pageSize}&keyword=${keyword}`,
director: () => `${discipline}/director`, director: () => `${disciplineMain}/director`,
directorbyId: (id: string) => `${discipline}/director/${id}`, directorbyId: (id: string) => `${disciplineMain}/director/${id}`,
/**ช่องทางการร้องเรียน */ /**ช่องทางการร้องเรียน */
complaintChannel: () => `${discipline}/complaint_Channel`, complaintChannel: () => `${disciplineMain}/complaint_Channel`,
/** /**
* @param id type * @param id type
*/ */
complaintListOp: () => `${discipline}/complaint_Channel`, complaintListOp:()=>`${disciplineMain}/complaint_Channel`,
complaintChannelbyId: (id: string) => `${discipline}/complaint_Channel/${id}`, complaintChannelbyId: (id: string) => `${disciplineMain}/complaint_Channel/${id}`,
complaintAdd: () => `${discipline}/complaint`, complaintAdd: () => `${disciplineMain}/complaint`,
complaintbyId: (id: string) => `${discipline}/complaint/${id}`, complaintbyId: (id: string) => `${disciplineMain}/complaint/${id}`,
complaintReject: (id: string) => `${discipline}/complaint/reject/${id}`, complaintReject: (id: string) => `${disciplineMain}/complaint/reject/${id}`,
complaintResume: (id: string) => `${discipline}/complaint/resume/${id}`, complaintResume: (id: string) => `${disciplineMain}/complaint/resume/${id}`,
complaintList: (page: number, pageSize: number, keyword: string) => complaintList: (page: number, pageSize: number, keyword: string) =>
`${discipline}/complaint?page=${page}&pageSize=${pageSize}&keyword=${keyword}`, `${disciplineMain}/complaint?page=${page}&pageSize=${pageSize}&keyword=${keyword}`,
complaintFileUpload: (id: string) => `${discipline}/complaint/file/${id}`, complaintFileUpload: (id: string) => `${disciplineMain}/complaint/file/${id}`,
complaintFileDelete: (id: string, docId: string) => complaintFileDelete: (id: string, docId: string) =>
`${discipline}/complaint/file/${id}/${docId}`, `${disciplineMain}/complaint/file/${id}/${docId}`,
complaintApprove: (id: string) => `${discipline}/complaint/approve/${id}`, complaintApprove: (id: string) => `${disciplineMain}/complaint/approve/${id}`,
/** API สืบสวนข้อเท็จจริง*/ /** API สืบสวนข้อเท็จจริง*/
investigateMain: (page: number, pageSize: number, keyword: string) => investigateMain: (page: number, pageSize: number, keyword: string) =>
@ -61,6 +61,6 @@ export default {
disciplinaryApprove: (id: string) => `${discipline}/approve/${id}`, disciplinaryApprove: (id: string) => `${discipline}/approve/${id}`,
/** รายการผลการพิจารณาทางวินัย*/ /** รายการผลการพิจารณาทางวินัย*/
listResult: () => `${discipline2}/result`, listResult: () => `${disciplineMain}/result`,
listResultById: (id: string) => `${discipline2}/result/${id}`, listResultById: (id: string) => `${disciplineMain}/result/${id}`,
}; };