From f9a3ac34d690aafc96757370e1f6f948ad98368d Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 22 九月 2025 17:28:12 +0800
Subject: [PATCH] yys 1.回款登记台账页面，增加一个开票日期列 2.销售台账，在合同金额后面，增加已开票金额、待开票金额、已回款金额、待回款金额
---
src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
index acbb8a5..37ce27d 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
@@ -4,19 +4,23 @@
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;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
+import java.util.Arrays;
-
+@Api(tags = "璁惧淇濆吇")
@RestController
@RequestMapping("/device/maintenance")
public class DeviceMaintenanceController {
@@ -24,6 +28,9 @@
@Autowired
private IDeviceMaintenanceService deviceMaintenanceService;
+
+ @Autowired
+ private IDeviceLedgerService deviceLedgerService;
@ApiModelProperty("璁惧淇濆吇鍒楄〃")
@GetMapping("/page")
@@ -33,8 +40,11 @@
@PostMapping()
@ApiModelProperty("娣诲姞璁惧淇濆吇")
- public AjaxResult add(@RequestBody DeviceMaintenance deviceRepair) {
- return deviceMaintenanceService.saveDeviceRepair(deviceRepair);
+ public AjaxResult add(@RequestBody DeviceMaintenance deviceMaintenance) {
+ DeviceLedger byId = deviceLedgerService.getById(deviceMaintenance.getDeviceLedgerId());
+ deviceMaintenance.setDeviceName(byId.getDeviceName());
+ deviceMaintenance.setDeviceModel(byId.getDeviceModel());
+ return deviceMaintenanceService.saveDeviceRepair(deviceMaintenance);
}
@ApiModelProperty("鏍规嵁id鏌ヨ璁惧淇濆吇")
@@ -46,20 +56,24 @@
@PutMapping ()
@ApiModelProperty("淇敼璁惧淇濆吇")
public AjaxResult update(@RequestBody DeviceMaintenance deviceMaintenance) {
- return deviceMaintenanceService.updateDeviceRepair(deviceMaintenance);
+ DeviceLedger byId = deviceLedgerService.getById(deviceMaintenance.getDeviceLedgerId());
+ deviceMaintenance.setDeviceName(byId.getDeviceName());
+ deviceMaintenance.setDeviceModel(byId.getDeviceModel());
+ return deviceMaintenanceService.updateDeviceDeviceMaintenance(deviceMaintenance);
}
@PostMapping ("maintenance")
@ApiModelProperty("淇敼璁惧淇濆吇")
public AjaxResult maintenance(@RequestBody DeviceMaintenance deviceMaintenance) {
- return deviceMaintenanceService.updateDeviceRepair(deviceMaintenance);
+ deviceMaintenance.setStatus(1);
+ return deviceMaintenanceService.updateDeviceDeviceMaintenance(deviceMaintenance);
}
- @DeleteMapping("/{id}")
+ @DeleteMapping("/{ids}")
@ApiModelProperty("鍒犻櫎璁惧淇濆吇")
- public AjaxResult delete(@PathVariable ArrayList<Long> ids) {
- boolean b = deviceMaintenanceService.removeBatchByIds(ids);
+ public AjaxResult delete(@PathVariable("ids") Long[] ids) {
+ boolean b = deviceMaintenanceService.removeBatchByIds(Arrays.asList(ids));
if (!b) {
return AjaxResult.error("鍒犻櫎澶辫触");
}
--
Gitblit v1.9.3