From b6418e1e3a38ebba972cafcf1fd9abba323072a4 Mon Sep 17 00:00:00 2001
From: lanyuanxiaoyao <lanyuanxiaoyao@gmail.com>
Date: Sun, 1 Dec 2024 11:35:54 +0800
Subject: [PATCH] =?UTF-8?q?feat(web):=20=E5=AE=A1=E6=9F=A5=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E6=93=8D=E4=BD=9C=E4=BA=BA=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gringotts-frontend/components/constants.js      | 17 +++++++++++++++++
 gringotts-frontend/pages/index/tab-check.js     | 13 ++++++++-----
 ...ontroller.java => CheckOrderController.java} | 15 ++++++++++++---
 3 files changed, 37 insertions(+), 8 deletions(-)
 rename gringotts-web/src/main/java/com/eshore/gringotts/web/domain/check/controller/{CheckController.java => CheckOrderController.java} (76%)

diff --git a/gringotts-frontend/components/constants.js b/gringotts-frontend/components/constants.js
index b10a983..f682d36 100644
--- a/gringotts-frontend/components/constants.js
+++ b/gringotts-frontend/components/constants.js
@@ -178,6 +178,23 @@ export function timeField(field, label, width = 150) {
     }
 }
 
+/**
+ * @param {string} field
+ * @param {string} label
+ * @param {number} width
+ */
+export function stringField(field, label, width = undefined) {
+    let data = {
+        name: field,
+        label: label,
+        className: 'nowrap',
+    }
+    if (width) {
+        data['width'] = width
+    }
+    return data
+}
+
 /**
  * @param {string} field
  * @param {string} label
diff --git a/gringotts-frontend/pages/index/tab-check.js b/gringotts-frontend/pages/index/tab-check.js
index 5033e18..ff8dc0d 100644
--- a/gringotts-frontend/pages/index/tab-check.js
+++ b/gringotts-frontend/pages/index/tab-check.js
@@ -5,7 +5,9 @@ import {
     checkTypeMapping,
     crudCommonOptions,
     mappingField,
-    operationField
+    operationField,
+    stringField,
+    timeField
 } from "../../components/constants.js";
 import {permissionDetailDialog} from "../../components/permission/dialog-permission.js";
 
@@ -24,12 +26,13 @@ export function tabCheck() {
                     'reload',
                 ],
                 columns: [
-                    {
-                        name: 'description',
-                        label: '描述',
-                    },
+                    stringField('description', '描述'),
                     mappingField('type', '类型', checkTypeMapping),
                     mappingField('over', '状态', checkOverMapping),
+                    timeField('createdTime', '创建时间'),
+                    stringField('createdUsername', '创建人', 100),
+                    timeField('modifiedTime', '最后修改时间'),
+                    stringField('modifiedUsername', '最后操作人', 100),
                     operationField('操作', undefined, [
                         {
                             visibleOn: '${!over}',
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/check/controller/CheckController.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/check/controller/CheckOrderController.java
similarity index 76%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/check/controller/CheckController.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/check/controller/CheckOrderController.java
index 5858afc..d7887be 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/check/controller/CheckController.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/check/controller/CheckOrderController.java
@@ -7,6 +7,7 @@ import com.eshore.gringotts.web.domain.check.service.CheckOrderService;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.time.LocalDateTime;
 import lombok.Data;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -27,18 +28,18 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 @RestController
 @RequestMapping("check_order")
-public class CheckController implements ListController<CheckController.ListItem> {
+public class CheckOrderController implements ListController<CheckOrderController.ListItem> {
     private final CheckOrderService checkOrderService;
     private final ObjectMapper mapper;
 
-    public CheckController(CheckOrderService checkOrderService, Jackson2ObjectMapperBuilder builder) {
+    public CheckOrderController(CheckOrderService checkOrderService, Jackson2ObjectMapperBuilder builder) {
         this.checkOrderService = checkOrderService;
         this.mapper = builder.build();
     }
 
     @GetMapping("/list")
     @Override
-    public AmisResponse<ImmutableList<CheckController.ListItem>> list() throws Exception {
+    public AmisResponse<ImmutableList<CheckOrderController.ListItem>> list() throws Exception {
         return AmisResponse.responseSuccess(checkOrderService.list().collect(this::toListItem));
     }
 
@@ -50,6 +51,10 @@ public class CheckController implements ListController<CheckController.ListItem>
         item.setType(order.getType());
         item.setParameters(mapper.readValue(order.getParameters(), new TypeReference<>() {}));
         item.setOver(order.getOver());
+        item.setCreatedUsername(order.getCreatedUser().getUsername());
+        item.setCreatedTime(order.getCreatedTime());
+        item.setModifiedUsername(order.getModifiedUser().getUsername());
+        item.setModifiedTime(order.getModifiedTime());
         return item;
     }
 
@@ -67,5 +72,9 @@ public class CheckController implements ListController<CheckController.ListItem>
         private CheckOrder.Type type;
         private ImmutableMap<String, Object> parameters;
         private Boolean over;
+        private LocalDateTime createdTime;
+        private String createdUsername;
+        private LocalDateTime modifiedTime;
+        private String modifiedUsername;
     }
 }