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 | 103 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 80 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
index 73dcd51..9d50979 100644
--- a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
@@ -1,45 +1,54 @@
package com.ruoyi.purchase.controller;
-import javax.servlet.http.HttpServletResponse;
-
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.purchase.dto.TicketRegistrationDto;
-import com.ruoyi.purchase.pojo.TicketRegistration;
-import com.ruoyi.purchase.service.ITicketRegistrationService;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
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;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import java.util.List;
/**
* 鏉ョエ鐧昏Controller
- *
+ *
* @author ruoyi
* @date 2025-05-13
*/
@RestController
@RequestMapping("/purchase/registration")
@AllArgsConstructor
+@Api(tags = "鏉ョエ鐧昏")
public class TicketRegistrationController extends BaseController {
private ITicketRegistrationService ticketRegistrationService;
+
+ private ICommonFileService commonFileService;
+
+ private IProductRecordService productRecordService;
/**
* 鏌ヨ鏉ョエ鐧昏鍒楄〃
*/
@GetMapping("/list")
- public TableDataInfo list(TicketRegistration ticketRegistration)
- {
+ public TableDataInfo list(TicketRegistration ticketRegistration) {
startPage();
List<TicketRegistration> list = ticketRegistrationService.selectTicketRegistrationList(ticketRegistration);
return getDataTable(list);
@@ -50,8 +59,7 @@
*/
@Log(title = "鏉ョエ鐧昏", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, TicketRegistration ticketRegistration)
- {
+ public void export(HttpServletResponse response, TicketRegistration ticketRegistration) {
List<TicketRegistration> list = ticketRegistrationService.selectTicketRegistrationList(ticketRegistration);
ExcelUtil<TicketRegistration> util = new ExcelUtil<TicketRegistration>(TicketRegistration.class);
util.exportExcel(response, list, "鏉ョエ鐧昏鏁版嵁");
@@ -69,9 +77,8 @@
* 鏂板淇敼鏉ョエ鐧昏
*/
@Log(title = "鏉ョエ鐧昏", businessType = BusinessType.INSERT)
- @PostMapping ("/addOrUpdateRegistration")
- public AjaxResult addOrUpdateRegistration(@RequestBody TicketRegistrationDto ticketRegistrationDto)
- {
+ @PostMapping("/addOrUpdateRegistration")
+ public AjaxResult addOrUpdateRegistration(@RequestBody TicketRegistrationDto ticketRegistrationDto) throws IOException {
return toAjax(ticketRegistrationService.addOrUpdateRegistration(ticketRegistrationDto));
}
@@ -79,10 +86,60 @@
* 鍒犻櫎鏉ョエ鐧昏
*/
@Log(title = "鏉ョエ鐧昏", businessType = BusinessType.DELETE)
- @DeleteMapping("/delRegistration")
- public AjaxResult delRegistration(@RequestBody Long[] ids)
- {
+ @DeleteMapping("/delRegistration")
+ public AjaxResult delRegistration(@RequestBody Long[] ids) {
return toAjax(ticketRegistrationService.delRegistration(ids));
}
+ @PostMapping("/upload")
+ public AjaxResult uploadFile(MultipartFile file, Long id, Integer type) {
+ try {
+ return AjaxResult.success(commonFileService.uploadFile(file, id, type));
+ } catch (Exception e) {
+ return AjaxResult.error(e.getMessage());
+ }
+ }
+
+ /**
+ * 鏌ヨ浜у搧淇℃伅寮�绁ㄨ褰曞垪琛�
+ */
+ @GetMapping("/productRecordList")
+ public List<ProductRecord> productRecordList(TicketRegistrationDto ticketRegistrationDto) {
+ List<ProductRecord> list = productRecordService.selectProductRecordList(ticketRegistrationDto);
+ return list;
+ }
+
+ /**
+ * 鍒嗛〉鏌ヨ浜у搧淇℃伅寮�绁ㄨ褰曞垪琛�
+ */
+ @GetMapping("/productRecordPage")
+ public AjaxResult productRecordPage(Page page, TicketRegistrationDto ticketRegistrationDto) {
+ IPage<ProductRecordDto> list = productRecordService.productRecordPage(page,ticketRegistrationDto);
+ return AjaxResult.success(list);
+ }
+
+ /**
+ * 鏌ヨ鍙戠エ鍙�
+ */
+ @GetMapping("/getTicketNo")
+ public AjaxResult getTicketNo(TicketRegistrationDto ticketRegistrationDto) {
+ return AjaxResult.success(ticketRegistrationService.getTicketNo(ticketRegistrationDto));
+ }
+
+ /**
+ * 鏌ヨ鏉ョエ鐧昏鍒楄〃
+ */
+ @GetMapping("/listPage")
+ 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