#
luxiaotao1123
2024-09-26 8bc656160970188fb4bd694f70493e0cbe7b1307
#
2个文件已修改
12 ■■■■■ 已修改文件
zy-acs-flow/src/page/jam/JamList.jsx 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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>
                                            }
                                            &nbsp;ms
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) {
        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);
    }
}