管理后台bug修改

mitao

2025-02-19 ae7f04be9321ddbe17c46fae8ab05d34e7493f9f

 medicalWaste-system/src/main/java/com/sinata/system/domain/MwCollectRecord.java

@@ -33,10 +33,6 @@
    @TableId(value = "ID", type = IdType.AUTO)
    private Long id;

    @ApiModelProperty("入库时间")
    @TableField("STORAGE_TIME")
    private Date storageTime;

    @ApiModelProperty("区域id（医院）")
    @TableField("DEPARTMENT_ID")
    private Long departmentId;
@@ -63,7 +59,7 @@

    @ApiModelProperty("医废类型（数据字典id)")
    @TableField("WASTE_TYPE")
    private Integer wasteType;
    private Long wasteType;

    @ApiModelProperty("医废类型名称(冗余)")
    @TableField("WASTE_TYPE_STR")
@@ -73,27 +69,15 @@
    @TableField("WEIGHT")
    private BigDecimal weight;

    @ApiModelProperty("入库人员id")
    @TableField("STORAGE_USER_ID")
    private Long storageUserId;

    @ApiModelProperty("入库人员姓名")
    @TableField("STORAGE_USER_NAME")
    private String storageUserName;

    @ApiModelProperty("出库人员id")
    @TableField("CHECKOUT_USER_ID")
    private Long checkoutUserId;

    @ApiModelProperty("出库人员姓名")
    @TableField("CHECKOUT_USER_NAME")
    private String checkoutUserName;

    @ApiModelProperty("出库时间")
    @TableField("CHECKOUT_TIME")
    private Date checkoutTime;

    @ApiModelProperty("医废状态 1：暂存中 2：运输中 3：已接收 4：已处置")
    @ApiModelProperty("医废状态 1：暂存中; 2：运输中; 3：已接收; 4：已处置;")
    @TableField("STATUS")
    private Integer status;

@@ -101,5 +85,42 @@
    @TableField("BOX_TIME")
    private Date boxTime;

    @ApiModelProperty("接收人id")
    @TableField("RECEIVE_USER_ID")
    private Long receiveUserId;

    @ApiModelProperty("收集人id")
    @TableField("COLLECT_USER_ID")
    private Long collectUserId;

    @ApiModelProperty("收集时间")
    @TableField("COLLECT_TIME")
    private Date collectTime;

    @ApiModelProperty("接收时间")
    @TableField("RECEIVE_TIME")
    private Date receiveTime;
    @ApiModelProperty("司机用户id")
    @TableField("DRIVER_ID")
    private Long driverId;
    @ApiModelProperty("车辆id")
    @TableField("CAR_ID")
    private Long carId;
    @ApiModelProperty("处置时间")
    @TableField("DISPOSAL_TIME")
    private Date disposalTime;

    @ApiModelProperty("处置用户ID")
    @TableField("DISPOSAL_USER_ID")
    private Long disposalUserId;

    @ApiModelProperty("接收部门id")
    @TableField("RECEIVE_DEPARTMENT_ID")
    private Long receiveDepartmentId;






}