From 20f3b791790a884ba9d6cd09be82bc62fe75eaff Mon Sep 17 00:00:00 2001
From: wangziqi <wangziqi@gongxue100.com>
Date: Mon, 6 Jul 2026 14:48:47 +0800
Subject: [PATCH] feat: bills expense type filter (backend join + frontend
 Select), sync stub docs

---
 apps/admin/src/pages/Bills/index.tsx      | 10 ++++++++--
 apps/server/src/bills/bills.controller.ts |  6 +++---
 apps/server/src/bills/bills.service.ts    |  4 ++++
 apps/server/src/sync/sync.service.ts      |  9 +++++----
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/apps/admin/src/pages/Bills/index.tsx b/apps/admin/src/pages/Bills/index.tsx
index 522e621..d0304e7 100644
--- a/apps/admin/src/pages/Bills/index.tsx
+++ b/apps/admin/src/pages/Bills/index.tsx
@@ -48,12 +48,16 @@ const BillsPage: React.FC = () => {
   const [selectedRows, setSelectedRows] = useState<number[]>([]);
   const [searchText, setSearchText] = useState('');
   const [filterStatus, setFilterStatus] = useState<string | undefined>(undefined);
+  const [filterExpenseType, setFilterExpenseType] = useState<string | undefined>(undefined);
   const [generateForm] = Form.useForm();
 
   const fetchData = async () => {
     setLoading(true);
     try {
-      const res: any = await api.get('/bills');
+      const params: Record<string, string | undefined> = {};
+      if (filterStatus) params.status = filterStatus;
+      if (filterExpenseType) params.expenseType = filterExpenseType;
+      const res = await api.get('/bills', { params }) as unknown[];
       setBills(res);
     } catch (e) {
       console.error(e);
@@ -63,7 +67,7 @@ const BillsPage: React.FC = () => {
 
   useEffect(() => {
     fetchData();
-  }, []);
+  }, [filterStatus, filterExpenseType]);
 
   const filteredBills = useMemo(() => {
     return bills.filter((b: any) => {
@@ -332,6 +336,8 @@ const BillsPage: React.FC = () => {
               { value: 'paid', label: '已支付' },
             ]}
           />
+          <Select placeholder="费用类型" allowClear style={{ width: 120 }} value={filterExpenseType} onChange={setFilterExpenseType}
+            options={[{value:'water',label:'水费'},{value:'electricity',label:'电费'},{value:'cleaning',label:'保洁费'},{value:'rent',label:'租金'},{value:'other',label:'其他'}]} />
           <PermissionButton
             permission="bill:confirm"
             onClick={() => batchUpdateStatus('confirmed')}
diff --git a/apps/server/src/bills/bills.controller.ts b/apps/server/src/bills/bills.controller.ts
index 6aaa1b9..fe69d24 100644
--- a/apps/server/src/bills/bills.controller.ts
+++ b/apps/server/src/bills/bills.controller.ts
@@ -77,12 +77,12 @@ export class BillsController {
     @Query('periodEnd') periodEnd?: string,
     @Query('studentId') studentId?: string,
     @Query('status') status?: string,
+    @Query('expenseType') expenseType?: string,
   ) {
     return this.service.findAll({
-      periodStart,
-      periodEnd,
+      periodStart, periodEnd,
       studentId: studentId ? +studentId : undefined,
-      status,
+      status, expenseType,
     });
   }
 
diff --git a/apps/server/src/bills/bills.service.ts b/apps/server/src/bills/bills.service.ts
index 516682b..0fad122 100644
--- a/apps/server/src/bills/bills.service.ts
+++ b/apps/server/src/bills/bills.service.ts
@@ -227,6 +227,7 @@ export class BillsService {
     periodEnd?: string;
     studentId?: number;
     status?: string;
+    expenseType?: string;
   }) {
     const scopeIds = await this.scope.getScopeDepartmentIds();
     const qb = this.billRepo
@@ -238,6 +239,9 @@ export class BillsService {
     if (query?.periodEnd) qb.andWhere('b.periodEnd = :pe', { pe: query.periodEnd });
     if (query?.studentId) qb.andWhere('b.studentId = :sid', { sid: query.studentId });
     if (query?.status) qb.andWhere('b.status = :status', { status: query.status });
+    if (query?.expenseType) {
+      qb.innerJoin('b.items', 'bi', 'bi.expenseType = :et', { et: query.expenseType });
+    }
     const bills = await qb.getMany();
     return this.attachDepositInfo(bills);
   }
diff --git a/apps/server/src/sync/sync.service.ts b/apps/server/src/sync/sync.service.ts
index 03de116..de02350 100644
--- a/apps/server/src/sync/sync.service.ts
+++ b/apps/server/src/sync/sync.service.ts
@@ -157,10 +157,11 @@ export class SyncService {
       this.logger.warn('DingTalk not configured (DINGTALK_APP_KEY missing), skipping sync');
       return 0;
     }
-
-    this.logger.warn(
-      'DingTalk integration service not yet implemented — add DingTalkService to SyncModule to enable real sync',
-    );
+    // 接入指引：
+    // 1. 创建 apps/server/src/integration/dingtalk.service.ts，实现 fetchDepartments()/fetchUsers()
+    // 2. 在 SyncModule 中注入 DingTalkService
+    // 3. 取消以下注释并调用 this.dingTalkService.fetchDepartments()
+    this.logger.warn('DingTalk sync stub: create DingTalkService in src/integration/ to enable real sync');
     return 0;
   }