From 1904cc522c211d7963eaf91af66598e6687b770f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 26 二月 2024 15:50:30 +0800
Subject: [PATCH] #
---
zy-asrs-framework/src/main/resources/templates/react/Index.txt | 2 +-
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/HostController.java | 8 ++++----
zy-asrs-flow/src/pages/system/host/index.jsx | 7 ++++++-
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-flow/src/pages/system/host/index.jsx b/zy-asrs-flow/src/pages/system/host/index.jsx
index b914e80..4a46ab7 100644
--- a/zy-asrs-flow/src/pages/system/host/index.jsx
+++ b/zy-asrs-flow/src/pages/system/host/index.jsx
@@ -1,6 +1,6 @@
import React, { useState, useRef, useEffect } from 'react';
-import { Button, message, Modal } from 'antd';
+import { Button, message, Modal, Tag } from 'antd';
import {
FooterToolbar,
PageContainer,
@@ -12,6 +12,7 @@
import Edit from './components/edit'
import { TextFilter, SelectFilter, DatetimeRangeFilter, LinkFilter } from '@/components/TableSearch'
import { repairBug } from '@/utils/common-util';
+import { statusMap } from '@/utils/enum-util'
const TABLE_KEY = "pro-table-host";
@@ -139,6 +140,10 @@
{ label: '绂佺敤', value: 0 },
]}
/>,
+ render: (_, record) => {
+ const status = statusMap[record.status]
+ return <Tag color={status.color}>{status.text}</Tag>
+ },
},
{
title: '娣诲姞鏃堕棿',
diff --git a/zy-asrs-framework/src/main/resources/templates/react/Index.txt b/zy-asrs-framework/src/main/resources/templates/react/Index.txt
index 4046980..73a7514 100644
--- a/zy-asrs-framework/src/main/resources/templates/react/Index.txt
+++ b/zy-asrs-framework/src/main/resources/templates/react/Index.txt
@@ -1,6 +1,6 @@
import React, { useState, useRef, useEffect } from 'react';
-import { Button, message, Modal } from 'antd';
+import { Button, message, Modal, Tag } from 'antd';
import {
FooterToolbar,
PageContainer,
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/HostController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/HostController.java
index ca0e5da..7fe38b7 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/HostController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/HostController.java
@@ -16,10 +16,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@RestController
@RequestMapping("/api")
@@ -52,6 +49,8 @@
@OperationLog("娣诲姞鏈烘瀯")
@PostMapping("/host/save")
public R save(@RequestBody Host host) {
+ host.setCreateTime(new Date());
+ host.setUpdateTime(new Date());
if (!hostService.save(host)) {
return R.error("娣诲姞澶辫触");
}
@@ -62,6 +61,7 @@
@OperationLog("淇敼鏈烘瀯")
@PostMapping("/host/update")
public R update(@RequestBody Host host) {
+ host.setUpdateTime(new Date());
if (!hostService.updateById(host)) {
return R.error("淇敼澶辫触");
}
--
Gitblit v1.9.1