Merge branch 'gzynasrs' of http://47.97.1.152:5880/r/zy-asrs into gzynasrs

18516761980

2022-08-17 06346cdbdebfd83750aceb879664b72f0484cab0

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

@@ -176,6 +176,21 @@
    @TableField("ctn_no")
    private String ctnNo;

//    消防点编号
    @ApiModelProperty(value= "")
    @TableField("fire_no")
    private String fireNo;

//    消防状态{0:正常,1:报警}
    @ApiModelProperty(value= "")
    @TableField("fire_status")
    private Integer fireStatus;

//    产品状态{0:无,1:待测,2:测试中;3.静置中;4:静置完成}
    @ApiModelProperty(value= "")
    @TableField("pack_status")
    private Integer packStatus;


    public String getWhsType$(){
        BasWhsService service = SpringUtils.getBean(BasWhsService.class);
@@ -290,4 +305,34 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
    }

    public String getFireStatus$() {
        if (null == this.fireStatus){ return null; }
        switch (this.fireStatus){
            case 0:
                return "正常";
            case 1:
                return "报警";
            default:
                return String.valueOf(this.fireStatus);
        }
    }

    public String getPackStatus$() {
        if (null == this.packStatus){ return null; }
        switch (this.packStatus){
            case 0:
                return "无";
            case 1:
                return "待测";
            case 2:
                return "测试中";
            case 3:
                return "静置中";
            case 4:
                return "静置完成";
            default:
                return String.valueOf(this.packStatus);
        }
    }

}