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/ApprovalInstanceController.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/controller/ApprovalInstanceController.java b/src/main/java/com/ruoyi/approve/controller/ApprovalInstanceController.java
index f13e1b3..36dcfc3 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApprovalInstanceController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApprovalInstanceController.java
@@ -4,6 +4,8 @@
import com.ruoyi.approve.bean.dto.ApprovalInstanceDto;
import com.ruoyi.approve.bean.vo.ApprovalInstanceVo;
import com.ruoyi.approve.service.ApprovalInstanceService;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.Operation;
@@ -30,23 +32,27 @@
private final ApprovalInstanceService approvalInstanceService;
@GetMapping("/listPage")
@Operation(summary = "鍒嗛〉鏌ヨ")
+ @Log(title = "瀹℃壒鍒楄〃鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
public R listPage(Page<ApprovalInstanceVo> page, ApprovalInstanceDto approvalInstanceDto) {
return approvalInstanceService.listPage(page, approvalInstanceDto);
}
@PostMapping("/save")
@Operation(summary = "淇濆瓨")
+ @Log(title = "瀹℃壒鍒楄〃淇濆瓨", businessType = BusinessType.INSERT)
public R save(@RequestBody ApprovalInstanceDto approvalInstanceDto) {
return approvalInstanceService.add(approvalInstanceDto) ? R.ok() : R.fail();
}
@PutMapping("/update")
@Operation(summary = "鏇存柊")
+ @Log(title = "瀹℃壒鍒楄〃鏇存柊", businessType = BusinessType.UPDATE)
public R update(@RequestBody ApprovalInstanceDto approvalInstanceDto) {
- return approvalInstanceService.updateById(approvalInstanceDto) ? R.ok() : R.fail();
+ return approvalInstanceService.update(approvalInstanceDto) ? R.ok() : R.fail();
}
@DeleteMapping("/delete")
+ @Log(title = "瀹℃壒鍒楄〃鍒犻櫎", businessType = BusinessType.DELETE)
@Operation(summary = "鍒犻櫎")
public R delete(@RequestBody List<Long> ids) {
return approvalInstanceService.delete(ids) ? R.ok() : R.fail();
@@ -54,6 +60,7 @@
@Operation(summary = "瀹℃壒")
@PostMapping("/approve")
+ @Log(title = "瀹℃壒鍒楄〃瀹℃壒", businessType = BusinessType.UPDATE)
public R approve(@RequestBody ApprovalInstanceDto approvalInstanceDto) {
return approvalInstanceService.approve(approvalInstanceDto);
}
--
Gitblit v1.9.3