From b2859e20392f07094ec84166b83e6189665404c2 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期六, 12 七月 2025 17:09:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim_yys'
---
src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
index 9d50979..0f2d5f4 100644
--- a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
@@ -19,6 +19,8 @@
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
+import org.springframework.security.core.parameters.P;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -82,11 +84,28 @@
return toAjax(ticketRegistrationService.addOrUpdateRegistration(ticketRegistrationDto));
}
+
+ @GetMapping("/getProductRecordById")
+ public AjaxResult getProductRecordById(Long id) {
+ if (id == null) {
+ return AjaxResult.error("鍙傛暟閿欒");
+ }
+ return AjaxResult.success(productRecordService.getProductRecordById(id));
+ }
+
+ @ApiModelProperty("淇敼鏉ョエ鐧昏")
+ @PostMapping("/updateRegistration")
+ public AjaxResult updateRegistration(@RequestBody ProductRecordDto productRecordDto) {
+
+ return productRecordService.updateRecord(productRecordDto);
+ }
+
/**
- * 鍒犻櫎鏉ョエ鐧昏
+ * 鍒犻櫎鏉ョエ鐧昏(鏉ョエ鍙拌处)
*/
- @Log(title = "鏉ョエ鐧昏", businessType = BusinessType.DELETE)
+ @Log(title = "鍒犻櫎鏉ョエ鐧昏(鏉ョエ鍙拌处)", businessType = BusinessType.DELETE)
@DeleteMapping("/delRegistration")
+ @Transactional(rollbackFor = Exception.class)
public AjaxResult delRegistration(@RequestBody Long[] ids) {
return toAjax(ticketRegistrationService.delRegistration(ids));
}
@@ -114,6 +133,7 @@
*/
@GetMapping("/productRecordPage")
public AjaxResult productRecordPage(Page page, TicketRegistrationDto ticketRegistrationDto) {
+
IPage<ProductRecordDto> list = productRecordService.productRecordPage(page,ticketRegistrationDto);
return AjaxResult.success(list);
}
--
Gitblit v1.9.3