clinic-v2
/
server
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dev

This commit is contained in:
LiJianZhao 2025-05-08 16:21:54 +08:00
parent e00eb66dd0
commit 01a8237bb0
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/syjiaer/clinic/server/entity/goods/vo/GoodsSearchVo.java
View File

@ -1,9 +1,12 @@
package com.syjiaer.clinic.server.entity.goods.vo; package com.syjiaer.clinic.server.entity.goods.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime;
@Data @Data
public class GoodsSearchVo { public class GoodsSearchVo {
@ApiModelProperty("自增主键") @ApiModelProperty("自增主键")
@ -121,4 +124,10 @@ public class GoodsSearchVo {
private String limit; private String limit;
@ApiModelProperty("库存") @ApiModelProperty("库存")
private String inventory; private String inventory;
@ApiModelProperty("效期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime lifespan;
@ApiModelProperty("库存")
private String specifications;
} }

3
src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java
View File

@ -306,10 +306,13 @@ public class GoodsService {
inventory += goods.getInventoryFragmentNumber() + goods.getMinPackagingUnit(); inventory += goods.getInventoryFragmentNumber() + goods.getMinPackagingUnit();
} }
goodsSearchVo.setInventory(inventory); goodsSearchVo.setInventory(inventory);
String specifications = goods.getMinPackagingNumber()+"*"+goods.getMinPackagingUnit()+"/"+goods.getPackagingUnit();
goodsSearchVo.setSpecifications(specifications);
SocialDirectoryUpinfo socialDirectoryUpinfo = socialDirectoryUpinfoMapper.selectByCode(goods.getHilistCode()); SocialDirectoryUpinfo socialDirectoryUpinfo = socialDirectoryUpinfoMapper.selectByCode(goods.getHilistCode());
if (socialDirectoryUpinfo != null) { if (socialDirectoryUpinfo != null) {
ChrgitmLvEnum chrgitmLvEnum = ChrgitmLvEnum.getChrgitmLvEnumByCode(socialDirectoryUpinfo.getChrgitmLv()); ChrgitmLvEnum chrgitmLvEnum = ChrgitmLvEnum.getChrgitmLvEnumByCode(socialDirectoryUpinfo.getChrgitmLv());
goodsSearchVo.setCategory(chrgitmLvEnum == null ? null : chrgitmLvEnum.getName()); goodsSearchVo.setCategory(chrgitmLvEnum == null ? null : chrgitmLvEnum.getName());
goodsSearchVo.setLifespan(socialDirectoryUpinfo.getEnddate());
} }
goodsSearchVoList.add(goodsSearchVo); goodsSearchVoList.add(goodsSearchVo);
} }