三保状态修改

Lius

7 天以前 8e54b9749f05e63c46f3b0488f7f86d4700ab747

三保状态修改

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

@@ -79,13 +79,13 @@
     */
    @ApiModelProperty(value = "设备功能是否齐备;是否")
    @Dict(dicCode = "yn")
    private String fullyFunctional;
    private String fullyFunctionalResult;
    /**
     * 设备功能是否齐备;是否
     */
    @ApiModelProperty(value = "设备功能是否正常运转;是否")
    @Dict(dicCode = "yn")
    private String runningNormally;
    private String runningNormallyResult;
    /**
     * 问题描述
     */

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

@@ -519,10 +519,10 @@
                case WAIT_CHECK:
                    // 技术状态鉴定结束
                    order.setInspector(user.getUsername());
                    order.setFullyFunctional(request.getFullyFunctional());
                    order.setRunningNormally(request.getRunningNormally());
                    order.setFullyFunctional(request.getFullyFunctionalResult());
                    order.setRunningNormally(request.getRunningNormallyResult());
                    order.setInspectTime(new Date());
                    if (CommonConstant.YN_O.equals(request.getFullyFunctional()) && CommonConstant.YN_O.equals(request.getRunningNormally())) {
                    if (CommonConstant.YN_O.equals(request.getFullyFunctionalResult()) && CommonConstant.YN_O.equals(request.getRunningNormallyResult())) {
                        // 鉴定通过
                        order.setMaintenanceStatus(ThirdMaintenanceStatusEnum.UNDER_MAINTENANCE.name());
                    } else {