From c1fe70180f3dedaccdfca61c131187f48cbf218b Mon Sep 17 00:00:00 2001
From: Harry Yang <i.take.today@gmail.com>
Date: Tue, 3 Jan 2023 20:16:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=92=A4=E5=9B=9E=E6=8C=89=E9=92=AE=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=91=E8=B5=B7=E4=BA=BA=E5=92=8Cadmin=E5=8F=AF=E8=A7=81?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=91=E8=B5=B7=E4=BA=BA=E5=9C=A8=E7=AC=AC=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=B2=A1=E6=9C=89=E5=AE=A1=E6=A0=B8=E7=9A=84?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E5=8F=AF=E4=BB=A5=E6=92=A4=E5=9B=9E?=
 =?UTF-8?q?=EF=BC=8Cadmin=E5=9C=A8=E4=BB=BB=E6=84=8F=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E9=83=BD=E8=83=BD=E6=92=A4=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/backend/ProcessController.java     | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
index 4be9c11..4e408bb 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
@@ -655,6 +655,11 @@ public class ProcessController {
       if (!Objects.equals(admin.getId(), applyPersonId)) {
         throw ErrorMessageException.failed("流程不属于自己");
       }
+      List<ProjectTaskRecord> projectTaskRecords = getProjectTaskRecords(id, process.getProcessType());
+      if (projectTaskRecords.size() > 1) {
+        // 有多个人审核过
+        throw ErrorMessageException.failed("流程已经在审核中，不能撤回");
+      }
       processService.revoke(id);
     }
   }
@@ -690,10 +695,9 @@ public class ProcessController {
 //    ret.add(create("2021-02-03 22:01:12", "系统产品集成部尹浩审核已通过"));
 //    ret.add(create("2021-03-03 22:05:12", "财务部主管何丹审核已通过"));
 
-    ProjectProcess process = processService.getById(id);
+    ProjectProcess process = obtainProjectProcess(id);
     ProcessType processType = process.getProcessType();
-    List<ProjectTaskRecord> projectTaskRecords = projectTaskRecordService.listV2(id,
-            processType == ProcessType.sale_contract ? ActProjectTypeEnum.SALE_CONTRACT : ActProjectTypeEnum.BUSINESS_PURCHASE);
+    List<ProjectTaskRecord> projectTaskRecords = getProjectTaskRecords(id, processType);
     SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
     return projectTaskRecords.stream()
             .map(item -> {
@@ -702,6 +706,11 @@ public class ProcessController {
             }).collect(Collectors.toList());
   }
 
+  private List<ProjectTaskRecord> getProjectTaskRecords(int id, ProcessType processType) {
+    return projectTaskRecordService.listV2(id,
+            processType == ProcessType.sale_contract ? ActProjectTypeEnum.SALE_CONTRACT : ActProjectTypeEnum.BUSINESS_PURCHASE);
+  }
+
   private Map<String, String> create(String timestamp, String content) {
     Map<String, String> map = new HashMap<>();
     map.put("content", content);