From 0989ec1e6b465141f99ed67e40fa2a0b928dce94 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 29 四月 2026 16:54:51 +0800
Subject: [PATCH] feat(production): 新增生产核算和生产工单功能模块 - 添加生产核算控制器、服务接口及实现类 - 实现生产核算分页查询和工人生产工资信息查询功能 - 添加生产工单控制器、服务接口及实现类 - 实现生产工单的增删改查和状态统计功能 - 集成工单流转卡下载和二维码生成功能 - 添加工单相关的数据传输对象和值对象 - 实现工单与用户关联的分配功能 - 完善工单附件图片处理和展示功能
---
src/main/java/com/ruoyi/device/controller/DeviceRepairController.java | 51 ++++++++++++++++++++-------------------------------
1 files changed, 20 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java b/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
index 8c103ed..d3c19bb 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
@@ -3,68 +3,57 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.dto.DeviceRepairDto;
-import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.device.pojo.DeviceRepair;
-import com.ruoyi.device.service.IDeviceLedgerService;
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 io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
import java.util.Arrays;
-@Api(tags = "璁惧鎶ヤ慨绠＄悊")
+@Tag(name = "璁惧鎶ヤ慨绠＄悊")
@RequestMapping("/device/repair")
@RestController
+@AllArgsConstructor
public class DeviceRepairController {
- @Autowired
private IDeviceRepairService deviceRepairService;
- @Autowired
- private IDeviceLedgerService deviceLedgerService;
-
- @ApiModelProperty("璁惧鎶ヤ慨鍒楄〃")
+ @Operation(summary = "璁惧鎶ヤ慨鍒楄〃")
@GetMapping("/page")
public AjaxResult page(Page page , DeviceRepairDto deviceRepairDto) {
return AjaxResult.success(deviceRepairService.queryPage(page,deviceRepairDto));
}
@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);
+ @Operation(summary = "娣诲姞璁惧鎶ヤ慨")
+ public AjaxResult add( @RequestBody DeviceRepairDto deviceRepairDto) {
+ return deviceRepairService.saveDeviceRepair(deviceRepairDto);
}
- @ApiModelProperty("鏍规嵁id鏌ヨ璁惧鎶ヤ慨")
+ @Operation(summary = "鏍规嵁id鏌ヨ璁惧鎶ヤ慨")
@GetMapping("/{id}")
public AjaxResult detail(@PathVariable Long id) {
- DeviceRepairDto byId = deviceRepairService.detailById(id);
- return AjaxResult.success(byId);
+ return AjaxResult.success(deviceRepairService.detailById(id));
}
@PutMapping ()
- @ApiModelProperty("淇敼璁惧鎶ヤ慨")
- public AjaxResult update( @RequestBody DeviceRepair deviceRepair) {
- return deviceRepairService.updateDeviceRepair(deviceRepair);
+ @Operation(summary = "淇敼璁惧鎶ヤ慨")
+ public AjaxResult update( @RequestBody DeviceRepairDto deviceRepairDto) {
+ return deviceRepairService.updateDeviceRepair(deviceRepairDto);
}
@PostMapping ("repair")
- @ApiModelProperty("璁惧缁翠慨")
- public AjaxResult repair( @RequestBody DeviceRepair deviceRepair) {
- deviceRepair.setStatus(1);
- return deviceRepairService.updateDeviceRepair(deviceRepair);
+ @Operation(summary = "璁惧缁翠慨")
+ public AjaxResult repair( @RequestBody DeviceRepairDto deviceRepairDto) {
+ return deviceRepairService.updateDeviceRepair(deviceRepairDto);
}
@DeleteMapping("/{ids}")
- @ApiModelProperty("鍒犻櫎璁惧鎶ヤ慨")
+ @Operation(summary = "鍒犻櫎璁惧鎶ヤ慨")
public AjaxResult delete(@PathVariable("ids") Long[] ids) {
boolean b = deviceRepairService.removeBatchByIds(Arrays.asList(ids));
if (!b) {
@@ -74,7 +63,7 @@
}
@PostMapping("export")
- @ApiModelProperty("瀵煎嚭璁惧鎶ヤ慨")
+ @Operation(summary = "瀵煎嚭璁惧鎶ヤ慨")
public void export(HttpServletResponse response, Long[] ids) {
deviceRepairService.export(response, ids);
}
--
Gitblit v1.9.3