From c4ab6a24d2825f11a0de0f165667dc533c458a01 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 21 三月 2025 10:57:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/controller/FlowLogController.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/business/src/main/java/com/ycl/controller/FlowLogController.java b/business/src/main/java/com/ycl/controller/FlowLogController.java
index d654862..d88902f 100644
--- a/business/src/main/java/com/ycl/controller/FlowLogController.java
+++ b/business/src/main/java/com/ycl/controller/FlowLogController.java
@@ -1,8 +1,8 @@
package com.ycl.controller;
import com.ycl.common.base.Result;
-import com.ycl.domain.query.FlowLogQuery;
-import com.ycl.service.FlowLogService;
+import com.ycl.domain.query.ProcessLogQuery;
+import com.ycl.service.ProcessLogService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -25,14 +25,20 @@
@RequestMapping("/flow-log")
public class FlowLogController {
- private final FlowLogService flowLogService;
+ private final ProcessLogService processLogService;
@GetMapping("/page")
@ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
@PreAuthorize("@ss.hasPermi('flowLog:page')")
- public Result page(FlowLogQuery query) {
- return flowLogService.page(query);
+ public Result page(ProcessLogQuery query) {
+ return processLogService.page(query);
}
+ @GetMapping("/project-process/log")
+ @ApiOperation(value = "娴佺▼鎺ㄨ繘鏃ュ織", notes = "娴佺▼鎺ㄨ繘鏃ュ織")
+// @PreAuthorize("@ss.hasPermi('flowLog:page')")
+ public Result projectProcessLogPage(ProcessLogQuery query) {
+ return processLogService.projectProcessLogPage(query);
+ }
}
--
Gitblit v1.8.0