Browse Source

修改系统审批功能

lwx_dev
erdanergou 3 years ago
parent
commit
e9f2559b9c
  1. 4
      src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
  2. 2
      src/test/java/com/dreamchaser/depository_manage/OtherTest.java

4
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));

2
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);
}

Loading…
Cancel
Save