From 5c1d58556e9cd4c7603b5e16dc1640f61623af0b Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 08 Nov 2023 11:47:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
index 47558bc..8faee43 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
@@ -126,7 +126,7 @@
//������
String allocationNum = "JBD-" + dateString + String.format("%04d", i);
allocation.setAllocationNum(allocationNum);
- if(Objects.nonNull(allocationCond.getEscalationUnitId())&& escalationType(allocationCond.getEscalationUnitId())) {
+ if(Objects.nonNull(allocationCond.getEscalationUnitId())&& !allocationCond.getEscalationUnitId().equals(allocationCond.getUnitId()) && escalationType(allocationCond.getEscalationUnitId())) {
allocation.setEscalationType(AllocationEscalationTypeEnum.CHECK.getValue());
}
if(NEW_BUILT.equals(allocationCond.getState())) {
@@ -137,7 +137,7 @@
//������������
userService.pushOneUser(allocation);
redisTemplate.opsForValue().set(RedisConstants.JBD_DATA,i);
- if(NEW_BUILT.equals(allocationCond.getState())) {
+ if(NEW_BUILT.equals(allocationCond.getState())||AllocationApproveEnum.UNDER_RECTIFICATION.value.equals(allocationCond.getState())) {
//������������������
ApproveTable approveTable = new ApproveTable();
approveTable.setRelationId(allocation.getAllocationId());
@@ -794,9 +794,12 @@
//������������������
ApproveTable approveTable = new ApproveTable();
approveTable.setRelationId(allocation.getAllocationId());
+ approveTable.setApproveModule(FileTableEnum.ALLOCATION_FOUNDATION.value);
+ /* approveTable.setState(NEW_BUILT);
+ approveTable.setStateName("������");
+ approveTableService.saveResult(approveTable);*/
approveTable.setState(AllocationApproveEnum.UNDER_RECTIFICATION.value);
approveTable.setStateName(AllocationApproveEnum.UNDER_RECTIFICATION.name);
- approveTable.setApproveModule(FileTableEnum.ALLOCATION_FOUNDATION.value);
approveTableService.saveResult(approveTable);
fileTableService.upDateResult(changeCond.getFileChangeList(),allocation.getAllocationId(), FileTableEnum.ALLOCATION_RECTIFICATION.value);
}
--
Gitblit v1.8.0