From 8bc656160970188fb4bd694f70493e0cbe7b1307 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期四, 26 九月 2024 14:03:20 +0800 Subject: [PATCH] # --- zy-acs-flow/src/page/jam/JamList.jsx | 3 ++- zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java | 11 ++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/zy-acs-flow/src/page/jam/JamList.jsx b/zy-acs-flow/src/page/jam/JamList.jsx index e29392b..8711523 100644 --- a/zy-acs-flow/src/page/jam/JamList.jsx +++ b/zy-acs-flow/src/page/jam/JamList.jsx @@ -49,6 +49,7 @@ import ConfirmButton from "../components/ConfirmButton"; import CloseIcon from '@mui/icons-material/Close'; import request from '@/utils/request'; +import { red } from '@mui/material/colors'; const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({ '& .css-1vooibu-MuiSvgIcon-root': { @@ -284,7 +285,7 @@ <FunctionField label="table.field.jam.duration" cellClassName="duration" render={record => ( <> {((record.duration > 6000)) - ? <span style={{ color: 'red', fontWeight: 'bold' }}>{record.duration}</span> + ? <span style={{ color: red[700], fontWeight: 'bold' }}>{record.duration}</span> : <span>{record.duration || "-"}</span> } ms diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java index b495c0a..9abba73 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java @@ -62,7 +62,16 @@ @Override public boolean deprecate(Long id, Long loginUserId) { - return false; + Jam jam = this.getById(id); + if (null == jam) { + return false; + } + Date now = new Date(); + jam.setState(JamStateType.DEPRECATED.toString()); + jam.setUpdateTime(now); + jam.setEndTime(now); + jam.setUpdateBy(loginUserId); + return this.updateById(jam); } } -- Gitblit v1.9.1