#1

lsh

20 小时以前 e128bbc4a9df1491257320884169ba813d461f63

 src/main/java/com/zy/asrs/entity/WaitPakin.java

@@ -217,9 +217,11 @@
        if (null == this.danger){ return null; }
        switch (this.danger){
            case 1:
                return "是";
                return "合格";
            case 2:
                return "不合格";
            case 0:
                return "否";
                return "待判";
            default:
                return String.valueOf(this.danger);
        }
@@ -251,4 +253,13 @@
        }
        return this.brand;
    }

    public int getBrandArmType$(){
        BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
        for (BasBoxType basBoxType:basBoxTypes){
            return basBoxType.getArmType();
        }
        return 999;
    }
}