Merge pull request #305 from kmin-jeong/feat/answer

기업관리 유지보수
Team-Coverflow · May 10, 2024 · d1ff151 · d1ff151
2 parents 5dec22b + 33facee
commit d1ff151
Showing 1 changed file with 31 additions and 3 deletions.
diff --git a/src/components/ui/adminSelection/companySelection.tsx b/src/components/ui/adminSelection/companySelection.tsx
@@ -38,6 +38,7 @@ export default function CompanySelection() {
   const [selectedCompany, setSelectedCompany] = useState(null);
   const [currentPage, setCurrentPage] = useState(0);
   const [totalPages, setTotalPages] = useState(0);
+  const [companyType, setcompanyType] = useState('');
   const [companyStatus, setCompanyStatus] = useState('');
   const [selectedCity, setSelectedCity] = useState('');
   const [selectedDistrictOptions, setSelectedDistrictOptions] = useState<
@@ -76,6 +77,9 @@ export default function CompanySelection() {
       criterion: 'createdAt',
     });
 
+    if (companyType) {
+      queryParams.set('type', companyType);
+    }
     if (companyStatus) {
       queryParams.set('companyStatus', companyStatus);
     }
@@ -86,8 +90,8 @@ export default function CompanySelection() {
       queryParams.set('district', selectedDistrict);
     }
 
-    const url = `${BASE_URL}/api/company/admin?${queryParams.toString()}`;
-    fetch(url, {
+    const item = `${BASE_URL}/api/company/admin/count?${queryParams.toString()}`;
+    fetch(item, {
       headers: {
         Authorization: `Bearer ${localStorage.getItem(ACCESS_TOKEN)}`,
         'Content-Type': 'application/json',
@@ -99,6 +103,23 @@ export default function CompanySelection() {
         setCompanies(data.data.companies);
         setTotalPages(data.data.totalPages);
         seTtotalCompanyCount(data.data.totalElements);
+      })
+      .catch((error) => {
+        console.error('Error:', error);
+        setIsLoading(false);
+      });
+
+    const url = `${BASE_URL}/api/company/admin?${queryParams.toString()}`;
+    fetch(url, {
+      headers: {
+        Authorization: `Bearer ${localStorage.getItem(ACCESS_TOKEN)}`,
+        'Content-Type': 'application/json',
+      },
+    })
+      .then((response) => response.json())
+      .then((data: ApiResponse) => {
+        console.log(data);
+        setCompanies(data.data.companies);
         setIsLoading(false);
       })
       .catch((error) => {
@@ -152,7 +173,11 @@ export default function CompanySelection() {
           <div className="ad-searchOption">
             <div className="ad-searchOption-item">
               <span className="ad-searchOption-title">기업 업종</span>
-              <select className="ad-searchOption-select">
+              <select
+                className="ad-searchOption-select"
+                value={companyType}
+                onChange={(e) => setcompanyType(e.target.value)}
+              >
                 <option value=""></option>
                 {type.map((companyType, index) => (
                   <option key={index} value={companyType}>
@@ -215,7 +240,10 @@ export default function CompanySelection() {
               <Button
                 variant="admin-white"
                 onClick={() => {
+                  setcompanyType('');
                   setCompanyStatus('');
+                  setSelectedDistrict('');
+                  setSelectedCity('');
                   setCurrentPage(0);
                 }}
               >