Merge branch 'develop' into feature/38-banner_page

package.json

@@ -20,7 +20,7 @@
 		"zustand": "^4.4.7"
 	},
 	"scripts": {
-		"start": "set PORT=4000 && react-scripts start",
+		"start": "react-scripts start",
 		"build": "react-scripts build",
 		"test": "react-scripts test",
 		"eject": "react-scripts eject"

src/Apis/Applications/index.ts

@@ -16,7 +16,7 @@ export const useGetApplicantInfo = (
 	return useQuery({
 		queryKey: ['getApplicantInfo', applicationQueryString],
 		queryFn: async () => {
-			const { page, application_status, student_name, recruitment_id } =
+			const { page, application_status, student_name, recruitment_id, year } =
 				applicationQueryString;
 			const pageNum = page ? `&page=${page}` : '';
 			const studentName = student_name
@@ -27,12 +27,12 @@ export const useGetApplicantInfo = (
 				: '';
 			const queryString =
 				application_status || student_name || recruitment_id || page
-					? `?application_status=${
+					? `&application_status=${
 							application_status ? application_status : ''
 					  }${companyId}${studentName}${pageNum}`
 					: '';
 			const { data } = await instance.get<ApplicationResponse>(
-				`${router}${queryString}`
+				`${router}?year=${year}${queryString}`
 			);
 			return data;
 		},

src/Apis/Applications/request.ts

@@ -12,6 +12,7 @@ export interface ApplicantInfoQueryStringType {
 	application_status: string | StatusType;
 	student_name: string;
 	recruitment_id: string;
+	year: string;
 }
 
 export interface TrainDate {

src/Components/ApplicationView/Search/index.tsx

@@ -11,6 +11,7 @@ interface PropsType {
 export function ApplicationViewSearch({
 	refetchCompanyRecruitment,
 }: PropsType) {
+	const date = new Date();
 	const {
 		applicationViewQueryString,
 		setDefaultApplicationViewQueryString,
@@ -24,6 +25,10 @@ export function ApplicationViewSearch({
 		setTimeout(refetchCompanyRecruitment);
 	};
 
+	const yearArray = Array.from({ length: 10 }, (_, idx) =>
+		(date.getFullYear() - idx).toString()
+	);
+
 	return (
 		<_.Container>
 			<_.Wrapper>
@@ -63,6 +68,17 @@ export function ApplicationViewSearch({
 						iconName="Search"
 					/>
 				</_.ContentWrapper>
+				<_.TitleText>년도</_.TitleText>
+				<_.ContentWrapper width={8.5}>
+					<DropDown
+						onChange={(year) =>
+							applicationViewQueryStringDropDown('year', year)
+						}
+						value={applicationViewQueryString.year}
+						width={95}
+						option={yearArray}
+					/>
+				</_.ContentWrapper>
 				<_.Btn>
 					<Button onClick={search}>조회</Button>
 					<Button

src/Pages/PopUp/ApplicationPopup/index.tsx

@@ -8,11 +8,13 @@ import { AttachmentUrlType } from '../../../Apis/Applications/response';
 import { useGetApplicantInfo } from '../../../Apis/Applications';
 
 export function ApplicationPopup() {
+	const date = new Date();
 	const id = new URLSearchParams(window.location.search).get('id');
 	const [applicationQueryString] = useState<ApplicantInfoQueryStringType>({
 		application_status: 'APPROVED',
 		student_name: '',
 		recruitment_id: id ? id : '',
+		year: date.getFullYear().toString(),
 	});
 
 	const {

src/Pages/PopUp/RecruitmentRequestPopup/index.tsx

@@ -8,11 +8,13 @@ import { AttachmentUrlType } from '../../../Apis/Applications/response';
 import { useGetApplicantInfo } from '../../../Apis/Applications';
 
 export function RecruitmentRequestPopup() {
+	const date = new Date();
 	const id = new URLSearchParams(window.location.search).get('id');
 	const [applicationQueryString] = useState<ApplicantInfoQueryStringType>({
 		application_status: 'REQUESTED',
 		student_name: '',
 		recruitment_id: id ? id : '',
+		year: date.getFullYear().toString(),
 	});
 
 	const {

src/Store/State.ts

@@ -32,6 +32,7 @@ export const useApplicationViewQueryString =
 				application_status: '',
 				student_name: '',
 				recruitment_id: '',
+				year: date.getFullYear().toString(),
 			},
 			applicationViewQueryStringHandler: (e) =>
 				set((prev) => ({
@@ -54,6 +55,7 @@ export const useApplicationViewQueryString =
 						application_status: '',
 						student_name: '',
 						recruitment_id: '',
+						year: date.getFullYear().toString(),
 					},
 				}),
 			setApplicationViewQueryString: (queryString) =>