From 75fc9507b16e6c5d637819f4d614f4468afae90d Mon Sep 17 00:00:00 2001
From: litao <a15234804788@163.com>
Date: Sat, 23 Nov 2024 18:46:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=B7=A1=E6=A3=80=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/business/contraller/DeviceController.java         | 4 ++++
 .../modules/business/contraller/InvoiceController.java        | 2 +-
 .../org/springblade/modules/business/pojo/vo/DeviceVO.java    | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/springblade/modules/business/contraller/DeviceController.java b/src/main/java/org/springblade/modules/business/contraller/DeviceController.java
index c67bc4c..33602f3 100644
--- a/src/main/java/org/springblade/modules/business/contraller/DeviceController.java
+++ b/src/main/java/org/springblade/modules/business/contraller/DeviceController.java
@@ -18,8 +18,10 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.modules.business.pojo.dto.DeviceDTO;
 import org.springblade.modules.business.pojo.entity.Device;
 import org.springblade.modules.business.pojo.entity.DeviceAttach;
+import org.springblade.modules.business.pojo.entity.DeviceMaintenance;
 import org.springblade.modules.business.pojo.vo.DeviceVO;
 import org.springblade.modules.business.service.IDeviceAttachService;
+import org.springblade.modules.business.service.IDeviceMaintenanceService;
 import org.springblade.modules.business.service.IDeviceService;
 import org.springframework.web.bind.annotation.*;
 
@@ -40,6 +42,7 @@ public class DeviceController extends BladeController {
 
     private final IDeviceService deviceService;
     private final IDeviceAttachService deviceAttachService;
+    private final IDeviceMaintenanceService maintenanceService;
 
     /**
      * 设备表 详情
@@ -51,6 +54,7 @@ public class DeviceController extends BladeController {
         DeviceVO deviceVO = Objects.requireNonNull(BeanUtil.copy(detail, DeviceVO.class));
         List<DeviceAttach> attaches = deviceAttachService.list(Wrappers.lambdaQuery(DeviceAttach.class).eq(DeviceAttach::getDeviceId, device.getId()));
         deviceVO.setAttaches(attaches);
+        deviceVO.setMaintenances(maintenanceService.list(Wrappers.lambdaQuery(DeviceMaintenance.class).eq(DeviceMaintenance::getDeviceId, device.getId())));
         return R.data(deviceVO);
     }
 
diff --git a/src/main/java/org/springblade/modules/business/contraller/InvoiceController.java b/src/main/java/org/springblade/modules/business/contraller/InvoiceController.java
index 16f9b7e..ac015f5 100644
--- a/src/main/java/org/springblade/modules/business/contraller/InvoiceController.java
+++ b/src/main/java/org/springblade/modules/business/contraller/InvoiceController.java
@@ -57,7 +57,7 @@ public class InvoiceController extends BladeController {
 		}
 		// 新增
 		if (CollectionUtil.isNotEmpty(add)) {
-			res = invoiceService.updateBatchById(add);
+			res = invoiceService.saveBatch(add);
 		}
 		return R.data(res);
 	}
diff --git a/src/main/java/org/springblade/modules/business/pojo/vo/DeviceVO.java b/src/main/java/org/springblade/modules/business/pojo/vo/DeviceVO.java
index 8845178..6e1eaac 100644
--- a/src/main/java/org/springblade/modules/business/pojo/vo/DeviceVO.java
+++ b/src/main/java/org/springblade/modules/business/pojo/vo/DeviceVO.java
@@ -5,6 +5,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.modules.business.pojo.entity.Device;
 import org.springblade.modules.business.pojo.entity.DeviceAttach;
+import org.springblade.modules.business.pojo.entity.DeviceMaintenance;
 
 import java.util.List;
 
@@ -20,4 +21,5 @@ public class DeviceVO extends Device {
 	private static final long serialVersionUID = 1L;
 
 	List<DeviceAttach> attaches;
+	List<DeviceMaintenance> maintenances;
 }