From e929e18f8d04e72a23c24b06b89ab2d7be6f9c84 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 28 十一月 2024 06:04:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/controller/IndexController.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/business/src/main/java/com/ycl/controller/IndexController.java b/business/src/main/java/com/ycl/controller/IndexController.java
index 464e95e..6cb53e6 100644
--- a/business/src/main/java/com/ycl/controller/IndexController.java
+++ b/business/src/main/java/com/ycl/controller/IndexController.java
@@ -1,8 +1,11 @@
package com.ycl.controller;
+import com.ycl.common.core.controller.BaseController;
import com.ycl.common.core.domain.R;
import com.ycl.common.core.page.TableDataInfo;
+import com.ycl.domain.entity.AuditHistory;
import com.ycl.domain.vo.*;
+import com.ycl.service.AuditHistoryService;
import com.ycl.service.ProjectInfoService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,11 +20,15 @@
@RequiredArgsConstructor
@RestController
@RequestMapping("/")
-public class IndexController {
+public class IndexController extends BaseController {
@Autowired
private ProjectInfoService projectInfoService;
+
+
+ @Autowired
+ private AuditHistoryService auditHistoryService;
/**
* 椤圭洰鏁伴噺缁熻
@@ -49,7 +56,18 @@
*/
@GetMapping("/audit-message")
public TableDataInfo<Object> auditMessage(PageQuery pageQuery) {
- return null;
+ AuditHistory auditHistory = new AuditHistory();
+ auditHistory.setTaskId("001");
+ auditHistory.setTaskDefinitionKey("key");
+ auditHistory.setViewer("寮犱笁");
+ auditHistory.setCommitDept("閮ㄩ棬1");
+ auditHistory.setAuditType("01");
+ auditHistory.setIsRead("0");
+ auditHistory.setBusinessKey("12");
+ auditHistory.setBusinessTable("t_plan");
+ auditHistory.setContent("娑堟伅鍥炲");
+// auditHistoryService.save(auditHistory);
+ return getDataTable(auditHistoryService.list());
}
/**
--
Gitblit v1.8.0