feat:"完成页面接口的对接"

后端/src/service/service.service.ts

@@ -29,8 +29,8 @@ export class ServiceService {
     return this.serviceRepository.save(service);
   }
 
-  async findAll(query: QueryServiceDto): Promise<Service[]> {
-    const { type, status } = query;
+  async findAll(query: QueryServiceDto): Promise<any> {
+    const { type, status, keyword } = query;
     const queryBuilder = this.serviceRepository.createQueryBuilder('service');
 
     if (type) {
@@ -41,10 +41,22 @@ export class ServiceService {
       queryBuilder.andWhere('service.status = :status', { status });
     }
 
+    if (keyword) {
+      queryBuilder.andWhere(
+        '(service.name LIKE :keyword OR service.description LIKE :keyword)',
+        { keyword: `%${keyword}%` }
+      );
+    }
+
     queryBuilder.orderBy('service.sortOrder', 'ASC');
     queryBuilder.addOrderBy('service.createdAt', 'DESC');
 
-    return queryBuilder.getMany();
+    const services = await queryBuilder.getMany();
+    
+    return {
+      list: services,
+      total: services.length
+    };
   }
 
   async findOne(id: number): Promise<Service> {
@@ -94,11 +106,16 @@ export class ServiceService {
     await this.serviceRepository.remove(service);
   }
 
-  async getActiveServices(): Promise<Service[]> {
-    return this.serviceRepository.find({
+  async getActiveServices(): Promise<any> {
+    const services = await this.serviceRepository.find({
       where: { status: 'active' },
       order: { sortOrder: 'ASC', createdAt: 'DESC' }
     });
+
+    return {
+      list: services,
+      total: services.length
+    };
   }
 
   async updateSortOrder(serviceOrders: { id: number; sortOrder: number }[]): Promise<void> {