From aab9f74b97df038154d507b6d17b6f96a8337efc Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 03 七月 2025 13:46:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
index e3502ba..37ce27d 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
@@ -4,8 +4,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.dto.DeviceMaintenanceDto;
import com.ruoyi.device.dto.DeviceRepairDto;
+import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.pojo.DeviceRepair;
+import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.device.service.IDeviceMaintenanceService;
import com.ruoyi.device.service.IDeviceRepairService;
import com.ruoyi.framework.web.domain.AjaxResult;
@@ -27,6 +29,9 @@
@Autowired
private IDeviceMaintenanceService deviceMaintenanceService;
+ @Autowired
+ private IDeviceLedgerService deviceLedgerService;
+
@ApiModelProperty("璁惧淇濆吇鍒楄〃")
@GetMapping("/page")
public AjaxResult page(Page page , DeviceMaintenanceDto deviceMaintenanceDto) {
@@ -36,6 +41,9 @@
@PostMapping()
@ApiModelProperty("娣诲姞璁惧淇濆吇")
public AjaxResult add(@RequestBody DeviceMaintenance deviceMaintenance) {
+ DeviceLedger byId = deviceLedgerService.getById(deviceMaintenance.getDeviceLedgerId());
+ deviceMaintenance.setDeviceName(byId.getDeviceName());
+ deviceMaintenance.setDeviceModel(byId.getDeviceModel());
return deviceMaintenanceService.saveDeviceRepair(deviceMaintenance);
}
@@ -48,6 +56,9 @@
@PutMapping ()
@ApiModelProperty("淇敼璁惧淇濆吇")
public AjaxResult update(@RequestBody DeviceMaintenance deviceMaintenance) {
+ DeviceLedger byId = deviceLedgerService.getById(deviceMaintenance.getDeviceLedgerId());
+ deviceMaintenance.setDeviceName(byId.getDeviceName());
+ deviceMaintenance.setDeviceModel(byId.getDeviceModel());
return deviceMaintenanceService.updateDeviceDeviceMaintenance(deviceMaintenance);
}
@@ -59,7 +70,7 @@
}
- @DeleteMapping("/{ida}")
+ @DeleteMapping("/{ids}")
@ApiModelProperty("鍒犻櫎璁惧淇濆吇")
public AjaxResult delete(@PathVariable("ids") Long[] ids) {
boolean b = deviceMaintenanceService.removeBatchByIds(Arrays.asList(ids));
--
Gitblit v1.9.3