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 c2d5461..5adac45 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 @@ -49,8 +49,9 @@ public class EquipmentScrapCallback implements IApprovalCallback { // 3. 将所有明细的审批状态设置为"通过" if (bean.getToBeScrapList() != null) { for (ToBeScrap detail : bean.getToBeScrapList()) { - detail.setReviewStatus("1"); // 1-通过 + detail.setReviewStatus("2"); // 2-通过 } + bean.setReviewStatus("2"); } // 4. 调用原有的审批业务逻辑 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 cfaba14..47b3d64 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 @@ -54,9 +54,6 @@ public class ToBeScrapServiceImpl implements ToBeScrapService { if (Objects.isNull(bean)) { return AjaxResult.error("请求参数异常!"); } - if (!StrUtil.equalsAny(bean.getReviewStatus(), "1", "2")) { - throw new ServiceException("审批状态异常"); - } if (Objects.isNull(bean.getId())) { throw new ServiceException("任务ID不能为空"); } @@ -69,9 +66,7 @@ public class ToBeScrapServiceImpl implements ToBeScrapService { String username = SecurityUtils.getLoginUser().getSysUser().getNickName(); Long userId = SecurityUtils.getLoginUser().getUserid(); - for (ToBeScrap toBeScrap : toBeScrapList) { - toBeScrap.setReviewStatus(bean.getReviewStatus()); toBeScrap.setCreateUser(username); if (StrUtil.isNotBlank(toBeScrap.getReviewStatus())) { int res = scrapMapper.auditData(toBeScrap); @@ -79,7 +74,7 @@ public class ToBeScrapServiceImpl implements ToBeScrapService { throw new ServiceException("数据审批失败,修改0条明细"); } // 如果是审批通过,需要增加周期表数据以及更新台账信息 - if (Objects.equals("1", toBeScrap.getReviewStatus())) { + if (Objects.equals("2", bean.getReviewStatus())) { if (Objects.equals("工具", toBeScrap.getType())) { // 根据typeId和code查询台账信息 ToBeScrap bean1 = scrapMapper.selectByTypeIdAndCode(toBeScrap); @@ -120,7 +115,12 @@ public class ToBeScrapServiceImpl implements ToBeScrapService { throw new ServiceException("审批状态为空,请检查!"); } } - // 明细审核完成后,根据审批数量去修改外层任务状态 + // 修改主任务状态 + int res = scrapMapper.updateChangeStatus(bean.getId(), bean.getReviewStatus()); + if (res < 1) { + throw new ServiceException("更新任务状态失败"); + } + /*// 明细审核完成后,根据审批数量去修改外层任务状态 int pendingReviewCount = scrapMapper.selectCountByChangeId(bean.getId()); if (pendingReviewCount > 0) { int res = scrapMapper.updateChangeStatus(bean.getId(), "1"); @@ -132,7 +132,7 @@ public class ToBeScrapServiceImpl implements ToBeScrapService { if (res < 1) { throw new ServiceException("更新任务状态失败"); } - } + }*/ return AjaxResult.success("审批成功"); } catch (Exception e) {