diff --git a/src/main/java/com/syjiaer/clinic/server/entity/inventory/dto/ApplyOrderQuery.java b/src/main/java/com/syjiaer/clinic/server/entity/inventory/dto/ApplyOrderQuery.java index 7b8e8a9..9eca82c 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/inventory/dto/ApplyOrderQuery.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/inventory/dto/ApplyOrderQuery.java @@ -1,13 +1,15 @@ package com.syjiaer.clinic.server.entity.inventory.dto; +import com.syjiaer.clinic.server.entity.common.dto.PageQuery; +import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; @Getter @Setter -public class ApplyOrderQuery { - private Integer pageNum; - private Integer pageSize; +public class ApplyOrderQuery extends PageQuery { + @ApiModelProperty("开始时间") private String beginTime; + @ApiModelProperty("结束时间") private String endTime; } diff --git a/src/main/java/com/syjiaer/clinic/server/entity/inventory/dto/CheckQuery.java b/src/main/java/com/syjiaer/clinic/server/entity/inventory/dto/CheckQuery.java index 47a87b3..ee6cdb1 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/inventory/dto/CheckQuery.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/inventory/dto/CheckQuery.java @@ -1,13 +1,15 @@ package com.syjiaer.clinic.server.entity.inventory.dto; +import com.syjiaer.clinic.server.entity.common.dto.PageQuery; +import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; @Getter @Setter -public class CheckQuery { - private Integer pageNum; - private Integer pageSize; +public class CheckQuery extends PageQuery { + @ApiModelProperty("开始时间") private String beginTime; + @ApiModelProperty("结束时间") private String endTime; } diff --git a/src/main/java/com/syjiaer/clinic/server/entity/inventory/dto/PurchaseOrderQuery.java b/src/main/java/com/syjiaer/clinic/server/entity/inventory/dto/PurchaseOrderQuery.java index 9cc1902..49b922d 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/inventory/dto/PurchaseOrderQuery.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/inventory/dto/PurchaseOrderQuery.java @@ -1,5 +1,7 @@ package com.syjiaer.clinic.server.entity.inventory.dto; +import com.syjiaer.clinic.server.entity.common.dto.PageQuery; +import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; @@ -7,15 +9,18 @@ import java.util.List; @Getter @Setter -public class PurchaseOrderQuery { - private Integer pageNum; - private Integer pageSize; - private Integer offset; +public class PurchaseOrderQuery extends PageQuery { + @ApiModelProperty("采购流水号") private String code; + @ApiModelProperty("供应商IDS") private List supplierIds; + @ApiModelProperty("采购管理员IDS") private List managerUserIds; + @ApiModelProperty("开始时间") private String beginTime; + @ApiModelProperty("结束时间") private String endTime; + @ApiModelProperty("商品名称") private String goodsName; diff --git a/src/main/java/com/syjiaer/clinic/server/entity/inventory/dto/SupplierQuery.java b/src/main/java/com/syjiaer/clinic/server/entity/inventory/dto/SupplierQuery.java index d107f18..25530a7 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/inventory/dto/SupplierQuery.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/inventory/dto/SupplierQuery.java @@ -1,13 +1,15 @@ package com.syjiaer.clinic.server.entity.inventory.dto; +import com.syjiaer.clinic.server.entity.common.dto.PageQuery; +import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; @Setter @Getter -public class SupplierQuery { - private Integer pageNum; - private Integer pageSize; +public class SupplierQuery extends PageQuery { + @ApiModelProperty("禁用启用状态") private Integer turn; + @ApiModelProperty("搜索关键字") private String keyword; } diff --git a/src/main/java/com/syjiaer/clinic/server/entity/inventory/vo/InventoryGoodsVo.java b/src/main/java/com/syjiaer/clinic/server/entity/inventory/vo/InventoryGoodsVo.java index fdde84f..0477284 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/inventory/vo/InventoryGoodsVo.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/inventory/vo/InventoryGoodsVo.java @@ -1,7 +1,9 @@ package com.syjiaer.clinic.server.entity.inventory.vo; import com.baomidou.mybatisplus.annotation.TableName; +import com.syjiaer.clinic.server.entity.inventory.Inventory; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; import lombok.ToString; @@ -14,7 +16,7 @@ import java.time.LocalDateTime; /** *

- * + * *

* * @author NiuZiYuan @@ -24,35 +26,8 @@ import java.time.LocalDateTime; @Setter @ToString @Accessors(chain = true) -@TableName("inventory_goods_view") -@ApiModel(value = "InventoryGoodsView对象", description = "") -public class InventoryGoodsVo implements Serializable { - - private static final long serialVersionUID = 1L; - - private Integer id; - - private Integer wholeNumber; - - private Integer fragmentNumber; - - private BigDecimal purchaseUnitPrice; - - private LocalDateTime createDatetime; - - private String inventoryPurchaseCode; - - private Integer goodId; - - private String packagingUnit; - - private LocalDate productionDate; - - private LocalDate expiryDate; - - private String name; - - private String productionBatchCode; +public class InventoryGoodsVo extends Inventory { + @ApiModelProperty("单价") private BigDecimal unitPrice; }