#1

lsh

21 小时以前 809f49807ce5f587fe881cfe4cc3d38d9c1a46a3

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

@@ -219,9 +219,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);
        }
@@ -245,6 +247,15 @@
        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;
    }

    public String getModiTime$(){
        if (Cools.isEmpty(this.modiTime)){
            return "";