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-admin/src/main/java/com/ruoyi/web/controller/system/CustomController.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/CustomController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/CustomController.java
index 989bdd6..4f24bce 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/CustomController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/CustomController.java
@@ -1,21 +1,17 @@
package com.ruoyi.web.controller.system;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.core.domain.entity.Custom;
-import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.service.CustomService;
-import com.ruoyi.system.service.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import java.util.Map;
+import java.util.List;
/**
@@ -33,13 +29,13 @@
private CustomService customService;
@ApiOperation(value = "鑾峰彇瀹㈡埛鍒楄〃")
- @PostMapping("/selectCustomPageList")
- public Result selectCustomPageList(@RequestBody Map<String, Object> data) throws Exception {
- return Result.success(customService.selectCustomPageList(null, null));
+ @GetMapping("/selectCustomPageList")
+ public Result<IPage<Custom>> selectCustomPageList(Page page, Custom custom) throws Exception {
+ return Result.success(customService.selectCustomPageList(page, custom));
}
@ApiOperation(value = "鍒犻櫎瀹㈡埛淇℃伅")
- @PostMapping("/delCustomById")
- public Result delCustomById(Long id) {
+ @DeleteMapping("/delCustomById")
+ public Result delCustomById(@RequestParam("id") Long id) {
return Result.success(customService.delCustomById(id));
}
@@ -56,5 +52,11 @@
return Result.success(customService.upCustom(custom));
}
+ @ApiOperation(value = "鑾峰彇瀹㈡埛鏋氫妇")
+ @GetMapping ("/selectCustomEnum")
+ public Result<List<Custom>> selectCustomEnum(){
+ return Result.success(customService.selectCustomEnum());
+ }
+
}
--
Gitblit v1.9.3