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/DeviceRepairController.java | 6 ++++++
src/main/java/com/ruoyi/device/pojo/DeviceRepair.java | 4 ++++
src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java | 13 ++++++++++++-
doc/add.sql | 8 ++++++++
src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java | 5 +++++
5 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/doc/add.sql b/doc/add.sql
index 2d53f4a..35b95ae 100644
--- a/doc/add.sql
+++ b/doc/add.sql
@@ -74,3 +74,11 @@
alter table product_record
add 鍒梍name int null comment 'sale_ledger_projectI_id';
+# 娣诲姞璁惧鍚嶇О鍜岃鏍煎瀷鍙�
+ALTER TABLE `product-inventory-management`.`device_repair`
+ ADD COLUMN `device_name` varchar(255) NULL AFTER `tenant_id`,
+ ADD COLUMN `device_model` varchar(255) NULL AFTER `device_name`;
+
+ALTER TABLE `product-inventory-management`.`device_maintenance`
+ ADD COLUMN `device_name` varchar(255) NULL AFTER `tenant_id`,
+ ADD COLUMN `device_model` varchar(255) NULL AFTER `device_name`;
\ No newline at end of file
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));
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java b/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
index 55e8189..8c103ed 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
@@ -25,6 +25,9 @@
@Autowired
private IDeviceRepairService deviceRepairService;
+ @Autowired
+ private IDeviceLedgerService deviceLedgerService;
+
@ApiModelProperty("璁惧鎶ヤ慨鍒楄〃")
@GetMapping("/page")
public AjaxResult page(Page page , DeviceRepairDto deviceRepairDto) {
@@ -34,6 +37,9 @@
@PostMapping()
@ApiModelProperty("娣诲姞璁惧鎶ヤ慨")
public AjaxResult add( @RequestBody DeviceRepair deviceRepair) {
+ DeviceLedger byId = deviceLedgerService.getById(deviceRepair.getDeviceLedgerId());
+ deviceRepair.setDeviceName(byId.getDeviceName());
+ deviceRepair.setDeviceModel(byId.getDeviceModel());
return deviceRepairService.saveDeviceRepair(deviceRepair);
}
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
index 890d61f..f5d5463 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
@@ -22,6 +22,11 @@
@ApiModelProperty("璁惧鍙拌处id")
private Long deviceLedgerId;
+
+ private String deviceName;
+
+ private String deviceModel;
+
@ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
index ebc2dea..5804519 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
@@ -25,6 +25,10 @@
@ApiModelProperty("璁惧鍙拌处id")
private Long deviceLedgerId;
+ private String deviceName;
+
+ private String deviceModel;
+
@ApiModelProperty("鎶ヤ慨鏃堕棿")
private Date repairTime;
--
Gitblit v1.9.3