|
@@ -5,6 +5,8 @@ import cn.iocoder.yudao.module.museums.controller.admin.specimeninfo.vo.Specimen
|
|
import cn.iocoder.yudao.module.museums.controller.admin.specimeninfo.vo.SpecimenInfoRespVO;
|
|
import cn.iocoder.yudao.module.museums.controller.admin.specimeninfo.vo.SpecimenInfoRespVO;
|
|
import cn.iocoder.yudao.module.museums.dal.dataobject.specimeninfo.SpecimenInfoDO;
|
|
import cn.iocoder.yudao.module.museums.dal.dataobject.specimeninfo.SpecimenInfoDO;
|
|
import cn.iocoder.yudao.module.museums.dal.mysql.specimeninfo.SpecimenInfoMapper;
|
|
import cn.iocoder.yudao.module.museums.dal.mysql.specimeninfo.SpecimenInfoMapper;
|
|
|
|
+import cn.iocoder.yudao.module.system.dal.mysql.user.AdminUserMapper;
|
|
|
|
+import cn.iocoder.yudao.module.system.service.user.AdminUserService;
|
|
import com.mzt.logapi.context.LogRecordContext;
|
|
import com.mzt.logapi.context.LogRecordContext;
|
|
import com.mzt.logapi.service.impl.DiffParseFunction;
|
|
import com.mzt.logapi.service.impl.DiffParseFunction;
|
|
import com.mzt.logapi.starter.annotation.LogRecord;
|
|
import com.mzt.logapi.starter.annotation.LogRecord;
|
|
@@ -27,6 +29,7 @@ import java.util.*;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
|
|
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
|
|
|
|
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
|
|
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserNickname;
|
|
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserNickname;
|
|
import static cn.iocoder.yudao.module.museums.enums.ErrorCodeConstants.*;
|
|
import static cn.iocoder.yudao.module.museums.enums.ErrorCodeConstants.*;
|
|
import static cn.iocoder.yudao.module.museums.enums.social.LogRecordConstants.*;
|
|
import static cn.iocoder.yudao.module.museums.enums.social.LogRecordConstants.*;
|
|
@@ -47,6 +50,9 @@ public class SpecimenOutboundServiceImpl implements SpecimenOutboundService {
|
|
@Resource
|
|
@Resource
|
|
private SpecimenInfoMapper specimenInfoMapper;
|
|
private SpecimenInfoMapper specimenInfoMapper;
|
|
|
|
|
|
|
|
+ @Resource
|
|
|
|
+ private AdminUserMapper adminUserMapper;
|
|
|
|
+
|
|
//创建出库申请
|
|
//创建出库申请
|
|
@Override
|
|
@Override
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@@ -118,8 +124,7 @@ public class SpecimenOutboundServiceImpl implements SpecimenOutboundService {
|
|
specimenOutbound.setStatus(req.getStatus());
|
|
specimenOutbound.setStatus(req.getStatus());
|
|
specimenOutbound.setProcessInstanceId(req.getProcessInstanceId());
|
|
specimenOutbound.setProcessInstanceId(req.getProcessInstanceId());
|
|
specimenOutbound.setApprovalTime(req.getApprovalTime()); // 设置当前审批时间
|
|
specimenOutbound.setApprovalTime(req.getApprovalTime()); // 设置当前审批时间
|
|
- specimenOutbound.setApproveUsers(getLoginUserNickname()); // 设置一审操作员
|
|
|
|
-
|
|
|
|
|
|
+ specimenOutbound.setApproveUsers(getLoginUserId()); // 设置一审操作员
|
|
}
|
|
}
|
|
|
|
|
|
// 二审逻辑
|
|
// 二审逻辑
|
|
@@ -133,7 +138,7 @@ public class SpecimenOutboundServiceImpl implements SpecimenOutboundService {
|
|
specimenOutbound.setStatus(req.getStatus());
|
|
specimenOutbound.setStatus(req.getStatus());
|
|
specimenOutbound.setRejectionReasons(req.getRejectionReasons());
|
|
specimenOutbound.setRejectionReasons(req.getRejectionReasons());
|
|
specimenOutbound.setTwoApprovalTime(req.getTwoApprovalTime()); // 设置当前审批时间
|
|
specimenOutbound.setTwoApprovalTime(req.getTwoApprovalTime()); // 设置当前审批时间
|
|
- specimenOutbound.setTwoApproveUsers(getLoginUserNickname()); // 设置二审操作员
|
|
|
|
|
|
+ specimenOutbound.setTwoApproveUsers(getLoginUserId()); // 设置二审操作员
|
|
}
|
|
}
|
|
LogRecordContext.putVariable("rejectionReasons", req.getRejectionReasons());
|
|
LogRecordContext.putVariable("rejectionReasons", req.getRejectionReasons());
|
|
LogRecordContext.putVariable("processInstanceId", req.getProcessInstanceId());
|
|
LogRecordContext.putVariable("processInstanceId", req.getProcessInstanceId());
|
|
@@ -183,14 +188,14 @@ public class SpecimenOutboundServiceImpl implements SpecimenOutboundService {
|
|
LogRecordContext.putVariable(DiffParseFunction.OLD_OBJECT, BeanUtils.toBean(specimenInfo, SpecimenOutboundSaveReqVO.class));
|
|
LogRecordContext.putVariable(DiffParseFunction.OLD_OBJECT, BeanUtils.toBean(specimenInfo, SpecimenOutboundSaveReqVO.class));
|
|
}
|
|
}
|
|
|
|
|
|
- //确认出库,已经简化
|
|
|
|
|
|
+ //确认出库
|
|
@Override
|
|
@Override
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@LogRecord(type = MUSEUMS_SPECIMEN_TYPE, subType = MUSEUMS_SPECIMEN_OUTBOUND_CONFIRM,
|
|
@LogRecord(type = MUSEUMS_SPECIMEN_TYPE, subType = MUSEUMS_SPECIMEN_OUTBOUND_CONFIRM,
|
|
bizNo = "{{#existingSpecimen.id}}", // 使用出库单 ID
|
|
bizNo = "{{#existingSpecimen.id}}", // 使用出库单 ID
|
|
success = MUSEUMS_SPECIMEN_CREATE_CONFIEM_OUTBOUND_SUCCESS,
|
|
success = MUSEUMS_SPECIMEN_CREATE_CONFIEM_OUTBOUND_SUCCESS,
|
|
extra = "{{#existingSpecimen.infoId}}") // 使用标本信息 ID
|
|
extra = "{{#existingSpecimen.infoId}}") // 使用标本信息 ID
|
|
- public String confirmOutbound(Long id, String operator) {
|
|
|
|
|
|
+ public String confirmOutbound(Long id, Long operator) {
|
|
// 校验存在
|
|
// 校验存在
|
|
validateSpecimenOutboundExists(id);
|
|
validateSpecimenOutboundExists(id);
|
|
// 获取当前标本的状态
|
|
// 获取当前标本的状态
|
|
@@ -273,20 +278,6 @@ public class SpecimenOutboundServiceImpl implements SpecimenOutboundService {
|
|
return specimenOutboundMapper.selectById(id);
|
|
return specimenOutboundMapper.selectById(id);
|
|
}
|
|
}
|
|
|
|
|
|
- //目前没用到
|
|
|
|
-// @Override
|
|
|
|
-// public SpecimenOutboundDO getSpecimenReturnInformation(Long id) {
|
|
|
|
-// // 获取标本出库回库信息
|
|
|
|
-// SpecimenOutboundDO specimenOutbound = specimenOutboundMapper.selectById(id);
|
|
|
|
-// // 检查审批状态是否为4(已回库)
|
|
|
|
-// if (specimenOutbound != null && specimenOutbound.getStatus() == 4) {
|
|
|
|
-// return specimenOutbound;
|
|
|
|
-// } else {
|
|
|
|
-// // 如果审批状态不是4,抛出异常
|
|
|
|
-// throw exception(NO_PERMISSION_VIEW_NON_RETURNED_SPECIMENS);
|
|
|
|
-// }
|
|
|
|
-// }
|
|
|
|
-
|
|
|
|
@Override
|
|
@Override
|
|
public PageResult<SpecimenOutboundDO> getSpecimenOutboundPage(SpecimenOutboundPageReqVO pageReqVO) {
|
|
public PageResult<SpecimenOutboundDO> getSpecimenOutboundPage(SpecimenOutboundPageReqVO pageReqVO) {
|
|
return specimenOutboundMapper.selectPage(pageReqVO);
|
|
return specimenOutboundMapper.selectPage(pageReqVO);
|
|
@@ -327,6 +318,15 @@ public class SpecimenOutboundServiceImpl implements SpecimenOutboundService {
|
|
PageResult<SpecimenInfoRespVO> pageResultVO = BeanUtils.toBean(pageResult, SpecimenInfoRespVO.class);
|
|
PageResult<SpecimenInfoRespVO> pageResultVO = BeanUtils.toBean(pageResult, SpecimenInfoRespVO.class);
|
|
// 创建返回对象
|
|
// 创建返回对象
|
|
SpecimenOutboundWithInfoRespVO response = BeanUtils.toBean(specimenOutbound, SpecimenOutboundWithInfoRespVO.class);
|
|
SpecimenOutboundWithInfoRespVO response = BeanUtils.toBean(specimenOutbound, SpecimenOutboundWithInfoRespVO.class);
|
|
|
|
+
|
|
|
|
+ // 获取出库员昵称并设置到返回对象
|
|
|
|
+ String operatorNickname = adminUserMapper.selectNicknameByUserId(specimenOutbound.getOperator());
|
|
|
|
+ String approveUsersNickname = adminUserMapper.selectNicknameByUserId(specimenOutbound.getApproveUsers());
|
|
|
|
+ String twoApproveUsersNickname = adminUserMapper.selectNicknameByUserId(specimenOutbound.getTwoApproveUsers());
|
|
|
|
+ response.setOperator(operatorNickname)
|
|
|
|
+ .setApproveUsers(approveUsersNickname)
|
|
|
|
+ .setTwoApproveUsers(twoApproveUsersNickname); // 设置操作员(出库员)的昵称
|
|
|
|
+
|
|
// 设置分页后的标本信息列表
|
|
// 设置分页后的标本信息列表
|
|
response.setSpecimenInfoList(pageResultVO);
|
|
response.setSpecimenInfoList(pageResultVO);
|
|
return response;
|
|
return response;
|