Commit 4e85ba7d authored by alex yao's avatar alex yao

fix: 修复审核单异常信息

parent 7be07740
......@@ -30,7 +30,7 @@ public interface ApprovalService {
* @param approvalProfessionalId 审批人ID
* @return 审批单状态
*/
String updateStatus(Long approvalId, ApprovalEnum.ApprovalStatusEnum approvalStatus, Long approvalProfessionalId);
String updateStatus(Long approvalId, ApprovalEnum.ApprovalStatusEnum approvalStatus, Long approvalProfessionalId) throws Exception;
/**
* 删除审批单
......@@ -38,7 +38,7 @@ public interface ApprovalService {
* @param approvalId 审批单ID
* @param userId 用户ID
*/
void delete(Long approvalId, Long userId);
void delete(Long approvalId, Long userId) throws Exception;
/**
* 获取审批单详情
......@@ -46,7 +46,7 @@ public interface ApprovalService {
* @param approvalId 审批单ID
* @return 审批单详情
*/
BizApprovalDto getDetail(Long approvalId);
BizApprovalDto getDetail(Long approvalId) throws Exception;
/**
......
......@@ -61,49 +61,35 @@ public class ApprovalServiceImpl implements ApprovalService {
}
@Override
public String updateStatus(Long approvalId, ApprovalEnum.ApprovalStatusEnum approvalStatus, Long approvalProfessionalId) {
try {
BizApprovalEntity bizApprovalEntity = bizApprovalService.get(approvalId);
if (bizApprovalEntity == null) {
throw new BusinessException("审批单不存在");
}
bizApprovalEntity.setApprovalStatus(approvalStatus.getCode());
bizApprovalEntity.setApprovalProfessional(approvalProfessionalId);
bizApprovalService.update(bizApprovalEntity);
return approvalStatus.getCode();
} catch (Exception e) {
logger.error("Update Approval Status Error", e);
throw new BusinessException("更新审批单状态失败");
public String updateStatus(Long approvalId, ApprovalEnum.ApprovalStatusEnum approvalStatus, Long approvalProfessionalId) throws Exception {
BizApprovalEntity bizApprovalEntity = bizApprovalService.get(approvalId);
if (bizApprovalEntity == null) {
throw new BusinessException("审批单不存在");
}
bizApprovalEntity.setApprovalStatus(approvalStatus.getCode());
bizApprovalEntity.setApprovalProfessional(approvalProfessionalId);
bizApprovalService.update(bizApprovalEntity);
return approvalStatus.getCode();
}
@Override
public void delete(Long approvalId, Long userId) {
try {
BizApprovalEntity bizApprovalEntity = bizApprovalService.get(approvalId);
if (bizApprovalEntity == null) {
throw new BusinessException("审批单不存在");
}
bizApprovalService.deletedById(approvalId);
} catch (Exception e) {
logger.error("Delete Approval Error", e);
throw new BusinessException("审批单删除失败");
public void delete(Long approvalId, Long userId) throws Exception {
BizApprovalEntity bizApprovalEntity = bizApprovalService.get(approvalId);
if (bizApprovalEntity == null) {
throw new BusinessException("审批单不存在");
}
bizApprovalService.deletedById(approvalId);
}
@Override
public BizApprovalDto getDetail(Long approvalId) {
try {
BizApprovalEntity bizApprovalEntity = bizApprovalService.get(approvalId);
if (bizApprovalEntity == null) {
throw new BusinessException("审批单不存在");
}
return BizApprovalConvert.entityToDto(bizApprovalEntity);
} catch (Exception e) {
logger.error("Delete Approval Error", e);
throw new BusinessException("审批单删除失败");
public BizApprovalDto getDetail(Long approvalId) throws Exception {
BizApprovalEntity bizApprovalEntity = bizApprovalService.get(approvalId);
if (bizApprovalEntity == null) {
throw new BusinessException("审批单不存在");
}
return BizApprovalConvert.entityToDto(bizApprovalEntity);
}
@Override
......
......@@ -28,17 +28,17 @@ public interface ApprovalRest extends BaseRest {
/**
* 更新审批状态
*/
String updateStatus(@RequestBody BizApprovalDto dto);
String updateStatus(@RequestBody BizApprovalDto dto) throws Exception;
/**
* 删除审批单
*/
void delete(@RequestParam Long approvalId);
void delete(@RequestParam Long approvalId) throws Exception;
/**
* 获取审批单详情
*/
BizApprovalDto getDetail(@RequestParam Long approvalId);
BizApprovalDto getDetail(@RequestParam Long approvalId) throws Exception;
/**
......
......@@ -43,7 +43,7 @@ public class ApprovalRestImpl implements ApprovalRest {
}
@Override
public String updateStatus(BizApprovalDto dto) {
public String updateStatus(BizApprovalDto dto) throws Exception {
Assert.notNull(dto, "approvalDto can not be null");
Assert.notNull(dto.getApprovalStatus(), "approval status can not be null");
Assert.notNull(dto.getId(), "id can not be null");
......@@ -61,7 +61,7 @@ public class ApprovalRestImpl implements ApprovalRest {
}
@Override
public void delete(Long approvalId) {
public void delete(Long approvalId) throws Exception {
Assert.notNull(approvalId, "approvalId can not be null");
UserBaseEntity userBaseEntity = BlContext.getCurrentUserNotException();
if (userBaseEntity == null) {
......@@ -71,7 +71,7 @@ public class ApprovalRestImpl implements ApprovalRest {
}
@Override
public BizApprovalDto getDetail(Long approvalId) {
public BizApprovalDto getDetail(Long approvalId) throws Exception {
Assert.notNull(approvalId, "approvalId can not be null");
return approvalService.getDetail(approvalId);
}
......
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 to comment