From dd69bfc1fb8e5e28dde754fab7f23bfb1a18faa5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 05 六月 2026 16:58:07 +0800
Subject: [PATCH] config(dev): 更新开发环境配置和文件上传功能 - 调整文件上传路径配置 - 修复OA环境文件链接前缀配置 - 在审批实例服务中添加报销相关数据删除逻辑 - 实现申请人姓名自动填充功能 - 添加文件下载预览路由的正则表达式支持 - 为企业新闻VO添加附件列表兼容别名 - 完善员工入职服务的异常处理 - 新增账户附件管理控制器 - 实现文件上传接口并返回完整文件信息
---
src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java b/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java
index c67d438..f88a0e6 100644
--- a/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java
+++ b/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java
@@ -9,9 +9,9 @@
import com.ruoyi.sales.mapper.PaymentShippingMapper;
import com.ruoyi.sales.pojo.PaymentShipping;
import com.ruoyi.sales.service.PaymentShippingService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -23,34 +23,32 @@
*/
@RestController
@RequestMapping("/paymentShipping")
-@Api(tags = "鏀粯涓庡彂璐х鐞�")
+@Tag(name = "鏀粯涓庡彂璐х鐞�")
+@AllArgsConstructor
public class PaymentShippingController extends BaseController {
- @Autowired
private PaymentShippingService paymentShippingService;
-
- @Autowired
private PaymentShippingMapper paymentShippingMapper;
@GetMapping("/listPage")
- @ApiOperation("鍒嗛〉鏌ヨ鏀粯涓庡彂璐т俊鎭�")
+ @Operation(summary = "鍒嗛〉鏌ヨ鏀粯涓庡彂璐т俊鎭�")
public AjaxResult listPage(Page page, PaymentShipping paymentShipping) {
IPage<PaymentShipping> listPage = paymentShippingService.listPage(page, paymentShipping);
return AjaxResult.success(listPage);
}
@PostMapping("/add")
- @ApiOperation("娣诲姞鏀粯涓庡彂璐т俊鎭�")
+ @Operation(summary = "娣诲姞鏀粯涓庡彂璐т俊鎭�")
@Transactional(rollbackFor = Exception.class)
public AjaxResult add(@RequestBody PaymentShipping paymentShipping) {
- String ord = OrderUtils.countTodayByCreateTime(paymentShippingMapper, "ORD");
+ String ord = OrderUtils.countTodayByCreateTime(paymentShippingMapper, "ORD","order_no");
paymentShipping.setOrderNo(ord);
boolean save = paymentShippingService.save(paymentShipping);
return save ? success() : error();
}
@PostMapping("/update")
- @ApiOperation("淇敼鏀粯涓庡彂璐т俊鎭�")
+ @Operation(summary = "淇敼鏀粯涓庡彂璐т俊鎭�")
@Transactional(rollbackFor = Exception.class)
public AjaxResult update(@RequestBody PaymentShipping paymentShipping) {
boolean update = paymentShippingService.updateById(paymentShipping);
@@ -58,7 +56,7 @@
}
@DeleteMapping("/delete")
- @ApiOperation("鍒犻櫎鏀粯涓庡彂璐т俊鎭�")
+ @Operation(summary = "鍒犻櫎鏀粯涓庡彂璐т俊鎭�")
@Transactional(rollbackFor = Exception.class)
public AjaxResult delete(@RequestBody List<Long> ids){
if (CollectionUtils.isEmpty(ids)){
--
Gitblit v1.9.3