*

L

4 天以前 9f535f9c6ff8640d0cbbc915235a59d2ee39c702

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

@@ -12,6 +12,7 @@
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;

@Data
@TableName("cust_wait_pakin_log")
@@ -203,9 +204,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);
        }
@@ -227,11 +230,11 @@

    public String getBrand$(){
        BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
        BasBoxType basBoxType = basBoxTypeService.selectOne(new EntityWrapper<BasBoxType>().eq("box_type", this.brand));
        if (!Cools.isEmpty(basBoxType)){
        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
        for (BasBoxType basBoxType:basBoxTypes){
            return String.valueOf(basBoxType.getBoxSpecs());
        }
        return null;
        return this.brand;
    }

}