art: 技术状态鉴定工单变更-字典添加

zhangherong

2025-07-12 2899544d5e9001cdaa824405d234d8e4138f7063

art: 技术状态鉴定工单变更-字典添加

 db/ZHR/dict_zhr.sql

@@ -70,3 +70,40 @@
INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1940319476352299010', N'1940319386308980737', N'限用', N'RESTRICTED', '', 2, 1, N'admin', '2025-07-02 15:59:47.0000000', N'admin', '2025-07-11 11:23:52.7830000');
INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943511780124659714', N'1940319386308980737', N'禁用', N'PROHIBITED', '', 3, 1, N'admin', '2025-07-11 11:24:51.7410000', NULL, NULL);

--技术状态鉴定工单变更原因
delete from [dbo].[sys_dict_item] where dict_id in (select id from [dbo].[sys_dict] where dict_code='technical_status_evaluation_order_change_reason');
delete from [dbo].[sys_dict] where dict_code='technical_status_evaluation_order_change_reason';

INSERT INTO [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'1943939430844620802', N'技术状态鉴定工单变更原因', N'technical_status_evaluation_order_change_reason', N'设备管理使用', 0, N'admin', '2025-07-12 15:44:11.6180000', NULL, NULL, NULL);

INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943941741276979202', N'1943939430844620802', N'生产任务急无法停机', N'PRODUCTION_WORK_ORDER_EXPEDITED', '', 1, 1, N'admin', '2025-07-12 15:53:22.4680000', NULL, NULL);
INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943941811498016770', N'1943939430844620802', N'设备故障正处于维修状态', N'EQUIPMENT_BREAKDOWN_REPAIR', '', 2, 1, N'admin', '2025-07-12 15:53:39.2090000', NULL, NULL);
INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943941870868389889', N'1943939430844620802', N'设备已报废', N'EQUIPMENT_SCRAPPED', '', 3, 1, N'admin', '2025-07-12 15:53:53.3640000', NULL, NULL);
INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943941956709015554', N'1943939430844620802', N'设备大修', N'EQUIPMENT_MAJOR', '', 4, 1, N'admin', '2025-07-12 15:54:13.8300000', NULL, NULL);
INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943942061625335809', N'1943939430844620802', N'设备搬迁', N'EQUIPMENT_RELOCATION', '', 5, 1, N'admin', '2025-07-12 15:54:38.8450000', NULL, NULL);
INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943942122652459010', N'1943939430844620802', N'设备改造', N'EQUIPMENT_RETROFITTING', '', 6, 1, N'admin', '2025-07-12 15:54:53.3960000', NULL, NULL);

--技术状态鉴定工单变更状态
delete from [dbo].[sys_dict_item] where dict_id in (select id from [dbo].[sys_dict] where dict_code='technical_status_evaluation_order_change_status');
delete from [dbo].[sys_dict] where dict_code='technical_status_evaluation_order_change_status';

INSERT INTO [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'1943933734891708418', N'技术状态鉴定工单变更状态', N'technical_status_evaluation_order_change_status', N'设备管理使用', 0, N'admin', '2025-07-12 15:21:33.5970000', NULL, NULL, NULL);

INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943938381878550530', N'1943933734891708418', N'待提交', N'WAIT_SUBMIT', '', 1, 1, N'admin', '2025-07-12 15:40:01.5240000', NULL, NULL);
INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943938456247754753', N'1943933734891708418', N'主管领导签字中', N'EQUIPMENT_MANAGER_SIGNING', '', 2, 1, N'admin', '2025-07-12 15:40:19.2550000', NULL, NULL);
INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943938510379442177', N'1943933734891708418', N'部门领导签字中', N'DEPART_MANAGER_SIGNING', '', 3, 1, N'admin', '2025-07-12 15:40:32.1620000', NULL, NULL);
INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943938563349307393', N'1943933734891708418', N'保障部领导签字中', N'PRODUCTION_SUPPORT_SIGNING', '', 4, 1, N'admin', '2025-07-12 15:40:44.7920000', NULL, NULL);
INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943938618584096770', N'1943933734891708418', N'已作废', N'ABOLISH', '', 6, 1, N'admin', '2025-07-12 15:40:57.0000000', N'admin', '2025-07-12 15:41:24.3860000');
INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943938696413601793', N'1943933734891708418', N'已完成', N'COMPLETED', '', 5, 1, N'admin', '2025-07-12 15:41:16.0000000', N'admin', '2025-07-12 15:41:29.4120000');

--技术状态鉴定结果原因
delete from [dbo].[sys_dict_item] where dict_id in (select id from [dbo].[sys_dict] where dict_code='technical_status_evaluation_result_reason');
delete from [dbo].[sys_dict] where dict_code='technical_status_evaluation_result_reason';

INSERT INTO [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'1943508627786436609', N'技术状态鉴定结果原因', N'technical_status_evaluation_result_reason', N'设备管理使用', 0, N'admin', '2025-07-11 11:12:20.1790000', NULL, NULL, NULL);

INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943951156122116097', N'1943508627786436609', N'安全装置', N'SAFETY_EQUIPMENT_CHECK', '', 1, 1, N'admin', '2025-07-12 16:30:47.1420000', NULL, NULL);
INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943951206004973570', N'1943508627786436609', N'设备精度', N'EQUIPMENT_PRECISION_CHECK', '', 2, 1, N'admin', '2025-07-12 16:30:59.0340000', NULL, NULL);
INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943951255988494337', N'1943508627786436609', N'设备功能', N'EQUIPMENT_FUNCTIONAL_CHECK', '', 3, 1, N'admin', '2025-07-12 16:31:10.9520000', NULL, NULL);
INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943951312682901505', N'1943508627786436609', N'试切', N'SAMPLE_CHECK', '', 4, 1, N'admin', '2025-07-12 16:31:24.4670000', NULL, NULL);
INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1943951373072490497', N'1943508627786436609', N'其他', N'OTHER_CHECK', '', 5, 1, N'admin', '2025-07-12 16:31:38.0000000', N'admin', '2025-07-12 16:31:46.0150000');

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/TechnicalStatusEvaluationOrderChangeReasonEnum.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
package org.jeecg.modules.eam.constant;

public enum TechnicalStatusEvaluationOrderChangeReasonEnum {
    PRODUCTION_WORK_ORDER_EXPEDITED, //生产任务急无法停机
    EQUIPMENT_BREAKDOWN_REPAIR, //设备故障正处于维修状态
    EQUIPMENT_SCRAPPED, //设备已报废
    EQUIPMENT_MAJOR, //设备大修
    EQUIPMENT_RELOCATION, //设备搬迁
    EQUIPMENT_RETROFITTING, //设备改造
    ;

    public static TechnicalStatusEvaluationOrderChangeReasonEnum getInstance(String code) {
        TechnicalStatusEvaluationOrderChangeReasonEnum[] values = TechnicalStatusEvaluationOrderChangeReasonEnum.values();
        for (TechnicalStatusEvaluationOrderChangeReasonEnum value : values) {
            if (value.name().equals(code)) {
                return value;
            }
        }
        return null;
    }
}

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/TechnicalStatusEvaluationOrderChangeStatusEnum.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
package org.jeecg.modules.eam.constant;

public enum TechnicalStatusEvaluationOrderChangeStatusEnum {
    WAIT_SUBMIT, //待提交
    EQUIPMENT_MANAGER_SIGNING, //主管领导签字中
    DEPART_MANAGER_SIGNING, //部门领导签字中
    PRODUCTION_SUPPORT_SIGNING, //保障部领导签字中
    ABOLISH, //已作废
    COMPLETED, //已完成
    ;

    public static TechnicalStatusEvaluationOrderChangeStatusEnum getInstance(String code) {
        TechnicalStatusEvaluationOrderChangeStatusEnum[] values = TechnicalStatusEvaluationOrderChangeStatusEnum.values();
        for (TechnicalStatusEvaluationOrderChangeStatusEnum value : values) {
            if (value.name().equals(code)) {
                return value;
            }
        }
        return null;
    }
}

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/TechnicalStatusEvaluationResultReasonEnum.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,10 @@
package org.jeecg.modules.eam.constant;

public enum TechnicalStatusEvaluationResultReasonEnum {
    SAFETY_EQUIPMENT_CHECK, //安全装置
    EQUIPMENT_PRECISION_CHECK,//设备精度
    EQUIPMENT_FUNCTIONAL_CHECK,//设备功能
    SAMPLE_CHECK,//试切
    OTHER_CHECK,//其他
    ;
}

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/TechnicalStatusEvaluationStandardStatusEnum.java

ÎļþÃû´Ó lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/TechnicalStatusEvaluationStandardEnum.java ÐÞ¸Ä
@@ -1,6 +1,6 @@
package org.jeecg.modules.eam.constant;

public enum TechnicalStatusEvaluationStandardEnum {
public enum TechnicalStatusEvaluationStandardStatusEnum {
    WAIT_SUBMIT, //待提交
    ENABLE, //启用
    DISABLE, //禁用

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderChangeController.java

@@ -11,6 +11,7 @@
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrderChange;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderChangeQuery;
import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationOrderChangeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -37,7 +38,7 @@
    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param eamTechnicalStatusEvaluationOrderChange
     * @param query
     * @param pageNo
     * @param pageSize
     * @param req
@@ -45,13 +46,12 @@
     */
    @ApiOperation(value="技术状态鉴定工单变更-分页列表查询", notes="技术状态鉴定工单变更-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(EamTechnicalStatusEvaluationOrderChange eamTechnicalStatusEvaluationOrderChange,
    public Result<?> queryPageList(EamTechnicalStatusEvaluationOrderChangeQuery query,
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<EamTechnicalStatusEvaluationOrderChange> queryWrapper = QueryGenerator.initQueryWrapper(eamTechnicalStatusEvaluationOrderChange, req.getParameterMap());
        Page<EamTechnicalStatusEvaluationOrderChange> page = new Page<EamTechnicalStatusEvaluationOrderChange>(pageNo, pageSize);
        IPage<EamTechnicalStatusEvaluationOrderChange> pageList = eamTechnicalStatusEvaluationOrderChangeService.page(page, queryWrapper);
        IPage<EamTechnicalStatusEvaluationOrderChange> pageList = eamTechnicalStatusEvaluationOrderChangeService.queryPageList(page, query);
        return Result.OK(pageList);
    }
    

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardController.java

@@ -10,7 +10,7 @@
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.TechnicalStatusEvaluationStandardEnum;
import org.jeecg.modules.eam.constant.TechnicalStatusEvaluationStandardStatusEnum;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationStandard;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationStandardRequest;
import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationStandardService;
@@ -160,7 +160,7 @@
    public Result<?> submit(@RequestParam(name = "id", required = true) String id) {
        EamTechnicalStatusEvaluationStandard entity = eamTechnicalStatusEvaluationStandardService.getById(id);
        if (entity != null) {
            entity.setStandardStatus(TechnicalStatusEvaluationStandardEnum.ENABLE.name());
            entity.setStandardStatus(TechnicalStatusEvaluationStandardStatusEnum.ENABLE.name());
            eamTechnicalStatusEvaluationStandardService.updateById(entity);
        }
        return Result.OK("提交成功!");

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrder.java

@@ -155,7 +155,7 @@
    private String safetyEquipmentCheckResult;
    /**精度参数检查结果;是、否、无*/
    @ApiModelProperty(value = "精度参数检查结果;是、否、无")
    @Dict(dicCode = "ye_no_none")
    @Dict(dicCode = "yes_no_none")
    private String precisionCheckResult;
    /**功能状态检查结果;是、否*/
    @ApiModelProperty(value = "功能状态检查结果;是、否")
@@ -163,7 +163,7 @@
    private String functionalCheckResult;
    /**其他检查结果;是、否、无*/
    @ApiModelProperty(value = "其他检查结果;是、否、无")
    @Dict(dicCode = "ye_no_none")
    @Dict(dicCode = "yes_no_none")
    private String otherCheckResult;
    /**维修人签字*/
    @ApiModelProperty(value = "维修人签字")

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationOrderChangeQuery.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
package org.jeecg.modules.eam.request;

import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;

@Data
public class EamTechnicalStatusEvaluationOrderChangeQuery {
    private String changeOrderNum;
    private String equipmentId;
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date dateBegin;
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date dateEnd;
    private String changeStatus;

    private String column;
    private String order;
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderChangeService.java

@@ -1,7 +1,10 @@
package org.jeecg.modules.eam.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrderChange;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderChangeQuery;

/**
 * @Description: æŠ€æœ¯çŠ¶æ€é‰´å®šå·¥å•å˜æ›´
@@ -11,4 +14,11 @@
 */
public interface IEamTechnicalStatusEvaluationOrderChangeService extends IService<EamTechnicalStatusEvaluationOrderChange> {

    /**
     * åˆ†é¡µæŸ¥è¯¢
     * @param page
     * @param query
     * @return
     */
    IPage<EamTechnicalStatusEvaluationOrderChange> queryPageList(Page<EamTechnicalStatusEvaluationOrderChange> page, EamTechnicalStatusEvaluationOrderChangeQuery query);
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderChangeServiceImpl.java

@@ -1,7 +1,10 @@
package org.jeecg.modules.eam.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrderChange;
import org.jeecg.modules.eam.mapper.EamTechnicalStatusEvaluationOrderChangeMapper;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderChangeQuery;
import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationOrderChangeService;
import org.springframework.stereotype.Service;

@@ -16,4 +19,8 @@
@Service
public class EamTechnicalStatusEvaluationOrderChangeServiceImpl extends ServiceImpl<EamTechnicalStatusEvaluationOrderChangeMapper, EamTechnicalStatusEvaluationOrderChange> implements IEamTechnicalStatusEvaluationOrderChangeService {

    @Override
    public IPage<EamTechnicalStatusEvaluationOrderChange> queryPageList(Page<EamTechnicalStatusEvaluationOrderChange> page, EamTechnicalStatusEvaluationOrderChangeQuery query) {
        return null;
    }
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java

@@ -8,7 +8,6 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import liquibase.pro.packaged.E;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.flowable.engine.TaskService;
@@ -158,7 +157,7 @@
        if (standard == null) {
            throw new JeecgBootException("技术状态鉴定规范不存在，添加失败！");
        }
        if (!TechnicalStatusEvaluationStandardEnum.ENABLE.name().equals(standard.getStandardStatus())) {
        if (!TechnicalStatusEvaluationStandardStatusEnum.ENABLE.name().equals(standard.getStandardStatus())) {
            throw new JeecgBootException("技术状态鉴定规范未启用，添加失败！");
        }
        List<EamTechnicalStatusEvaluationStandardDetail> standardDetailList = standardDetailService.queryList(standard.getId());

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java

@@ -22,7 +22,7 @@
import org.jeecg.common.util.SimpleVersionGenerateUtil;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.TechnicalStatusEvaluationCheckCategoryEnum;
import org.jeecg.modules.eam.constant.TechnicalStatusEvaluationStandardEnum;
import org.jeecg.modules.eam.constant.TechnicalStatusEvaluationStandardStatusEnum;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationStandard;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationStandardDetail;
@@ -130,7 +130,7 @@
        }
        EamTechnicalStatusEvaluationStandard entity = new EamTechnicalStatusEvaluationStandard();
        BeanUtils.copyProperties(request, entity);
        entity.setStandardStatus(TechnicalStatusEvaluationStandardEnum.WAIT_SUBMIT.name());
        entity.setStandardStatus(TechnicalStatusEvaluationStandardStatusEnum.WAIT_SUBMIT.name());
        //版本递增
        entity.setStandardVersion(SimpleVersionGenerateUtil.getInitVersion());
        //设备处理
@@ -183,7 +183,7 @@
        queryWrapper.eq(EamTechnicalStatusEvaluationStandard::getEquipmentId, equipmentId);
        queryWrapper.eq(EamTechnicalStatusEvaluationStandard::getDelFlag, CommonConstant.DEL_FLAG_0);
        //待提交、启用状态
        queryWrapper.in(EamTechnicalStatusEvaluationStandard::getStandardStatus, Arrays.asList(TechnicalStatusEvaluationStandardEnum.ENABLE.name(), TechnicalStatusEvaluationStandardEnum.WAIT_SUBMIT.name()));
        queryWrapper.in(EamTechnicalStatusEvaluationStandard::getStandardStatus, Arrays.asList(TechnicalStatusEvaluationStandardStatusEnum.ENABLE.name(), TechnicalStatusEvaluationStandardStatusEnum.WAIT_SUBMIT.name()));
        queryWrapper.orderByDesc(EamTechnicalStatusEvaluationStandard::getStandardVersion);
        if (StringUtils.isNotBlank(id)) {
            queryWrapper.ne(EamTechnicalStatusEvaluationStandard::getId, id);
@@ -266,7 +266,7 @@
        newEntity.setStandardCode(request.getStandardCode());
        newEntity.setStandardName(request.getStandardName());
        newEntity.setEvaluationPeriod(request.getEvaluationPeriod());
        newEntity.setStandardStatus(TechnicalStatusEvaluationStandardEnum.ENABLE.name());
        newEntity.setStandardStatus(TechnicalStatusEvaluationStandardStatusEnum.ENABLE.name());
        //版本递增
        newEntity.setStandardVersion(SimpleVersionGenerateUtil.addVersion(entity.getStandardVersion()));
        //设备处理
@@ -320,7 +320,7 @@
            }
        }
        //禁用原来的版本
        entity.setStandardStatus(TechnicalStatusEvaluationStandardEnum.DISABLE.name());
        entity.setStandardStatus(TechnicalStatusEvaluationStandardStatusEnum.DISABLE.name());
        this.getBaseMapper().updateById(entity);
        return true;
    }
@@ -355,7 +355,7 @@
                EamEquipment equipment = extractEquipmentInfo(tables.get(0));
                //查看是否有此设备启用的规范信息
                EamTechnicalStatusEvaluationStandard originalStandard = checkDuplicate(equipment.getId(), null);
                if (originalStandard != null && TechnicalStatusEvaluationStandardEnum.ENABLE.name().equals(originalStandard.getStandardStatus())) {
                if (originalStandard != null && TechnicalStatusEvaluationStandardStatusEnum.ENABLE.name().equals(originalStandard.getStandardStatus())) {
                    return Result.error(fileName + ":此设备已存在启用的规范，请进行编辑或升版！");
                }
                //获取检查项信息
@@ -366,7 +366,7 @@
                if(originalStandard != null) {
                    //已存在技术状态鉴定规范,且规范状态为已提交
                    originalStandard.setHasSafetyEquipmentCheck(CommonConstant.STATUS_1);
                    originalStandard.setStandardStatus(TechnicalStatusEvaluationStandardEnum.WAIT_SUBMIT.name());
                    originalStandard.setStandardStatus(TechnicalStatusEvaluationStandardStatusEnum.WAIT_SUBMIT.name());
                    super.getBaseMapper().updateById(originalStandard);
                    detailList.forEach(standardDetail -> {
                        standardDetail.setStandardId(originalStandard.getId());
@@ -429,7 +429,7 @@
                EamEquipment equipment = extractEquipmentInfo(tables.get(0));
                //查看是否有此设备启用的规范信息
                EamTechnicalStatusEvaluationStandard originalStandard = checkDuplicate(equipment.getId(), null);
                if (originalStandard != null && TechnicalStatusEvaluationStandardEnum.ENABLE.name().equals(originalStandard.getStandardStatus())) {
                if (originalStandard != null && TechnicalStatusEvaluationStandardStatusEnum.ENABLE.name().equals(originalStandard.getStandardStatus())) {
                    return Result.error(fileName + ":此设备已存在启用的规范，请进行编辑或升版！");
                }
                //获取检查项信息
@@ -440,7 +440,7 @@
                if(originalStandard != null) {
                    //已存在技术状态鉴定规范,且规范状态为已提交
                    originalStandard.setHasPrecisionCheck(CommonConstant.STATUS_1);
                    originalStandard.setStandardStatus(TechnicalStatusEvaluationStandardEnum.WAIT_SUBMIT.name());
                    originalStandard.setStandardStatus(TechnicalStatusEvaluationStandardStatusEnum.WAIT_SUBMIT.name());
                    super.getBaseMapper().updateById(originalStandard);
                    detailList.forEach(standardDetail -> {
                        standardDetail.setStandardId(originalStandard.getId());
@@ -503,7 +503,7 @@
                EamEquipment equipment = extractEquipmentInfo(tables.get(0));
                //查看是否有此设备启用的规范信息
                EamTechnicalStatusEvaluationStandard originalStandard = checkDuplicate(equipment.getId(), null);
                if (originalStandard != null && TechnicalStatusEvaluationStandardEnum.ENABLE.name().equals(originalStandard.getStandardStatus())) {
                if (originalStandard != null && TechnicalStatusEvaluationStandardStatusEnum.ENABLE.name().equals(originalStandard.getStandardStatus())) {
                    return Result.error(fileName + ":此设备已存在启用的规范，请进行编辑或升版！");
                }
                //获取检查项信息
@@ -514,7 +514,7 @@
                if(originalStandard != null) {
                    //已存在技术状态鉴定规范,且规范状态为已提交
                    originalStandard.setHasOtherCheck(CommonConstant.STATUS_1);
                    originalStandard.setStandardStatus(TechnicalStatusEvaluationStandardEnum.WAIT_SUBMIT.name());
                    originalStandard.setStandardStatus(TechnicalStatusEvaluationStandardStatusEnum.WAIT_SUBMIT.name());
                    super.getBaseMapper().updateById(originalStandard);
                    detailList.forEach(standardDetail -> {
                        standardDetail.setStandardId(originalStandard.getId());
@@ -553,7 +553,7 @@
        EamTechnicalStatusEvaluationStandard query = new EamTechnicalStatusEvaluationStandard();
        query.setEquipmentId(equipmentId);
        query.setKeyword(keyword);
        query.setStandardStatus(TechnicalStatusEvaluationStandardEnum.ENABLE.name());
        query.setStandardStatus(TechnicalStatusEvaluationStandardStatusEnum.ENABLE.name());
        IPage<EamTechnicalStatusEvaluationStandard> pageData = this.queryPageList(page, query);
        return pageData.getRecords();
    }