From 2dd645b5346f510d1207346347f1fa70a204d9d3 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期四, 05 十一月 2026 16:11:34 +0800
Subject: [PATCH] 1. 完成项目管理全流程优化，补充阶段推进、汇报统计及生命周期记录。 2. 完成业务与项目数据关联，支持查看项目进度、详情及相关附件。 3. 完成采购审批流程接入，支持配置审批人员及采购业务审批。 4. 精简用户、角色、部门、菜单和字典，完善操作日志及附件下载。
---
src/main/java/com/ruoyi/basic/controller/ProductController.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/controller/ProductController.java b/src/main/java/com/ruoyi/basic/controller/ProductController.java
index 7fde4fe..1c5224b 100644
--- a/src/main/java/com/ruoyi/basic/controller/ProductController.java
+++ b/src/main/java/com/ruoyi/basic/controller/ProductController.java
@@ -10,6 +10,7 @@
import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.basic.service.IProductModelService;
import com.ruoyi.basic.service.IProductService;
+import com.ruoyi.basic.vo.ProductModelVo;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -17,11 +18,8 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.ISalesLedgerProductService;
-import com.ruoyi.sales.service.ISalesLedgerService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -116,9 +114,9 @@
return productModelService.modelListPage(page, productDto);
}
- @ApiOperation("鍒嗛〉鏌ヨ鎵�鏈変骇鍝佸瀷鍙�")
+ @Operation(summary = "鍒嗛〉鏌ヨ鎵�鏈変骇鍝佸瀷鍙�")
@GetMapping("/pageModel")
- public IPage<ProductModel> listPageProductModel(Page<ProductModel> page, ProductModel productModel) {
+ public IPage<ProductModelVo> listPageProductModel(Page<ProductModelVo> page, ProductModel productModel) {
return productService.listPageProductModel(page, productModel);
}
@@ -135,7 +133,7 @@
* 浜у搧瀵煎叆妯℃澘
*/
@GetMapping("/export")
- @ApiOperation("浜у搧瀵煎叆妯℃澘")
+ @Operation(summary = "浜у搧瀵煎叆妯℃澘")
@Log(title = "浜у搧瀵煎叆妯℃澘", businessType = BusinessType.EXPORT)
public void importProduct(HttpServletResponse response) {
ExcelUtil<ProductModelExportDto> excelUtil = new ExcelUtil<>(ProductModelExportDto.class);
--
Gitblit v1.9.3