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 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 attaches; + List maintenances; }