From 0d7d874912d0147376826b55667a1deb6547ed91 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:25:27 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/device/service/IDeviceRepairService.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/service/IDeviceRepairService.java b/src/main/java/com/ruoyi/device/service/IDeviceRepairService.java
index c785435..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 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