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

deb

This commit is contained in:
LiJianZhao 2025-05-07 09:53:42 +08:00
parent fb0dcc8793
commit 53ec8eab04
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialDirectoryView.java
View File

@ -70,6 +70,12 @@ public class SocialDirectoryView implements Serializable {
private JSONObject json; private JSONObject json;
private String minPackagingUnit;
private String packagingUnit;
private Integer inventoryWholeNumber;
private Integer inventoryFragmentNumber;
} }

16
src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java
View File

@ -7,8 +7,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.syjiaer.clinic.server.common.exception.MessageException; import com.syjiaer.clinic.server.common.exception.MessageException;
import com.syjiaer.clinic.server.common.util.*; import com.syjiaer.clinic.server.common.util.*;
import com.syjiaer.clinic.server.common.vo.Page; import com.syjiaer.clinic.server.common.vo.Page;
import com.syjiaer.clinic.server.entity.goods.Goods;
import com.syjiaer.clinic.server.entity.social.*; import com.syjiaer.clinic.server.entity.social.*;
import com.syjiaer.clinic.server.entity.social.vo.SocialDirectoryView; import com.syjiaer.clinic.server.entity.social.vo.SocialDirectoryView;
import com.syjiaer.clinic.server.mapper.goods.GoodsMapper;
import com.syjiaer.clinic.server.mapper.social.*; import com.syjiaer.clinic.server.mapper.social.*;
import com.syjiaer.clinic.server.service.BaseService; import com.syjiaer.clinic.server.service.BaseService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -44,6 +46,10 @@ public class SocialDirectoryService extends BaseService {
private SocialDirectorySelfMapper socialDirectorySelfMapper; private SocialDirectorySelfMapper socialDirectorySelfMapper;
@Autowired @Autowired
private SocialDirectoryVersionService socialDirectoryVersionService; private SocialDirectoryVersionService socialDirectoryVersionService;
@Autowired
private GoodsMapper goodsMapper;
private Logger logger = Logger.getLogger(SocialDirectoryService.class.getName()); private Logger logger = Logger.getLogger(SocialDirectoryService.class.getName());
/* /*
@ -352,6 +358,16 @@ public class SocialDirectoryService extends BaseService {
socialDirectoryView.setSelfpayProp(socialDirectorySelf.getSelfpayProp()); socialDirectoryView.setSelfpayProp(socialDirectorySelf.getSelfpayProp());
} }
socialDirectoryView.setJson(JSONObject.parse(socialDirectoryView.getData())); socialDirectoryView.setJson(JSONObject.parse(socialDirectoryView.getData()));
QueryWrapper<Goods> goodsQueryWrapper = new QueryWrapper<>();
goodsQueryWrapper.eq("hilist_code", code);
goodsQueryWrapper.last("limit 1");
Goods goods = goodsMapper.selectOne(goodsQueryWrapper);
socialDirectoryView.setMinPackagingUnit(goods.getMinPackagingUnit());
socialDirectoryView.setPackagingUnit(goods.getPackagingUnit());
socialDirectoryView.setInventoryWholeNumber(goods.getInventoryWholeNumber());
socialDirectoryView.setInventoryFragmentNumber(goods.getInventoryFragmentNumber());
return socialDirectoryView; return socialDirectoryView;
} }