diff --git a/src/main/java/com/syjiaer/clinic/server/entity/goods/vo/GoodsSearchVo.java b/src/main/java/com/syjiaer/clinic/server/entity/goods/vo/GoodsSearchVo.java index 132c53b..28cb206 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/goods/vo/GoodsSearchVo.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/goods/vo/GoodsSearchVo.java @@ -1,9 +1,12 @@ package com.syjiaer.clinic.server.entity.goods.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.time.LocalDateTime; + @Data public class GoodsSearchVo { @ApiModelProperty("自增主键") @@ -121,4 +124,10 @@ public class GoodsSearchVo { private String limit; @ApiModelProperty("库存") private String inventory; + @ApiModelProperty("效期") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime lifespan; + + @ApiModelProperty("库存") + private String specifications; } diff --git a/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java b/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java index 877ca84..ef8886c 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java @@ -306,10 +306,13 @@ public class GoodsService { inventory += goods.getInventoryFragmentNumber() + goods.getMinPackagingUnit(); } goodsSearchVo.setInventory(inventory); + String specifications = goods.getMinPackagingNumber()+"*"+goods.getMinPackagingUnit()+"/"+goods.getPackagingUnit(); + goodsSearchVo.setSpecifications(specifications); SocialDirectoryUpinfo socialDirectoryUpinfo = socialDirectoryUpinfoMapper.selectByCode(goods.getHilistCode()); if (socialDirectoryUpinfo != null) { ChrgitmLvEnum chrgitmLvEnum = ChrgitmLvEnum.getChrgitmLvEnumByCode(socialDirectoryUpinfo.getChrgitmLv()); goodsSearchVo.setCategory(chrgitmLvEnum == null ? null : chrgitmLvEnum.getName()); + goodsSearchVo.setLifespan(socialDirectoryUpinfo.getEnddate()); } goodsSearchVoList.add(goodsSearchVo); }