NUTFes · Wakai111 · Jun 16, 2026 · Jun 11, 2026 · Jun 11, 2026 · Jun 11, 2026
diff --git a/api/externals/repository/sponsorship_activity_repository.go b/api/externals/repository/sponsorship_activity_repository.go
@@ -63,6 +63,9 @@ func (r *sponsorshipActivityRepository) FindAll(ctx context.Context, sponsorship
 	if sponsorshipActivitiesSearchParams.ActivityStatus != nil {
 		queryDataset = queryDataset.Where(goqu.I("sponsorship_activities.activity_status").Eq(string(*sponsorshipActivitiesSearchParams.ActivityStatus)))
 	}
+	if sponsorshipActivitiesSearchParams.DesignProgress != nil {
+		queryDataset = queryDataset.Where(goqu.I("sponsorship_activities.design_progress").Eq(string(*sponsorshipActivitiesSearchParams.DesignProgress)))
+	}
 	if sponsorshipActivitiesSearchParams.FeasibilityStatus != nil {
 		queryDataset = queryDataset.Where(goqu.I("sponsorship_activities.feasibility_status").Eq(string(*sponsorshipActivitiesSearchParams.FeasibilityStatus)))
 	}
@@ -341,6 +344,7 @@ func (r *sponsorshipActivityRepository) Update(ctx context.Context, tx *sql.Tx,
 			"feasibility_status": activity.FeasibilityStatus,
 			"design_progress":    activity.DesignProgress,
 			"remarks":            activity.Remarks,
+			"updated_at":         goqu.L("CURRENT_TIMESTAMP"),
 		}).
 		Where(goqu.I("id").Eq(activity.ID))
 	query, args, err := dataset.ToSQL()

diff --git a/api/generated/openapi_gen.go b/api/generated/openapi_gen.go
diff --git a/openapi/openapi.yaml b/openapi/openapi.yaml
@@ -2543,6 +2543,12 @@ paths:
           required: false
           schema:
             $ref: "#/components/schemas/ActivityStatus"
+        - name: design_progress
+          in: query
+          description: デザイン進捗ステータス (DesignProgressの値を指定)
+          required: false
+          schema:
+            $ref: "#/components/schemas/DesignProgress"
         - name: feasibility_status
           in: query
           description: 協賛可否ステータス (FeasibilityStatusの値を指定)
@@ -3794,4 +3800,4 @@ components:
         - money
         - goods
 
-x-original-swagger-version: "2.0"
+x-original-swagger-version: "2.0"
diff --git a/view/next-project/src/components/sponsor-activities/FilterModal.tsx b/view/next-project/src/components/sponsor-activities/FilterModal.tsx
@@ -1,16 +1,20 @@
 import { FC, useMemo, useState } from 'react';
 
-import { FeasibilityStatus } from '@/generated/model';
-import { SORT_OPTIONS, SponsorActivitiesFilterType } from '@/utils/sponsorshipActivity';
+import { ActivityStatus, DesignProgress, FeasibilityStatus } from '@/generated/model';
+import {
+  ACTIVITY_STATUS_OPTIONS,
+  DESIGN_PROGRESS_OPTIONS,
+  SORT_OPTIONS,
+  SponsorActivitiesFilterType,
+} from '@/utils/sponsorshipActivity';
 import { CloseButton, Modal, PrimaryButton, SearchSelect, Select, Title } from '@components/common';
 import { BUREAUS } from '@constants/bureaus';
-import { Sponsor, SponsorStyle, User } from '@type/common';
+import { SponsorStyle, User } from '@type/common';
 
 interface ModalProps {
   setIsOpen: (isOpen: boolean) => void;
   sponsorStyles: SponsorStyle[];
   users: User[];
-  sponsors: Sponsor[];
   filterData: SponsorActivitiesFilterType;
   setFilterData: (filterData: SponsorActivitiesFilterType) => void;
 }
@@ -75,13 +79,12 @@ interface BasicFilterSectionProps {
   selectedBureauOption: { value: string; label: string } | null;
   userSelectOptions: { value: string; label: string }[];
   selectedUserOption: { value: string; label: string } | null;
-  sponsorSelectOptions: { value: string; label: string }[];
-  selectedSponsorOption: { value: string; label: string } | null;
   draftFilterData: SponsorActivitiesFilterType;
   onBureauChange: (selected: { value: string; label: string } | null) => void;
   onUserChange: (selected: { value: string; label: string } | null) => void;
-  onSponsorChange: (selected: { value: string; label: string } | null) => void;
   onFeasibilityChange: (value: string) => void;
+  onActivityStatusChange: (value: string) => void;
+  onDesignProgressChange: (value: string) => void;
   onSortChange: (value: string) => void;
 }
 
@@ -90,13 +93,12 @@ const BasicFilterSection: FC<BasicFilterSectionProps> = ({
   selectedBureauOption,
   userSelectOptions,
   selectedUserOption,
-  sponsorSelectOptions,
-  selectedSponsorOption,
   draftFilterData,
   onBureauChange,
   onUserChange,
-  onSponsorChange,
   onFeasibilityChange,
+  onActivityStatusChange,
+  onDesignProgressChange,
   onSortChange,
 }) => (
   <>
@@ -120,16 +122,6 @@ const BasicFilterSection: FC<BasicFilterSectionProps> = ({
         onChange={onUserChange}
       />
     </div>
-    <p>企業名</p>
-    <div className='w-full'>
-      <SearchSelect
-        options={sponsorSelectOptions}
-        value={selectedSponsorOption}
-        placeholder='企業名で検索'
-        noOptionMessage='該当する企業がありません'
-        onChange={onSponsorChange}
-      />
-    </div>
     <p>協賛可否</p>
     <div className='w-full'>
       <Select
@@ -142,6 +134,34 @@ const BasicFilterSection: FC<BasicFilterSectionProps> = ({
         <option value={FeasibilityStatus.unstarted}>未定</option>
       </Select>
     </div>
+    <p>ステータス</p>
+    <div className='w-full'>
+      <Select
+        value={draftFilterData.activityStatus}
+        onChange={(e) => onActivityStatusChange(e.target.value)}
+      >
+        <option value='all'>すべて</option>
+        {ACTIVITY_STATUS_OPTIONS.map((option) => (
+          <option key={option.value} value={option.value}>
+            {option.label}
+          </option>
+        ))}
+      </Select>
+    </div>
+    <p>デザイン</p>
+    <div className='w-full'>
+      <Select
+        value={draftFilterData.designProgress}
+        onChange={(e) => onDesignProgressChange(e.target.value)}
+      >
+        <option value='all'>すべて</option>
+        {DESIGN_PROGRESS_OPTIONS.map((option) => (
+          <option key={option.value} value={option.value}>
+            {option.label}
+          </option>
+        ))}
+      </Select>
+    </div>
     <p>並び替え</p>
     <div className='w-full'>
       <Select
@@ -160,7 +180,7 @@ const BasicFilterSection: FC<BasicFilterSectionProps> = ({
 );
 
 const FilterModal: FC<ModalProps> = (props) => {
-  const { sponsorStyles, users, sponsors, filterData, setFilterData } = props;
+  const { sponsorStyles, users, filterData, setFilterData } = props;
 
   const styleOptions = useMemo(
     () =>
@@ -169,11 +189,6 @@ const FilterModal: FC<ModalProps> = (props) => {
       ),
     [sponsorStyles],
   );
-  const sponsorOptions = useMemo(
-    () =>
-      sponsors.filter((sponsor): sponsor is Sponsor & { id: number } => sponsor.id !== undefined),
-    [sponsors],
-  );
 
   // モーダル用の変数
   const [draftFilterData, setDraftFilterData] = useState<SponsorActivitiesFilterType>(filterData);
@@ -208,17 +223,6 @@ const FilterModal: FC<ModalProps> = (props) => {
     [filteredUsers],
   );
 
-  const sponsorSelectOptions = useMemo(
-    () => [
-      { value: 'all', label: '企業名で検索' },
-      ...sponsorOptions.map((sponsor) => ({
-        value: String(sponsor.id),
-        label: sponsor.name,
-      })),
-    ],
-    [sponsorOptions],
-  );
-
   const selectedBureauOption = useMemo(
     () =>
       draftFilterData.bureauId === 'all'
@@ -237,16 +241,6 @@ const FilterModal: FC<ModalProps> = (props) => {
     [userSelectOptions, draftFilterData.userId],
   );
 
-  const selectedSponsorOption = useMemo(
-    () =>
-      draftFilterData.sponsorId === 'all'
-        ? null
-        : sponsorSelectOptions.find(
-            (option) => option.value === String(draftFilterData.sponsorId),
-          ) || null,
-    [sponsorSelectOptions, draftFilterData.sponsorId],
-  );
-
   function filterHandler(event: React.FormEvent<HTMLFormElement>) {
     event.preventDefault();
     const availableStyleIdSet = new Set(styleOptions.map((style) => style.id));
@@ -330,8 +324,6 @@ const FilterModal: FC<ModalProps> = (props) => {
               selectedBureauOption={selectedBureauOption}
               userSelectOptions={userSelectOptions}
               selectedUserOption={selectedUserOption}
-              sponsorSelectOptions={sponsorSelectOptions}
-              selectedSponsorOption={selectedSponsorOption}
               draftFilterData={draftFilterData}
               onBureauChange={(selected) => {
                 if (!selected) return;
@@ -356,17 +348,22 @@ const FilterModal: FC<ModalProps> = (props) => {
                   userId: selected.value === 'all' ? 'all' : Number(selected.value),
                 }));
               }}
-              onSponsorChange={(selected) => {
-                if (!selected) return;
+              onFeasibilityChange={(value) => {
                 setDraftFilterData((prev) => ({
                   ...prev,
-                  sponsorId: selected.value === 'all' ? 'all' : Number(selected.value),
+                  feasibilityStatus: value === 'all' ? 'all' : (value as FeasibilityStatus),
                 }));
               }}
-              onFeasibilityChange={(value) => {
+              onActivityStatusChange={(value) => {
                 setDraftFilterData((prev) => ({
                   ...prev,
-                  feasibilityStatus: value === 'all' ? 'all' : (value as FeasibilityStatus),
+                  activityStatus: value === 'all' ? 'all' : (value as ActivityStatus),
+                }));
+              }}
+              onDesignProgressChange={(value) => {
+                setDraftFilterData((prev) => ({
+                  ...prev,
+                  designProgress: value === 'all' ? 'all' : (value as DesignProgress),
                 }));
               }}
               onSortChange={(value) => {

diff --git a/.../next-project/src/components/sponsor-activities/page/sections/SponsorActivitiesHeader.tsx b/.../next-project/src/components/sponsor-activities/page/sections/SponsorActivitiesHeader.tsx
@@ -92,7 +92,6 @@ export default function SponsorActivitiesHeader({
                 <FilterModal
                   setIsOpen={onSetFilterOpen}
                   sponsorStyles={sponsorStyles}
-                  sponsors={sponsors}
                   users={users}
                   filterData={filterData}
                   setFilterData={onSetFilterData}

diff --git a/view/next-project/src/generated/model/getSponsorshipActivitiesParams.ts b/view/next-project/src/generated/model/getSponsorshipActivitiesParams.ts
@@ -6,6 +6,7 @@
  * OpenAPI spec version: 2.0.0
  */
 import type { ActivityStatus } from './activityStatus';
+import type { DesignProgress } from './designProgress';
 import type { FeasibilityStatus } from './feasibilityStatus';
 import type { GetSponsorshipActivitiesOrder } from './getSponsorshipActivitiesOrder';
 
@@ -22,6 +23,10 @@ export type GetSponsorshipActivitiesParams = {
    * 活動ステータス (ActivityStatusの値を指定)
    */
   activity_status?: ActivityStatus;
+  /**
+   * デザイン進捗ステータス (DesignProgressの値を指定)
+   */
+  design_progress?: DesignProgress;
   /**
    * 協賛可否ステータス (FeasibilityStatusの値を指定)
    */

diff --git a/view/next-project/src/hooks/sponsor-activities/useSponsorActivitiesQuery.ts b/view/next-project/src/hooks/sponsor-activities/useSponsorActivitiesQuery.ts
@@ -48,6 +48,12 @@ export function useSponsorActivitiesQuery({
     if (filterData.feasibilityStatus !== 'all') {
       params.feasibility_status = filterData.feasibilityStatus;
     }
+    if (filterData.activityStatus !== 'all') {
+      params.activity_status = filterData.activityStatus;
+    }
+    if (filterData.designProgress !== 'all') {
+      params.design_progress = filterData.designProgress;
+    }
     if (filterData.userId !== 'all') {
       params.user_id = filterData.userId;
     }
@@ -83,11 +89,6 @@ export function useSponsorActivitiesQuery({
           (activity) => activity.user?.bureauID === filterData.bureauId,
         );
       }
-      if (filterData.sponsorId !== 'all') {
-        nextActivities = nextActivities.filter(
-          (activity) => activity.sponsor?.id === filterData.sponsorId,
-        );
-      }
 
       setActivities(
         filterData.selectedSort === 'priceSort' || filterData.selectedSort === 'priceDesSort'

diff --git a/view/next-project/src/pages/sponsor-activities/index.tsx b/view/next-project/src/pages/sponsor-activities/index.tsx
@@ -128,31 +128,24 @@ export default function SponsorActivities(props: Props) {
     [sponsorStyles],
   );
   const allSponsorStyleIdSet = useMemo(() => new Set(allSponsorStyleIds), [allSponsorStyleIds]);
-  const sponsorIdSetByYear = useMemo(
-    () =>
-      new Set(
-        sponsorsByYear
-          .map((sponsor) => sponsor.id)
-          .filter((sponsorId): sponsorId is number => sponsorId !== undefined),
-      ),
-    [sponsorsByYear],
-  );
 
   const isFiltered = useMemo(() => {
     const isStyleFiltered =
       filterData.styleIds.length !== allSponsorStyleIds.length ||
       filterData.styleIds.some((styleId) => !allSponsorStyleIdSet.has(styleId));
     const isBureauFiltered = filterData.bureauId !== 'all';
     const isUserFiltered = filterData.userId !== 'all';
-    const isSponsorFiltered = filterData.sponsorId !== 'all';
+    const isActivityStatusFiltered = filterData.activityStatus !== 'all';
+    const isDesignProgressFiltered = filterData.designProgress !== 'all';
     const isFeasibilityFiltered = filterData.feasibilityStatus !== 'all';
     const isSorted = filterData.selectedSort !== 'default';
 
     return (
       isStyleFiltered ||
       isBureauFiltered ||
       isUserFiltered ||
-      isSponsorFiltered ||
+      isActivityStatusFiltered ||
+      isDesignProgressFiltered ||
       isFeasibilityFiltered ||
       isSorted
     );
@@ -173,16 +166,6 @@ export default function SponsorActivities(props: Props) {
     [sponsorshipActivities],
   );
 
-  useEffect(() => {
-    if (filterData.sponsorId === 'all') return;
-    if (sponsorIdSetByYear.has(filterData.sponsorId)) return;
-
-    dispatch({
-      type: 'set-filter-data',
-      payload: { ...filterData, sponsorId: 'all' },
-    });
-  }, [filterData, sponsorIdSetByYear]);
-
   if (!_hasHydrated) return <Loading />;
   if (!user?.roleID || ![2, 3, 4].includes(user.roleID)) return <Loading />;
 

diff --git a/view/next-project/src/stories/sponsor-activities/FilterModal.stories.tsx b/view/next-project/src/stories/sponsor-activities/FilterModal.stories.tsx
@@ -1,7 +1,7 @@
 import { SponsorActivitiesFilterType } from '@/utils/sponsorshipActivity';
 import { FilterModal } from '@components/sponsor-activities';
 
-import { SPONSOR, SPONSOR_STYLE, USER } from '../constants';
+import { SPONSOR_STYLE, USER } from '../constants';
 
 import type { Meta, StoryFn } from '@storybook/react';
 
@@ -20,7 +20,8 @@ const filterData: SponsorActivitiesFilterType = {
   styleIds: [SPONSOR_STYLE.id || 0],
   bureauId: 'all',
   userId: 'all',
-  sponsorId: 'all',
+  activityStatus: 'all',
+  designProgress: 'all',
   feasibilityStatus: 'all',
   selectedSort: 'default',
 };
@@ -30,7 +31,6 @@ Primary.args = {
   setIsOpen: () => {},
   sponsorStyles: [SPONSOR_STYLE],
   users: [USER],
-  sponsors: [SPONSOR],
   filterData,
   setFilterData: () => {},
 };