zhangherong
2025-07-10 c15c980814508369fcbb2dbfcfb53fe95688e005
art: 技术状态鉴定-新增接口修改
已添加1个文件
已修改3个文件
74 ■■■■■ 文件已修改
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/HfTemplateCategoryEnum.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamBaseHFCodeService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamBaseHFCodeServiceImpl.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/HfTemplateCategoryEnum.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
package org.jeecg.modules.eam.constant;
public enum HfTemplateCategoryEnum {
    INSPECTION, //点检
    SECOND_MAINTENANCE, //二保
    THIRD_MAINTENANCE_HANDOVER, //三保移交单
    THIRD_MAINTENANCE_ACCEPTANCE, //三保验收单
    TECHNICAL_STATUS_EVALUATION, //技术状态鉴定表
    TECHNICAL_STATUS_EVALUATION_SAFETY_CHECK, //设备安全装置检查单
    TECHNICAL_STATUS_EVALUATION_OTHER_CHECK, //其他检查项目
    TECHNICAL_STATUS_EVALUATION_PRECISION_CHECK, //设备精度检查单
    ;
}
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamBaseHFCodeService.java
@@ -40,4 +40,11 @@
     * @return
     */
    boolean upgradeEamBaseHFCode(EamBaseHFCode entity);
    /**
     * æ ¹æ®åˆ†ç±»æŸ¥è¯¢ å”¯ä¸€
     * @param category
     * @return
     */
    EamBaseHFCode selectByCategory(String category);
}
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamBaseHFCodeServiceImpl.java
@@ -88,4 +88,13 @@
        super.getBaseMapper().insert(entity);
        return true;
    }
    @Override
    public EamBaseHFCode selectByCategory(String category) {
        LambdaQueryWrapper<EamBaseHFCode> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EamBaseHFCode::getHfCategory, category);
        queryWrapper.eq(EamBaseHFCode::getDelFlag, CommonConstant.DEL_FLAG_0);
        queryWrapper.eq(EamBaseHFCode::getHfStatus, EnableDisableEnum.ENABLE.name());
        return this.getBaseMapper().selectOne(queryWrapper);
    }
}
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java
@@ -14,15 +14,18 @@
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.EamTechnicalStatusEvaluationOrderEnum;
import org.jeecg.modules.eam.constant.HfTemplateCategoryEnum;
import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
import org.jeecg.modules.eam.entity.EamBaseHFCode;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrder;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationStandard;
import org.jeecg.modules.eam.mapper.EamTechnicalStatusEvaluationOrderMapper;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderQuery;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderRequest;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationOrderDetailService;
import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationOrderService;
import org.jeecg.modules.eam.service.*;
import org.jeecg.modules.system.entity.BaseFactory;
import org.jeecg.modules.system.entity.BaseFactoryUser;
import org.jeecg.modules.system.service.IBaseFactoryService;
@@ -56,6 +59,10 @@
    private IEamEquipmentService equipmentService;
    @Autowired
    private ISysBusinessCodeRuleService businessCodeRuleService;
    @Autowired
    private IEamTechnicalStatusEvaluationStandardService standardService;
    @Autowired
    private IEamBaseHFCodeService hfCodeService;
    @Override
    public IPage<EamTechnicalStatusEvaluationOrder> queryPageList(Page<EamTechnicalStatusEvaluationOrder> page, EamTechnicalStatusEvaluationOrderQuery query) {
@@ -127,18 +134,48 @@
        if (equipment == null) {
            throw new JeecgBootException("设备不存在,添加失败!");
        }
        EamTechnicalStatusEvaluationStandard standard = standardService.getById(request.getStandardId());
        if(standard == null) {
            throw new JeecgBootException("技术状态鉴定规范不存在,添加失败!");
        }
        EamTechnicalStatusEvaluationOrder order = new EamTechnicalStatusEvaluationOrder();
        order.setOrderNum(request.getOrderNum());
        order.setEquipmentId(request.getEquipmentId());
        order.setStandardId(request.getStandardId());
        order.setEvaluationDate(request.getEvaluationDate());
        order.setEvaluator(request.getEvaluator());
        order.setRemark(request.getRemark());
        String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.TECHNICAL_STATUS_EVALUATION_ORDER_CODE_RULE);
        request.setOrderNum(codeSeq);
        request.setCreationMethod(OrderCreationMethodEnum.MANUAL.name());
        //状态初始化
        order.setEvaluationStatus(EamTechnicalStatusEvaluationOrderEnum.WAIT_EVALUATION.name());
        order.setCreationMethod(request.getCreationMethod());
        //删除标记
        order.setDelFlag(CommonConstant.DEL_FLAG_0);
        //技术状态鉴定表
        EamBaseHFCode eamBaseHFCode = hfCodeService.selectByCategory(HfTemplateCategoryEnum.TECHNICAL_STATUS_EVALUATION.name());
        if(eamBaseHFCode == null) {
            throw new JeecgBootException("未配置技术状态鉴定表的HF编码,添加失败!");
        }
        order.setHfCodeA(eamBaseHFCode.getHfCode());
        //技术状态鉴定安全装置检查表
        eamBaseHFCode = hfCodeService.selectByCategory(HfTemplateCategoryEnum.TECHNICAL_STATUS_EVALUATION_SAFETY_CHECK.name());
        if(eamBaseHFCode == null) {
            throw new JeecgBootException("未配置安全装置检查表的HF编码,添加失败!");
        }
        order.setHfCodeB(eamBaseHFCode.getHfCode());
        //技术状态鉴定其他检查表
        eamBaseHFCode = hfCodeService.selectByCategory(HfTemplateCategoryEnum.TECHNICAL_STATUS_EVALUATION_OTHER_CHECK.name());
        if(eamBaseHFCode == null) {
            throw new JeecgBootException("未配置其他检查表的HF编码,添加失败!");
        }
        order.setHfCodeD(eamBaseHFCode.getHfCode());
        //技术状态鉴定设备精度检查表
        eamBaseHFCode = hfCodeService.selectByCategory(HfTemplateCategoryEnum.TECHNICAL_STATUS_EVALUATION_PRECISION_CHECK.name());
        if(eamBaseHFCode == null) {
            throw new JeecgBootException("未配置设备精度检查表的HF编码,添加失败!");
        }
        order.setHfCodeC(eamBaseHFCode.getHfCode());
        this.getBaseMapper().insert(order);
        //处理明细数据
        if (CollectionUtil.isNotEmpty(request.getTableDetailList())) {