Skip to content

huang.tao / jmai-platform

Go to a project
Commit 8a7982e9 by huangtao
Options

销毁审批

parent 4b26d05a
Expand all
Inline Side-by-side
Showing with 30 additions and 2 deletions
jmai-physic/src/main/java/com/jmai/physic/dto/PhysicStorageAmpouleCreateReq.java
...@@ -3,13 +3,14 @@ package com.jmai.physic.dto; ...@@ -3,13 +3,14 @@ package com.jmai.physic.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.NotNull;
import java.util.List; import java.util.List;
@Data @Data
public class PhysicStorageAmpouleCreateReq { public class PhysicStorageAmpouleCreateReq {
@NotNull(message = "type不能为空")
@ApiModelProperty(value = "1-回收 2-移至销毁") @ApiModelProperty(value = "1-回收 2-移至销毁")
private Integer type; private Integer type;
......
jmai-physic/src/main/java/com/jmai/physic/service/impl/PhysicDestroyCheckServiceImpl.java
...@@ -19,6 +19,7 @@ import com.jmai.physic.vo.PhysicDestroyNumVO; ...@@ -19,6 +19,7 @@ import com.jmai.physic.vo.PhysicDestroyNumVO;
import com.jmai.sys.consts.BizFileTypes; import com.jmai.sys.consts.BizFileTypes;
import com.jmai.sys.consts.enums.RoleTypeEum; import com.jmai.sys.consts.enums.RoleTypeEum;
import com.jmai.sys.ctx.SpringContextUtils; import com.jmai.sys.ctx.SpringContextUtils;
import com.jmai.sys.dto.BizFileDto;
import com.jmai.sys.entity.SysUser; import com.jmai.sys.entity.SysUser;
import com.jmai.sys.manager.SysManager; import com.jmai.sys.manager.SysManager;
import com.jmai.sys.mapper.SysUserMapper; import com.jmai.sys.mapper.SysUserMapper;
...@@ -33,6 +34,7 @@ import javax.annotation.Resource; ...@@ -33,6 +34,7 @@ import javax.annotation.Resource;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import static com.jmai.api.base.BaseService.filterMapDistinct;
import static com.jmai.sys.AbstractService.buildEmptyPage; import static com.jmai.sys.AbstractService.buildEmptyPage;
...@@ -71,13 +73,15 @@ public class PhysicDestroyCheckServiceImpl extends BaseServiceImpl<PhysicDestroy ...@@ -71,13 +73,15 @@ public class PhysicDestroyCheckServiceImpl extends BaseServiceImpl<PhysicDestroy
BeanUtil.copyProperties(req,check); BeanUtil.copyProperties(req,check);
check.setOrderNo(sysManager.newCheck("123")); check.setOrderNo(sysManager.newCheck("123"));
this.save(check); this.save(check);
if(CollectionUtils.isNotEmpty(req.getCheckDetailList())) {
for (PhysicDestroyCheckDetail physicDestroyCheckDetail : req.getCheckDetailList()) { for (PhysicDestroyCheckDetail physicDestroyCheckDetail : req.getCheckDetailList()) {
physicDestroyCheckDetail.setCheckId(check.getId()); physicDestroyCheckDetail.setCheckId(check.getId());
} }
physicDestroyCheckDetailService.saveBatch(req.getCheckDetailList()); physicDestroyCheckDetailService.saveBatch(req.getCheckDetailList());
}
if(ObjectUtil.isNotEmpty(req.getImages())){ if(ObjectUtil.isNotEmpty(req.getImages())){
if (CollectionUtils.isNotEmpty(req.getImages())) { if (CollectionUtils.isNotEmpty(req.getImages())) {
bizFileService.addBizFilesIfAbsent(BizFileTypes.PHYSIC_RECORD_IMAGE,check.getId().toString(), req.getImages()); bizFileService.addBizFilesIfAbsent(BizFileTypes.AMPOULE_DESTROY_IMAGE,check.getId().toString(), req.getImages());
} }
} }
} }
...@@ -90,6 +94,12 @@ public class PhysicDestroyCheckServiceImpl extends BaseServiceImpl<PhysicDestroy ...@@ -90,6 +94,12 @@ public class PhysicDestroyCheckServiceImpl extends BaseServiceImpl<PhysicDestroy
for (PhysicDestroyCheckVO checkVO : checkPage.getRecords()) { for (PhysicDestroyCheckVO checkVO : checkPage.getRecords()) {
List<PhysicDestroyCheckDetail> list = physicDestroyCheckDetailService.list(new LambdaQueryWrapper<PhysicDestroyCheckDetail>().eq(PhysicDestroyCheckDetail::getCheckId, checkVO.getId())); List<PhysicDestroyCheckDetail> list = physicDestroyCheckDetailService.list(new LambdaQueryWrapper<PhysicDestroyCheckDetail>().eq(PhysicDestroyCheckDetail::getCheckId, checkVO.getId()));
checkVO.setDestroyCheckDetailList(list); checkVO.setDestroyCheckDetailList(list);
List<BizFileDto> images = bizFileService.listBizFiles(BizFileTypes.AMPOULE_DESTROY_IMAGE,checkVO.getId().toString());
if(CollectionUtils.isNotEmpty(images)) {
checkVO.setImages(filterMapDistinct(images,
bf -> ObjectUtil.equals(bf.getBizKey(), checkVO.getId().toString()),
BizFileDto::getFileId));
}
} }
return checkPage; return checkPage;
......
jmai-physic/src/main/java/com/jmai/physic/service/impl/PhysicRecordServiceImpl.java
...@@ -18,6 +18,7 @@ import com.jmai.sys.AbstractService; ...@@ -18,6 +18,7 @@ import com.jmai.sys.AbstractService;
import com.jmai.sys.consts.BizFileTypes; import com.jmai.sys.consts.BizFileTypes;
import com.jmai.sys.consts.enums.RoleTypeEum; import com.jmai.sys.consts.enums.RoleTypeEum;
import com.jmai.sys.ctx.SpringContextUtils; import com.jmai.sys.ctx.SpringContextUtils;
import com.jmai.sys.dto.BizFileDto;
import com.jmai.sys.entity.SysUser; import com.jmai.sys.entity.SysUser;
import com.jmai.sys.mapper.SysUserMapper; import com.jmai.sys.mapper.SysUserMapper;
import com.jmai.sys.service.BizFileService; import com.jmai.sys.service.BizFileService;
...@@ -79,6 +80,14 @@ public class PhysicRecordServiceImpl extends AbstractService implements PhysicRe ...@@ -79,6 +80,14 @@ public class PhysicRecordServiceImpl extends AbstractService implements PhysicRe
public Page<PhysicRecordVO> listPage(PhysicRecordQueryReq req) { public Page<PhysicRecordVO> listPage(PhysicRecordQueryReq req) {
Page<PhysicRecordVO> page = buildEmptyPage(req); Page<PhysicRecordVO> page = buildEmptyPage(req);
Page<PhysicRecordVO> recordPage = physicRecordMapper.selectRecordPage(page, req); Page<PhysicRecordVO> recordPage = physicRecordMapper.selectRecordPage(page, req);
for (PhysicRecordVO record : recordPage.getRecords()) {
List<BizFileDto> prescriptionImages = bizFileService.listBizFiles(BizFileTypes.PHYSIC_RECORD_IMAGE,record.getId().toString());
if(CollectionUtils.isNotEmpty(prescriptionImages)) {
record.setPrescriptionImages(filterMapDistinct(prescriptionImages,
bf -> ObjectUtil.equals(bf.getBizKey(), record.getId().toString()),
BizFileDto::getFileId));
}
}
return recordPage; return recordPage;
} }
......
jmai-physic/src/main/java/com/jmai/physic/service/impl/PhysicStorageAmpouleServiceImpl.java
...@@ -91,6 +91,7 @@ public class PhysicStorageAmpouleServiceImpl extends AbstractService implements ...@@ -91,6 +91,7 @@ public class PhysicStorageAmpouleServiceImpl extends AbstractService implements
Page<PhysicStorageAmpouleVO> ampoulePage= physicStorageAmpouleMapper.selectAmpoulePage(page, req); Page<PhysicStorageAmpouleVO> ampoulePage= physicStorageAmpouleMapper.selectAmpoulePage(page, req);
for (PhysicStorageAmpouleVO record : ampoulePage.getRecords()) { for (PhysicStorageAmpouleVO record : ampoulePage.getRecords()) {
//如果为移至销毁类型，销毁数量physicNum=expendNum发出数量 //如果为移至销毁类型，销毁数量physicNum=expendNum发出数量
if(record.getType().equals(2) && record.getDestroyStatus().equals(1)){ if(record.getType().equals(2) && record.getDestroyStatus().equals(1)){
record.setPhysicNum(record.getExpendNum()); record.setPhysicNum(record.getExpendNum());
} }
......
jmai-physic/src/main/java/com/jmai/physic/vo/PhysicDestroyCheckVO.java
...@@ -9,6 +9,9 @@ import java.util.List; ...@@ -9,6 +9,9 @@ import java.util.List;
@Data @Data
public class PhysicDestroyCheckVO extends PhysicDestroyCheck { public class PhysicDestroyCheckVO extends PhysicDestroyCheck {
private String createName; private String createName;
private List<Long> images;
private List<PhysicDestroyCheckDetail> destroyCheckDetailList; private List<PhysicDestroyCheckDetail> destroyCheckDetailList;
} }
jmai-physic/src/main/java/com/jmai/physic/vo/PhysicRecordVO.java
...@@ -3,7 +3,11 @@ package com.jmai.physic.vo; ...@@ -3,7 +3,11 @@ package com.jmai.physic.vo;
import com.jmai.physic.entity.PhysicRecord; import com.jmai.physic.entity.PhysicRecord;
import lombok.Data; import lombok.Data;
import java.util.List;
@Data @Data
public class PhysicRecordVO extends PhysicRecord { public class PhysicRecordVO extends PhysicRecord {
private String createName; private String createName;
private List<Long> prescriptionImages;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment