diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustAlterApplyController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustAlterApplyController.java index 47360a8..f2edac9 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustAlterApplyController.java +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustAlterApplyController.java @@ -43,7 +43,13 @@ public class EntrustAlterApplyController { @PostMapping("/save") @PreAuthorize("@pms.hasPermission('EntrustAlterApplySubmit')") // 委托申请修改消息保存提交权限 public R save(@RequestBody @Valid EntrustAlterApplyDTO dto) { - EntrustAlterApplyVO vo = entrustAlterApplyService.save(dto); + EntrustAlterApplyVO vo = null; + try { + vo = entrustAlterApplyService.save(dto); + } catch (Exception e) { + e.printStackTrace(); + return R.failed(e.getMessage()); + } return R.ok(vo); } @@ -70,4 +76,6 @@ public class EntrustAlterApplyController { Boolean success = entrustAlterApplyService.delete(ids); return R.ok(success).setMsg(success ? "审核成功" : "审核失败"); } + + } diff --git a/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustAlterApply.java b/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustAlterApply.java index a619718..612ebcf 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustAlterApply.java +++ b/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustAlterApply.java @@ -53,7 +53,7 @@ public class EntrustAlterApply extends BaseEntity { private String reviewer; /** - * 状态 === 0 待提交申请, 1 提交申请待审核,2申请通过,-1 申请不通过 + * 状态 === 0 待提交申请, 1 提交申请待审核,2申请通过,-1 申请不通过,9 申请已完成 */ private Integer status; diff --git a/src/main/java/digital/laboratory/platform/entrustment/enums/EntrustAlterApplyStatus.java b/src/main/java/digital/laboratory/platform/entrustment/enums/EntrustAlterApplyStatus.java index d606b20..c318057 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/enums/EntrustAlterApplyStatus.java +++ b/src/main/java/digital/laboratory/platform/entrustment/enums/EntrustAlterApplyStatus.java @@ -9,6 +9,7 @@ public enum EntrustAlterApplyStatus { SUBMITTED_WAIT_APPROVE(1,"提交申请待审核"), APPLY_SUCCESS(2, "申请通过"), APPLY_FAIL(-1, "申请不通过"), + FINISHED(9, "已完成"), ; diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java index 60df118..781b9e7 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java @@ -1,5 +1,6 @@ package digital.laboratory.platform.entrustment.service.impl; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -22,6 +23,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.time.LocalDate; import java.util.List; +import java.util.stream.Collectors; /** * @author ChenJiangBao @@ -52,6 +54,15 @@ public class EntrustAlterApplyServiceImpl extends ServiceImpl preApplyInfo = super.list(Wrappers.lambdaQuery().eq(EntrustAlterApply::getEntrustId, dto.getEntrustId())); + if (CollUtil.isNotEmpty(preApplyInfo)) { + List unfinishedList = preApplyInfo.stream().filter(e -> !e.getStatus().equals(EntrustAlterApplyStatus.FINISHED.getStatus())).collect(Collectors.toList()); + if (CollUtil.isNotEmpty(unfinishedList)) { + throw new RuntimeException("该委托存在未完成的申请信息,请先完成其他申请后再进行申请修改!"); + } + } + EntrustAlterApply entrustAlterApply = new EntrustAlterApply(); if (StrUtil.isBlank(dto.getId())) { entrustAlterApply.setEntrustId(dto.getEntrustId()); diff --git a/src/main/java/digital/laboratory/platform/entrustment/vo/EntrustAlterApplyVO.java b/src/main/java/digital/laboratory/platform/entrustment/vo/EntrustAlterApplyVO.java index 441af49..1d13fcc 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/vo/EntrustAlterApplyVO.java +++ b/src/main/java/digital/laboratory/platform/entrustment/vo/EntrustAlterApplyVO.java @@ -79,15 +79,15 @@ public class EntrustAlterApplyVO { private String reviewerName; /** - * 状态 === 0 待提交申请, 1 提交申请待审核,2申请通过,-1 申请不通过 + * 状态 === 0 待提交申请, 1 提交申请待审核,2申请通过,-1 申请不通过,9 申请已完成 */ - @ApiModelProperty(value = "状态 === 0 待提交申请, 1 提交申请待审核,2申请通过,-1 申请不通过") + @ApiModelProperty(value = "状态 === 0 待提交申请, 1 提交申请待审核,2申请通过,-1 申请不通过,9 申请已完成") private Integer status; /** - * 状态名称 === 0 待提交申请, 1 提交申请待审核,2申请通过,-1 申请不通过 + * 状态名称 === 0 待提交申请, 1 提交申请待审核,2申请通过,-1 申请不通过,9 申请已完成 */ - @ApiModelProperty(value = "状态名称 === 0 待提交申请, 1 提交申请待审核,2申请通过,-1 申请不通过") + @ApiModelProperty(value = "状态名称 === 0 待提交申请, 1 提交申请待审核,2申请通过,-1 申请不通过,9 申请已完成") private String statusName; /**