From cf99945deda3cba4b0e634abb100847f5cc2529b Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 07 五月 2026 11:36:46 +0800
Subject: [PATCH] 优化共享客户以及列表查询
---
src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java | 56 +++++++++++++++++++++++++-------------------------------
1 files changed, 25 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
index d4fd91b..db628af 100644
--- a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
@@ -19,17 +19,15 @@
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.Operation;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.parameters.P;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
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;
@@ -42,7 +40,7 @@
@RestController
@RequestMapping("/purchase/registration")
@AllArgsConstructor
-@Api(tags = "鏉ョエ鐧昏")
+@Tag(name = "鏉ョエ鐧昏")
public class TicketRegistrationController extends BaseController {
private final PaymentRegistrationServiceImpl paymentRegistrationServiceImpl;
@@ -52,7 +50,6 @@
private IProductRecordService productRecordService;
- @Autowired
private IPaymentRegistrationService paymentRegistrationService;
/**
@@ -65,29 +62,30 @@
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")
- public AjaxResult delPaymentRegistration(@RequestBody Long id) {
+ @Transactional(rollbackFor = Exception.class)
+ public AjaxResult delPaymentRegistration(@RequestBody List<Long> id) {
return toAjax(paymentRegistrationService.delPaymentRegistration(id));
}
@@ -127,20 +125,25 @@
*/
@Log(title = "鏉ョエ鐧昏", businessType = BusinessType.INSERT)
@PostMapping("/addOrUpdateRegistration")
- public AjaxResult addOrUpdateRegistration(@RequestBody TicketRegistrationDto ticketRegistrationDto) throws IOException {
- return toAjax(ticketRegistrationService.addOrUpdateRegistration(ticketRegistrationDto));
+ @Transactional(rollbackFor = Exception.class)
+ public AjaxResult addOrUpdateRegistration(@RequestBody List<TicketRegistrationDto> ticketRegistrationDto) throws IOException {
+ if(CollectionUtils.isEmpty(ticketRegistrationDto)) return AjaxResult.error("璇烽�夋嫨瑕佷繚瀛樼殑璁板綍");
+ for (TicketRegistrationDto ticketRegistrationDto1 : ticketRegistrationDto) {
+ ticketRegistrationService.addOrUpdateRegistration(ticketRegistrationDto1);
+ }
+ return toAjax(1);
}
- @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) {
@@ -155,15 +158,6 @@
@Transactional(rollbackFor = Exception.class)
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());
- }
}
/**
@@ -201,7 +195,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