From f5ee8e7afb178179c1d1d078cf42fe33dc7607f9 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 20 五月 2026 16:02:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/device/service/IDeviceRepairService.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/service/IDeviceRepairService.java b/src/main/java/com/ruoyi/device/service/IDeviceRepairService.java
index 5877ffd..f6e112c 100644
--- a/src/main/java/com/ruoyi/device/service/IDeviceRepairService.java
+++ b/src/main/java/com/ruoyi/device/service/IDeviceRepairService.java
@@ -5,20 +5,25 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.pojo.DeviceRepair;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.device.vo.DeviceRepairVo;
+import com.ruoyi.framework.web.domain.R;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
public interface IDeviceRepairService extends IService<DeviceRepair> {
- IPage<DeviceRepairDto> queryPage(Page page, DeviceRepairDto deviceRepairDto);
+ IPage<DeviceRepairVo> queryPage(Page page, DeviceRepairDto deviceRepairDto);
- AjaxResult saveDeviceRepair(DeviceRepair deviceRepair);
+ R<?> saveDeviceRepair(DeviceRepairDto deviceRepairDto);
- AjaxResult updateDeviceRepair(DeviceRepair deviceRepair);
+ R<?> updateDeviceRepair(DeviceRepairDto deviceRepairDto);
+
+ R<?> confirmRepair(DeviceRepairDto deviceRepairDto);
+
+ R<?> approveRepairAcceptance(DeviceRepairDto deviceRepairDto);
void export(HttpServletResponse response, Long[] ids);
- DeviceRepairDto detailById(Long id);
+ DeviceRepairVo detailById(Long id);
}
--
Gitblit v1.9.3