From 28cf22aaff7f092256db2ad6df699e17426f62ea Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 30 四月 2026 16:34:27 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
index eb5ed21..2395276 100644
--- a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
@@ -19,9 +19,9 @@
import com.ruoyi.purchase.service.ITicketRegistrationService;
import com.ruoyi.purchase.service.impl.PaymentRegistrationServiceImpl;
import com.ruoyi.sales.service.ICommonFileService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.parameters.P;
@@ -30,7 +30,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
@@ -43,7 +43,7 @@
@RestController
@RequestMapping("/purchase/registration")
@AllArgsConstructor
-@Api(tags = "鏉ョエ鐧昏")
+@Tag(name = "鏉ョエ鐧昏")
public class TicketRegistrationController extends BaseController {
private final PaymentRegistrationServiceImpl paymentRegistrationServiceImpl;
@@ -53,7 +53,6 @@
private IProductRecordService productRecordService;
- @Autowired
private IPaymentRegistrationService paymentRegistrationService;
/**
@@ -66,27 +65,27 @@
return getDataTable(list);
}
- @ApiOperation("鏍规嵁id鏌ヨ浠樻娴佹按淇℃伅")
+ @Operation(summary = "鏍规嵁id鏌ヨ浠樻娴佹按淇℃伅")
@GetMapping("/getById")
public List<PaymentRegistrationDto> getById( Long id ) {
return ticketRegistrationService.getPaymentRegistrationDtoById(id);
}
- @ApiOperation("鏍规嵁id鏌ヨ浠樻娴佹按")
+ @Operation(summary = "鏍规嵁id鏌ヨ浠樻娴佹按")
@GetMapping("/getPaymentRegistrationById")
public AjaxResult getPaymentRegistrationById(Long id) {
PaymentRegistration byId = paymentRegistrationService.getById(id);
return AjaxResult.success(byId);
}
- @ApiOperation("淇敼浠樻娴佹按")
+ @Operation(summary = "淇敼浠樻娴佹按")
@PutMapping("/updatePaymentRegistration")
@Log(title = "淇敼浠樻娴佹按", businessType = BusinessType.UPDATE)
public AjaxResult updatePaymentRegistration(@RequestBody PaymentRegistration paymentRegistratio) {
return AjaxResult.success(paymentRegistrationService.updatePaymentRegistration(paymentRegistratio));
}
- @ApiOperation("鍒犻櫎浠樻娴佹按")
+ @Operation(summary = "鍒犻櫎浠樻娴佹按")
@DeleteMapping("/delPaymentRegistration")
@Transactional(rollbackFor = Exception.class)
public AjaxResult delPaymentRegistration(@RequestBody List<Long> id) {
@@ -139,15 +138,15 @@
}
- @GetMapping("/getProductRecordById")
- public AjaxResult getProductRecordById(Long id) {
- if (id == null) {
+ @PostMapping("/getProductRecordById")
+ public AjaxResult getProductRecordById(@RequestBody ProductRecordDto productRecordDto) {
+ if (productRecordDto.getId() == null) {
return AjaxResult.error("鍙傛暟閿欒");
}
- return AjaxResult.success(productRecordService.getProductRecordById(id));
+ return AjaxResult.success(productRecordService.getProductRecordById(productRecordDto));
}
- @ApiModelProperty("淇敼鏉ョエ鐧昏")
+ @Schema(description = "淇敼鏉ョエ鐧昏")
@PostMapping("/updateRegistration")
public AjaxResult updateRegistration(@RequestBody ProductRecordDto productRecordDto) {
@@ -208,7 +207,7 @@
return ticketRegistrationService.selectTicketRegistrationListPage(page,ticketRegistration);
}
- @ApiModelProperty("鏍规嵁id鏌ヨ鏉ユ紓鐧昏")
+ @Schema(description = "鏍规嵁id鏌ヨ鏉ユ紓鐧昏")
@GetMapping("/getPuargeById")
public AjaxResult getPuargeById(Long id) {
return AjaxResult.success(ticketRegistrationService.getPuargeById( id));
--
Gitblit v1.9.3