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/collaborativeApproval/controller/StaffContactsPersonalController.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/StaffContactsPersonalController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/StaffContactsPersonalController.java
index fa72a40..3673208 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/StaffContactsPersonalController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/StaffContactsPersonalController.java
@@ -4,8 +4,7 @@
import com.ruoyi.collaborativeApproval.dto.StaffContactsPersonalDTO;
import com.ruoyi.collaborativeApproval.pojo.StaffContactsPersonal;
import com.ruoyi.collaborativeApproval.service.StaffContactsPersonalService;
-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.Operation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -13,27 +12,27 @@
@RestController
@RequestMapping("/staffContactsPersonal")
@AllArgsConstructor
-public class StaffContactsPersonalController extends BaseController {
+public class StaffContactsPersonalController {
private StaffContactsPersonalService staffContactsPersonalService;
@GetMapping("/getList")
@Operation(summary = "鍒嗛〉鏌ヨ")
- public R<?> listPage(Page page, StaffContactsPersonalDTO staffContactsPersonalDTO) {
- return R.ok(staffContactsPersonalService.listPage(page, staffContactsPersonalDTO));
+ public AjaxResult listPage(Page page, StaffContactsPersonalDTO staffContactsPersonalDTO) {
+ return AjaxResult.success(staffContactsPersonalService.listPage(page, staffContactsPersonalDTO));
}
@PostMapping("/add")
@Operation(summary = "鏂板")
- public R<?> add(@RequestBody StaffContactsPersonal staffContactsPersonal) {
- return R.ok(staffContactsPersonalService.save(staffContactsPersonal));
+ public AjaxResult add(@RequestBody StaffContactsPersonal staffContactsPersonal) {
+ return AjaxResult.success(staffContactsPersonalService.save(staffContactsPersonal));
}
@DeleteMapping("/delete/{id}")
@Operation(summary = "鍒犻櫎")
- public R<?> delete(@PathVariable("id") Long id) {
+ public AjaxResult delete(@PathVariable("id") Long id) {
// if (CollectionUtils.isEmpty(id)) {
// throw new RuntimeException("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
// }
- return R.ok(staffContactsPersonalService.removeById(id));
+ return AjaxResult.success(staffContactsPersonalService.removeById(id));
}
}
--
Gitblit v1.9.3