From e83d4cecece6e8677392229e996dea22bbe2d1e9 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 24 六月 2025 18:05:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
index 93cb18a..9d50979 100644
--- a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
@@ -8,12 +8,16 @@
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.purchase.dto.ProductRecordDto;
import com.ruoyi.purchase.dto.TicketRegistrationDto;
import com.ruoyi.purchase.pojo.ProductRecord;
import com.ruoyi.purchase.pojo.TicketRegistration;
import com.ruoyi.purchase.service.IProductRecordService;
import com.ruoyi.purchase.service.ITicketRegistrationService;
import com.ruoyi.sales.service.ICommonFileService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -31,6 +35,7 @@
@RestController
@RequestMapping("/purchase/registration")
@AllArgsConstructor
+@Api(tags = "鏉ョエ鐧昏")
public class TicketRegistrationController extends BaseController {
private ITicketRegistrationService ticketRegistrationService;
@@ -87,7 +92,7 @@
}
@PostMapping("/upload")
- public AjaxResult uploadFile(MultipartFile file, Long id, String type) {
+ public AjaxResult uploadFile(MultipartFile file, Long id, Integer type) {
try {
return AjaxResult.success(commonFileService.uploadFile(file, id, type));
} catch (Exception e) {
@@ -105,6 +110,15 @@
}
/**
+ * 鍒嗛〉鏌ヨ浜у搧淇℃伅寮�绁ㄨ褰曞垪琛�
+ */
+ @GetMapping("/productRecordPage")
+ public AjaxResult productRecordPage(Page page, TicketRegistrationDto ticketRegistrationDto) {
+ IPage<ProductRecordDto> list = productRecordService.productRecordPage(page,ticketRegistrationDto);
+ return AjaxResult.success(list);
+ }
+
+ /**
* 鏌ヨ鍙戠エ鍙�
*/
@GetMapping("/getTicketNo")
@@ -119,4 +133,13 @@
public IPage<TicketRegistration> listPage(Page page, TicketRegistration ticketRegistration) {
return ticketRegistrationService.selectTicketRegistrationListPage(page,ticketRegistration);
}
+
+ @ApiModelProperty("鏍规嵁id鏌ヨ鏉ユ紓鐧昏")
+ @GetMapping("/getPuargeById")
+ public AjaxResult getPuargeById(Long id) {
+ return AjaxResult.success(ticketRegistrationService.getPuargeById( id));
+ }
+
+
+
}
--
Gitblit v1.9.3