From ee8dd54a53f150aef05b846fddd14879f1bd9c10 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Thu, 8 Jun 2023 14:46:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E5=BF=83=E4=BB=93?= =?UTF-8?q?=E4=B8=8B=E7=9A=84=E5=8A=9E=E5=85=AC=E7=94=A8=E5=93=81=E5=BA=93?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=94=B3=E8=AF=B7=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DepositoryRecordServiceImpl.java | 6 ++---- .../java/com/dreamchaser/depository_manage/SomeTest.java | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java index 521c6833..5b3c6e9b 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java @@ -2505,8 +2505,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (flagForDepartmentHeadPass || flagForOpenDepository == 2) { map.put("state", userByPort.getName() + "审核通过"); map.put("depositoryManagerPass", 4); - String departmenthead = recordP.getDepartmenthead(); - if (departmenthead == null) { + if ("0".equals(departmentheadTime)) { map.put("departmenthead", userByPort.getId()); map.put("departmentheadPass", 1); map.put("departmentheadTime", DateUtil.DateTimeToTimeStamp(simpleTime)); @@ -2522,8 +2521,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (flagForDepartmentHeadPass || flagForOpenDepository == 2) { map.put("state", userByPort.getName() + "审核未通过"); map.put("depositoryManagerPass", 4); - String departmenthead = recordP.getDepartmenthead(); - if (departmenthead == null) { + if ("0".equals(departmentheadTime)) { map.put("departmentheadPass", 2); map.put("departmentheadTime", DateUtil.DateTimeToTimeStamp(simpleTime)); diff --git a/src/test/java/com/dreamchaser/depository_manage/SomeTest.java b/src/test/java/com/dreamchaser/depository_manage/SomeTest.java index 6267775c..d25f2243 100644 --- a/src/test/java/com/dreamchaser/depository_manage/SomeTest.java +++ b/src/test/java/com/dreamchaser/depository_manage/SomeTest.java @@ -243,7 +243,7 @@ public class SomeTest { ApprovalInfo approvalInfo = new ApprovalInfo(); approvalInfo.setTemplateId("3WKiKVCzyLv3Y1LaHZxp4DimQEpCdvYP52HsAUtF"); - approvalInfo.setSpNo("202306080014"); + approvalInfo.setSpNo("202306080008"); // 模拟第一个节点（部门负责人） @@ -301,8 +301,8 @@ public class SomeTest { spRecord_list.add(asr1); - spRecord_list.add(asr2); - spRecord_list.add(asr3); +// spRecord_list.add(asr2); +// spRecord_list.add(asr3); spRecord_list.add(asr4); approvalInfo.setSpRecord(spRecord_list);