From e9f2559b9c1d6a7a6a496c0a91fd6831dc871dc8 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Fri, 14 Apr 2023 15:33:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DepositoryRecordServiceImpl.java | 4 ++-- .../java/com/dreamchaser/depository_manage/OtherTest.java | 2 +- 2 files changed, 3 insertions(+), 3 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 f366b7ef..8f60c875 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 @@ -2441,7 +2441,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 将主订单插入到redis中 redisTemplate.opsForHash().put("record:" + recordP.getId(), "minRecord", minRecordByMain.toString()); map.put("state", "仓储中心负责人审核通过"); - if (flagForDepartmentHeadPass) { + if (flagForDepartmentHeadPass || flagForOpenDepository == 2) { map.put("state", "部门负责人审核通过"); map.put("departmentheadTime", DateUtil.DateTimeToTimeStamp(simpleTime)); map.put("depositoryManagerPass", 4); @@ -2455,7 +2455,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { map.put("depositoryManagerPass", 2); map.put("pass", 2); map.put("state", "仓储中心负责人审核未通过"); - if (flagForDepartmentHeadPass) { + if (flagForDepartmentHeadPass || flagForOpenDepository == 2) { map.put("departmentheadPass", 2); map.put("state", "部门负责人审核未通过"); map.put("departmentheadTime", DateUtil.DateTimeToTimeStamp(simpleTime)); diff --git a/src/test/java/com/dreamchaser/depository_manage/OtherTest.java b/src/test/java/com/dreamchaser/depository_manage/OtherTest.java index f86ed324..2f2be389 100644 --- a/src/test/java/com/dreamchaser/depository_manage/OtherTest.java +++ b/src/test/java/com/dreamchaser/depository_manage/OtherTest.java @@ -36,7 +36,7 @@ public class OtherTest { approver.setUserId("PangFuZhen"); finalApprovalInfo_details.setApprover(approver); int flagForDepository = 2; - depositoryRecordService.reviewByQyWxApprovalOut("1", finalApprovalInfo_details, "0a7ffa452096d330934052105a67794a", "2", "202304140032", true, flagForDepository); + depositoryRecordService.reviewByQyWxApprovalOut("1", finalApprovalInfo_details, "0a7ffa452096d330934052105a67794a", "2", "202304140032", false, flagForDepository); }