三保状态修改

Lius

7 天以前 24aa3dd763498a10600ca1f0f43160e2913ad98a

三保状态修改

 lxzn-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java

@@ -366,6 +366,12 @@
    String YN_Y = "Y";
    String YN_N = "N";

    /**
     * 1是0否
     */
    String YN_O = "0";
    String YN_1 = "1";


    /**===============================================================================================*/
    /**

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

@@ -118,14 +118,14 @@
     */
    @Excel(name = "设备功能是否齐备;是否", width = 15)
    @ApiModelProperty(value = "设备功能是否齐备;是否")
    @Dict(dicCode = "equipment_function_yn")
    @Dict(dicCode = "yn")
    private String fullyFunctional;
    /**
     * 设备功能是否齐备;是否
     */
    @Excel(name = "设备能否正常运转;是否", width = 15)
    @ApiModelProperty(value = "设备功能是否齐备;是否")
    @Dict(dicCode = "equipment_function_yn")
    @Dict(dicCode = "yn")
    private String runningNormally;
    /**
     * 问题描述

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

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

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

@@ -375,7 +375,7 @@
                values.put("dataId", order.getId());
                values.put("organization", "技术状态鉴定结束");
                values.put("comment", "技术状态鉴定结束");
                if (CommonConstant.YN_Y.equals(request.getFullyFunctional()) && CommonConstant.YN_Y.equals(request.getRunningNormally())) {
                if (CommonConstant.YN_O.equals(request.getFullyFunctional()) && CommonConstant.YN_O.equals(request.getRunningNormally())) {
                    values.put("confirmation", "1");
                    // 获取下一步执行人
                    userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0002);
@@ -522,7 +522,7 @@
                    order.setFullyFunctional(request.getFullyFunctional());
                    order.setRunningNormally(request.getRunningNormally());
                    order.setInspectTime(new Date());
                    if (CommonConstant.YN_Y.equals(request.getFullyFunctional()) && CommonConstant.YN_Y.equals(request.getRunningNormally())) {
                    if (CommonConstant.YN_O.equals(request.getFullyFunctional()) && CommonConstant.YN_O.equals(request.getRunningNormally())) {
                        // 鉴定通过
                        order.setMaintenanceStatus(ThirdMaintenanceStatusEnum.UNDER_MAINTENANCE.name());
                    } else {