Dlp-Gyjd/dlp-entrustment
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提供自动认领的功能

Browse Source
This commit is contained in:
杨海航
2025-02-19 17:45:55 +08:00
parent 481d0c53c9
commit 4acb10b72d
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java
View File

@@ -521,9 +521,14 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
throw new RuntimeException("委托不在待审核状态"); throw new RuntimeException("委托不在待审核状态");
} }
if (!dlpUser.getId().equals(entrustment.getCheckClaimUser())) { // 这里做一下优化，因为我们要去掉委托认领的功能，所以只要当前用户在审核人列表中，就可以进行操作
String uName = this.getUserNameByEntrustUserID(entrustment.getCheckClaimUser()); // if (!dlpUser.getId().equals(entrustment.getCheckClaimUser())) {
throw new RuntimeException(String.format("委托的审核任务是由其他人认领的。认领用户是: %s", uName)); // String uName = this.getUserNameByEntrustUserID(entrustment.getCheckClaimUser());
// throw new RuntimeException(String.format("委托的审核任务是由其他人认领的。认领用户是: %s", uName));
// }
if (!dlpUser.getId().equals(entrustment.getCheckCandidateUser())) {
throw new RuntimeException(String.format("你不在可以审核的用户列表中!"));
} }
//------------------- //-------------------

15
src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
View File

@@ -1470,9 +1470,13 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
throw new RuntimeException(String.format("没有找到 id 为 %s 的委托", entrust.getId())); throw new RuntimeException(String.format("没有找到 id 为 %s 的委托", entrust.getId()));
} }
if (!dlpUser.getId().equals(entrustment.getCheckClaimUser())) { // 这里修改一下，我们要去掉委托认领的功能，所以只要用户是在审核列表中的，就可以进行审核操作
throw new RuntimeException(String.format("委托的审核任务是由其他人认领的。认领用户是: %s", entrustment.getCheckClaimUser())); if (!dlpUser.getId().equals(entrustment.getCheckCandidateUser())) {
throw new RuntimeException("你不在可以审核的用户列表当中!");
} }
// if (!dlpUser.getId().equals(entrustment.getCheckClaimUser())) {
// throw new RuntimeException(String.format("委托的审核任务是由其他人认领的。认领用户是: %s", entrustment.getCheckClaimUser()));
// }
if (entrustment.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK.getStatus()) { if (entrustment.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK.getStatus()) {
throw new RuntimeException("委托不在待审核状态"); throw new RuntimeException("委托不在待审核状态");
@@ -1717,9 +1721,12 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
throw new RuntimeException(String.format("没有找到 id 为 %s 的委托", entrust.getId())); throw new RuntimeException(String.format("没有找到 id 为 %s 的委托", entrust.getId()));
} }
if (!dlpUser.getId().equals(entrustment.getApproveClaimUser())) { if (!dlpUser.getId().equals(entrustment.getCheckCandidateUser())) {
throw new RuntimeException(String.format("委托的审批任务是由其他人认领的。认领用户是: %s", entrustment.getCheckClaimUser())); throw new RuntimeException("你不在可以进行审批的用户列表中!");
} }
// if (!dlpUser.getId().equals(entrustment.getApproveClaimUser())) {
// throw new RuntimeException(String.format("委托的审批任务是由其他人认领的。认领用户是: %s", entrustment.getCheckClaimUser()));
// }
if (entrustment.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_APPROVE.getStatus()) { if (entrustment.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_APPROVE.getStatus()) {
throw new RuntimeException("委托不在待审批状态"); throw new RuntimeException("委托不在待审批状态");