维修工单更改

lyh

4 天以前 4a5e8881171f2e89fcb0dde381b17750a85b924f

维修工单更改

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

@@ -4,5 +4,6 @@
    PENDING_REPAIR,
    UNDER_MAINTENANCE,
    PENDING_CONFIRMATION,
    REPAIR_COMPLETED;
    REPAIR_COMPLETED,
    REJECTED;
}

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

@@ -43,6 +43,19 @@
    private Integer delFlag;
    /**工单编号*/
    private String repairCode;
    /**故障类型*/
    @Excel(name = "故障类型", width = 15)
    @ApiModelProperty(value = "故障类型")
    @Dict(dicCode = "fault_type")
    private String faultType;
    /**故障现象*/
    @Excel(name = "故障现象", width = 15)
    @ApiModelProperty(value = "故障现象")
    private String faultPhenomenon;
    /**报修人*/
    @Excel(name = "报修人", width = 15)
    @ApiModelProperty(value = "报修人")
    private String reportPerson;
    /**报修ID*/
    private String reportId;
    /**设备ID*/

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

@@ -81,6 +81,14 @@
    @ApiModelProperty(value = "故障类型")
    @Dict(dicCode = "fault_type")
    private String faultType;
    /**故障现象*/
    @Excel(name = "故障现象", width = 15)
    @ApiModelProperty(value = "故障现象")
    private String faultPhenomenon;
    /**报修人*/
    @Excel(name = "报修人", width = 15)
    @ApiModelProperty(value = "报修人")
    private String reportPerson;
    /** 维修开始时间 */
    @ApiModelProperty(name = "维修开始时间",notes = "")
    private Date actualStartTime;

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

@@ -347,7 +347,7 @@
            if ("1".equals(request.getConfirmResult())) {
                order.setRepairStatus(EamRepairOrderRepairStatusEnum.REPAIR_COMPLETED.name());
            }else {
                order.setRepairStatus(EamRepairOrderRepairStatusEnum.UNDER_MAINTENANCE.name());
                order.setRepairStatus(EamRepairOrderRepairStatusEnum.REJECTED.name());
            }
        }
        order.setConfirmer(user.getUsername());
@@ -356,7 +356,7 @@
        order.setConfirmComment(request.getConfirmComment());
        this.baseMapper.updateById(order);
        EamReportRepair eamReportRepair=eamReportRepairService.getById(order.getReportId());
        eamReportRepair.setReportStatus(EamRepairOrderRepairStatusEnum.UNDER_MAINTENANCE.name());
        eamReportRepair.setReportStatus(order.getRepairStatus());
        eamReportRepairService.updateById(eamReportRepair);
        return order;
    }