故障报修新增hf编码

lyh

4 天以前 0bc74278ff8130936bc7aed763e8901fedb4f3b0

故障报修新增hf编码

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

@@ -15,5 +15,8 @@
    TECHNICAL_STATUS_CHANGE, //技术状态变更申请
    TECHNICAL_STATUS_EVALUATION_APPLY, //技术状态鉴定申请
    TECHNICAL_STATUS_DEACTIVATE, //停用加工设备申请单
    REPORT_ACCIDENTS_REGISTER, //设备事故登记表
    REPORT_PRODUCT_HAZARDS, //产品安全隐患确认
    REPORT_THREE_NO_SPARE //三不放过原则表
    ;
}

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamReportAccidentsRegisterDto.java

@@ -61,6 +61,10 @@
    @Excel(name = "设备ID", width = 15)
    @ApiModelProperty(value = "设备ID")
    private String equipmentId;
    /**HF编码*/
    @Excel(name = "HF编码", width = 15)
    @ApiModelProperty(value = "HF编码")
    private String hfCode;
    /**登记状态*/
    @ApiModelProperty(value = "登记状态")
    @Dict(dicCode = "eam_report_accidents_register_status")

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamReportProductHazardsDto.java

@@ -57,6 +57,10 @@
    @Excel(name = "设备ID", width = 15)
    @ApiModelProperty(value = "设备ID")
    private String equipmentId;
    /**HF编码*/
    @Excel(name = "HF编码", width = 15)
    @ApiModelProperty(value = "HF编码")
    private String hfCode;
    /**操作工*/
    @Excel(name = "操作工", width = 15)
    @ApiModelProperty(value = "操作工")

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamReportThreeNoSpareDto.java

@@ -64,6 +64,10 @@
    @Excel(name = "设备ID", width = 15)
    @ApiModelProperty(value = "设备ID")
    private String equipmentId;
    /**HF编码*/
    @Excel(name = "HF编码", width = 15)
    @ApiModelProperty(value = "HF编码")
    private String hfCode;
    /**提交状态*/
    @Excel(name = "提交状态", width = 15)
    @ApiModelProperty(value = "提交状态")

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

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

@@ -105,6 +105,10 @@
    @Excel(name = "造成结果", width = 15)
    @ApiModelProperty(value = "造成结果")
    private String causingResults;
    /**HF编码*/
    @Excel(name = "HF编码", width = 15)
    @ApiModelProperty(value = "HF编码")
    private String hfCode;
    /**操作工*/
    @Excel(name = "操作工", width = 15)
    @ApiModelProperty(value = "操作工")

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

@@ -122,6 +122,10 @@
    @Excel(name = "部级领导确认结果", width = 15)
    @ApiModelProperty(value = "部级领导确认结果")
    private String deputyDepartmentResult;
    /**HF编码*/
    @Excel(name = "HF编码", width = 15)
    @ApiModelProperty(value = "HF编码")
    private String hfCode;
    //列表展示
    @TableField(exist = false)
    private String equipmentCode;

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

@@ -130,4 +130,8 @@
    @Excel(name = "造成结果", width = 15)
    @ApiModelProperty(value = "造成结果")
    private transient String causingResults;
    /**HF编码*/
    @Excel(name = "HF编码", width = 15)
    @ApiModelProperty(value = "HF编码")
    private String hfCode;
}

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/EamBaseHFCodeMapper.java

ÎļþÃû´Ó lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamBaseHFCodeMapper.java ÐÞ¸Ä
@@ -1,8 +1,5 @@
package org.jeecg.modules.eam.mapper;

import java.util.List;

import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.EamBaseHFCode;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;


 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamBaseHFCodeMapper.xml

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

@@ -54,6 +54,10 @@
    @Excel(name = "设备ID", width = 15)
    @ApiModelProperty(value = "设备ID")
    private String equipmentId;
    /**HF编码*/
    @Excel(name = "HF编码", width = 15)
    @ApiModelProperty(value = "HF编码")
    private String hfCode;
    /**登记状态*/
    @ApiModelProperty(value = "登记状态")
    @Dict(dicCode = "eam_report_accidents_register_status")

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

@@ -61,6 +61,10 @@
    @Excel(name = "设备ID", width = 15)
    @ApiModelProperty(value = "设备ID")
    private String equipmentId;
    /**HF编码*/
    @Excel(name = "HF编码", width = 15)
    @ApiModelProperty(value = "HF编码")
    private String hfCode;
    /**确认状态*/
    @Excel(name = "确认状态", width = 15)
    @ApiModelProperty(value = "确认状态")

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

@@ -56,6 +56,10 @@
    @Excel(name = "设备ID", width = 15)
    @ApiModelProperty(value = "设备ID")
    private String equipmentId;
    /**HF编码*/
    @Excel(name = "HF编码", width = 15)
    @ApiModelProperty(value = "HF编码")
    private String hfCode;
    /**提交状态*/
    @Excel(name = "提交状态", width = 15)
    @ApiModelProperty(value = "提交状态")

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

ÎļþÃû´Ó lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamBaseHFCodeService.java ÐÞ¸Ä
@@ -3,8 +3,6 @@
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.eam.entity.EamBaseHFCode;

import javax.validation.Valid;

/**
 * @Description: HFCode维护
 * @Author: jeecg-boot

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

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

@@ -12,6 +12,7 @@
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.DataBaseConstant;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
@@ -65,6 +66,8 @@
    private ISysBusinessCodeRuleService businessCodeRuleService;
    @Autowired
    private IEamReportThreeNoSpareService eamReportThreeNoSpareService;
    @Autowired
    private IEamBaseHFCodeService hfCodeService;
    /**
     * åˆ†é¡µåˆ—表
     *
@@ -201,6 +204,11 @@
            eamReportProductHazards.setReportId(eamReportRepair.getId());
            eamReportProductHazards.setDelFlag(Integer.valueOf(CommonConstant.DEFAULT_0));
            eamReportProductHazards.setConfirmStatus(EamReportProductHazardsEnum.PENDING_SUBMIT.name());
            EamBaseHFCode eamBaseHFCode = hfCodeService.selectByCategory(HfTemplateCategoryEnum.REPORT_PRODUCT_HAZARDS.name());
            if (eamBaseHFCode == null) {
                throw new JeecgBootException("未配置产品安全隐患确认的HF编码，添加失败！");
            }
            eamReportProductHazards.setHfCode(eamBaseHFCode.getHfCode());
            iEamReportProductHazardsService.save(eamReportProductHazards);
        }
        if (StrUtil.isNotEmpty(eamReportRepair.getIsAccidentsRegister())&&("1").equals(eamReportRepair.getIsAccidentsRegister())) {
@@ -211,6 +219,11 @@
            eamReportAccidentsRegister.setReportId(eamReportRepair.getId());
            eamReportAccidentsRegister.setDelFlag(Integer.valueOf(CommonConstant.DEFAULT_0));
            eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.PENDING_SUBMIT.name());
            EamBaseHFCode eamBaseHFCode = hfCodeService.selectByCategory(HfTemplateCategoryEnum.REPORT_ACCIDENTS_REGISTER.name());
            if (eamBaseHFCode == null) {
                throw new JeecgBootException("未配置设备事故登记表的HF编码，添加失败！");
            }
            eamReportAccidentsRegister.setHfCode(eamBaseHFCode.getHfCode());
            iEamReportAccidentsRegisterService.save(eamReportAccidentsRegister);
            //生成三不原则
            EamReportThreeNoSpare eamReportThreeNoSpare = new EamReportThreeNoSpare();
@@ -220,6 +233,11 @@
            eamReportThreeNoSpare.setPreventionMeasures(eamReportAccidentsRegister.getTakeSteps());
            eamReportThreeNoSpare.setSubmitStatus(EamReportThreeNoSpareEnum.PENDING_SUBMIT.name());
            eamReportThreeNoSpare.setDelFlag(Integer.valueOf(CommonConstant.DEFAULT_0));
            EamBaseHFCode threeHfCode = hfCodeService.selectByCategory(HfTemplateCategoryEnum.REPORT_THREE_NO_SPARE.name());
            if (threeHfCode == null) {
                throw new JeecgBootException("未配置三不放过原则表的HF编码，添加失败！");
            }
            eamReportThreeNoSpare.setHfCode(threeHfCode.getHfCode());
            eamReportThreeNoSpareService.save(eamReportThreeNoSpare);
        }
        //生成维修工单

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

@@ -392,6 +392,7 @@
                            EamSecondMaintenanceOrderDetail eamMaintenanceStandardDetail=new EamSecondMaintenanceOrderDetail();
                            BeanUtils.copyProperties(tableDetail, eamMaintenanceStandardDetail);
                            eamMaintenanceStandardDetail.setOrderId(entity.getId());
                            eamMaintenanceStandardDetail.setCreateBy(user.getUsername());
                            addList.add(eamMaintenanceStandardDetail);
                        });
                        secondMaintenanceOrderDetailService.saveBatch(addList);
@@ -414,6 +415,7 @@
                            EamSecondMaintenanceOrderDetail eamMaintenanceStandardDetail=new EamSecondMaintenanceOrderDetail();
                            BeanUtils.copyProperties(tableDetail, eamMaintenanceStandardDetail);
                            eamMaintenanceStandardDetail.setOrderId(entity.getId());
                            eamMaintenanceStandardDetail.setCreateBy(user.getUsername());
                            addList.add(eamMaintenanceStandardDetail);
                        });
                        secondMaintenanceOrderDetailService.saveBatch(addList);