From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/service/business/BikeRepairService.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/BikeRepairService.java b/server/services/src/main/java/com/doumee/service/business/BikeRepairService.java
index 00053a9..6fc2d40 100644
--- a/server/services/src/main/java/com/doumee/service/business/BikeRepairService.java
+++ b/server/services/src/main/java/com/doumee/service/business/BikeRepairService.java
@@ -3,6 +3,10 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.BikeRepair;
+import com.doumee.dao.business.model.Multifile;
+import com.doumee.dao.business.web.request.BikeRepairDTO;
+import com.doumee.dao.business.web.request.BikeRepairProblemDTO;
+import com.doumee.dao.business.web.request.BikeRepairQuery;
import com.doumee.dao.business.web.request.RepairRequest;
import java.util.List;
@@ -16,7 +20,7 @@
/**
* 鍒涘缓
- *
+ *
* @param bikeRepair 瀹炰綋瀵硅薄
* @return String
*/
@@ -80,14 +84,21 @@
* @return List<BikeRepair>
*/
List<BikeRepair> findList(BikeRepair bikeRepair);
-
+
/**
* 鍒嗛〉鏌ヨ
*
* @param pageWrap 鍒嗛〉瀵硅薄
* @return PageData<BikeRepair>
*/
- PageData<BikeRepair> findPage(PageWrap<BikeRepair> pageWrap);
+ PageData<BikeRepairDTO> findPage(PageWrap<BikeRepairQuery> pageWrap);
+
+ /**
+ *
+ * 鑾峰彇涓婃姤浜虹殑淇濅慨淇℃伅
+ * @return BikeRepairProblemDTO
+ */
+ List<Multifile> getBikeRepairProblemDTO(String id);
/**
* 鏉′欢缁熻
@@ -97,5 +108,7 @@
*/
long count(BikeRepair bikeRepair);
- void saveRepair(RepairRequest repairRequest);
+ void saveRepair(RepairRequest repairRequest) throws Exception;
+
+ void dealDo(BikeRepair bikeRepair);
}
--
Gitblit v1.9.3