From fbd4ecb70baf2e671876ca809a81f6e6fe7342ee Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期日, 20 九月 2026 19:52:50 +0800
Subject: [PATCH] feat(inspect): 新增检测标准方法报告文本功能并优化报告生成 - 委托编号生成逻辑调整为下单时生成并校验唯一性，避免审核时重复 - 新增标准模板价格字段及对应的数据模型和数据库映射 - 订单费用详情查询逻辑重构为基于模板价格计算方式 - 新增标准模板与设备绑定关系的数据结构和管理功能 - 委托编号唯一性校验逻辑增强
---
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
index 24dbd70..b29a15e 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
@@ -10,7 +10,7 @@
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.ruoyi.common.constant.HttpStatus;
-import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.PageDomain;
import com.ruoyi.common.core.page.TableDataInfo;
@@ -93,49 +93,49 @@
/**
* 杩斿洖鎴愬姛
*/
- public Result success()
+ public AjaxResult success()
{
- return Result.success();
+ return AjaxResult.success();
}
/**
* 杩斿洖澶辫触娑堟伅
*/
- public Result error()
+ public AjaxResult error()
{
- return Result.error();
+ return AjaxResult.error();
}
/**
* 杩斿洖鎴愬姛娑堟伅
*/
- public Result success(String message)
+ public AjaxResult success(String message)
{
- return Result.success(message);
+ return AjaxResult.success(message);
}
/**
* 杩斿洖鎴愬姛娑堟伅
*/
- public Result success(Object data)
+ public AjaxResult success(Object data)
{
- return Result.success(data);
+ return AjaxResult.success(data);
}
/**
* 杩斿洖澶辫触娑堟伅
*/
- public Result error(String message)
+ public AjaxResult error(String message)
{
- return Result.error(message);
+ return AjaxResult.error(message);
}
/**
* 杩斿洖璀﹀憡娑堟伅
*/
- public Result warn(String message)
+ public AjaxResult warn(String message)
{
- return Result.warn(message);
+ return AjaxResult.warn(message);
}
/**
@@ -144,9 +144,9 @@
* @param rows 褰卞搷琛屾暟
* @return 鎿嶄綔缁撴灉
*/
- protected Result toAjax(int rows)
+ protected AjaxResult toAjax(int rows)
{
- return rows > 0 ? Result.success() : Result.error();
+ return rows > 0 ? AjaxResult.success() : AjaxResult.error();
}
/**
@@ -155,7 +155,7 @@
* @param result 缁撴灉
* @return 鎿嶄綔缁撴灉
*/
- protected Result toAjax(boolean result)
+ protected AjaxResult toAjax(boolean result)
{
return result ? success() : error();
}
--
Gitblit v1.9.3