From c3a981e80973ac52b5988aca62b87409976c6fb1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 18 六月 2026 13:09:28 +0800
Subject: [PATCH] 1.计量器具台账上传附件报错 2.质量拉的数据不对（未明确） 3.计量器具台账逾期的做标红提醒 4.设备保养定时任务和记录要加上具体的保养内容 5.质量要区分质检规则抽检还是全检，抽检的话是抽多少百分比 6.供应商管理东西太少了，没有资质文件啊这些东西（是不是可以参考pro） 7.采购审批把人从李莹莹改成龙红星
---
src/main/java/com/ruoyi/approve/controller/RpaProcessAutomationController.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/controller/RpaProcessAutomationController.java b/src/main/java/com/ruoyi/approve/controller/RpaProcessAutomationController.java
index 1e26526..06a0f6d 100644
--- a/src/main/java/com/ruoyi/approve/controller/RpaProcessAutomationController.java
+++ b/src/main/java/com/ruoyi/approve/controller/RpaProcessAutomationController.java
@@ -5,8 +5,7 @@
import com.ruoyi.approve.pojo.RpaProcessAutomation;
import com.ruoyi.approve.service.RpaProcessAutomationService;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
@@ -19,42 +18,42 @@
@RequestMapping("/rpaProcessAutomation")
@AllArgsConstructor
@Tag(name = "RPA娴佺▼鑷姩鍖�")
-public class RpaProcessAutomationController extends BaseController {
+public class RpaProcessAutomationController {
private RpaProcessAutomationService rpaProcessAutomationService;
/**銆�
* 鑾峰彇鍒楄〃
* @return
*/
@GetMapping("/getList")
- public R<?> getList(@RequestParam(defaultValue = "1") long current,
+ public AjaxResult getList(@RequestParam(defaultValue = "1") long current,
@RequestParam(defaultValue = "100") long size, RpaProcessAutomation rpaProcessAutomation) {
Page page = new Page(current, size);
- return R.ok(rpaProcessAutomationService.listpage(page,rpaProcessAutomation));
+ return AjaxResult.success(rpaProcessAutomationService.listpage(page,rpaProcessAutomation));
}
/**銆�
* 澧炴坊
* @return
*/
@PostMapping("/add")
- public R<?> add(@RequestBody RpaProcessAutomation rpaProcessAutomation){
- return R.ok(rpaProcessAutomationService.save(rpaProcessAutomation));
+ public AjaxResult add(@RequestBody RpaProcessAutomation rpaProcessAutomation){
+ return AjaxResult.success(rpaProcessAutomationService.save(rpaProcessAutomation));
}
/**
* 鏇存柊
* @return
*/
@PostMapping("/update")
- public R<?> update(@RequestBody RpaProcessAutomation rpaProcessAutomation){
- return R.ok(rpaProcessAutomationService.updateById(rpaProcessAutomation));
+ public AjaxResult update(@RequestBody RpaProcessAutomation rpaProcessAutomation){
+ return AjaxResult.success(rpaProcessAutomationService.updateById(rpaProcessAutomation));
}
/**
* 鍒犻櫎
* @return
*/
@DeleteMapping("/delete")
- public R<?> delete(@RequestBody List<Long> ids){
- if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return R.ok(rpaProcessAutomationService.removeByIds(ids));
+ public AjaxResult delete(@RequestBody List<Long> ids){
+ if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.success(rpaProcessAutomationService.removeByIds(ids));
}
@Operation(summary = "RPA娴佺▼鑷姩鍖栧鍑�")
--
Gitblit v1.9.3