From b96b8fceafe697d326cd0071504b0dfd19a9eb14 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 26 Sep 2023 15:56:11 +0800
Subject: [PATCH] feat:补充提交
---
screen-api/src/main/resources/application-qa.yml | 1 +
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 11 +++++++----
2 files changed, 8 insertions(+), 4 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 1272b6e..e61cd98 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
@@ -124,6 +124,9 @@
if(Objects.nonNull(allocationCond.getEscalationUnitId())&&allocationCond.getEscalationUnitId().toString().length()==6) {
allocation.setEscalationType(AllocationEscalationTypeEnum.CHECK.getValue());
}
+ if(AllocationApproveEnum.NEW_BUILT.value.equals(allocationCond.getState())) {
+ allocation.setState(AllocationApproveEnum.UNDER_RECTIFICATION.value);
+ }
//������������������
allocationMapper.insert(allocation);
redisTemplate.opsForValue().set(RedisConstants.JBD_DATA,i);
@@ -283,8 +286,8 @@
@Transactional
public void changeAllocation(AllocationChangeCond changeCond) {
AllocationExt allocationExt = oneAllocation(changeCond.getAllocationId());
- if(!AllocationApproveEnum.NEW_BUILT.value.equals(allocationExt.getState())) {
- throw new BusinessException("������������������������������������");
+ if(!AllocationApproveEnum.UNDER_RECTIFICATION.value.equals(allocationExt.getState())) {
+ throw new BusinessException("������������������������������������");
}
Allocation allocation = new Allocation();
allocation.setAllocationId(changeCond.getAllocationId());
@@ -308,8 +311,8 @@
@Transactional
public void checkAllocation(AllocationCheckCond checkCond) {
AllocationExt allocationExt = oneAllocation(checkCond.getAllocationId());
- if(!AllocationApproveEnum.UNDER_RECTIFICATION.value.equals(allocationExt.getState())) {
- throw new BusinessException("������������������������������������");
+ if(!AllocationApproveEnum.IN_APPROVAL.value.equals(allocationExt.getState())) {
+ throw new BusinessException("������������������������������������������");
}
QxUser qxUser = UserHelper.getCurrentUser();
Allocation allocation = new Allocation();
diff --git a/screen-api/src/main/resources/application-qa.yml b/screen-api/src/main/resources/application-qa.yml
index 589ed97..6777caa 100644
--- a/screen-api/src/main/resources/application-qa.yml
+++ b/screen-api/src/main/resources/application-qa.yml
@@ -128,6 +128,7 @@
- /webjars/**
- /verificationCode/**
- /static/**
+ - /doc.html
- /file/preview/**
--
Gitblit v1.8.0