diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/approval/strategy/impl/EquipmentScrapCallback.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/approval/strategy/impl/EquipmentScrapCallback.java index 5adac45..eac7e0c 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/approval/strategy/impl/EquipmentScrapCallback.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/approval/strategy/impl/EquipmentScrapCallback.java @@ -56,13 +56,14 @@ public class EquipmentScrapCallback implements IApprovalCallback { // 4. 调用原有的审批业务逻辑 AjaxResult result = toBeScrapService.auditData(bean); - + if (result.get("code").equals(200)) { log.info("设备报废审批通过,业务逻辑执行成功,业务ID:{}", instance.getBusinessId()); } else { log.error("设备报废审批通过,但业务逻辑执行失败,业务ID:{},错误信息:{}", instance.getBusinessId(), result.get("msg")); + throw new RuntimeException("报废业务逻辑执行失败:" + result.get("msg")); } - + } catch (Exception e) { log.error("设备报废审批通过回调执行失败,业务ID:{}", instance.getBusinessId(), e); throw new RuntimeException("审批通过回调执行失败:" + e.getMessage()); diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/service/impl/BackChangeServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/service/impl/BackChangeServiceImpl.java index 65af4f7..1632047 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/service/impl/BackChangeServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/service/impl/BackChangeServiceImpl.java @@ -404,7 +404,7 @@ public class BackChangeServiceImpl implements BackChangeService { } // 判断在用数量是否有为0的,若有,不予审核通过 if (csDeviceDetails.getUseNum().compareTo(BigDecimal.ZERO) == 0) { - return AjaxResult.warn("该条单据中存在在用数量为0的设备,无法审核通过,请驳回后进行修改"); + throw new RuntimeException("该条单据中存在在用数量为0的设备,无法审核通过,请驳回后进行修改"); } } } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeServiceImpl.java index 3f8b030..4efcbf6 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeServiceImpl.java @@ -518,10 +518,14 @@ public class DevChangeServiceImpl implements DevChangeService { * @return */ @Override + @Transactional(rollbackFor = Exception.class) public AjaxResult approve(CsDeviceInfo csDeviceInfo) { csDeviceInfo.setUpdateBy(SecurityUtils.getLoginUser().getUserid().toString()); int num = mapper.approve(csDeviceInfo); - return num > 0 ? AjaxResult.success("审核成功") : AjaxResult.error("审核失败"); + if (num <= 0) { + throw new RuntimeException("审核失败,更新数据库失败"); + } + return AjaxResult.success("审核成功"); } /** diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/scrap/service/impl/ToBeScrapServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/scrap/service/impl/ToBeScrapServiceImpl.java index 9bdf5e4..4f86ae9 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/scrap/service/impl/ToBeScrapServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/scrap/service/impl/ToBeScrapServiceImpl.java @@ -55,7 +55,7 @@ public class ToBeScrapServiceImpl implements ToBeScrapService { public AjaxResult auditData(ToBeScrap bean) { try { if (Objects.isNull(bean)) { - return AjaxResult.error("请求参数异常!"); + throw new ServiceException("请求参数异常!"); } if (Objects.isNull(bean.getId())) { throw new ServiceException("任务ID不能为空");