From 7d90f6d351cf2f0800151dd3a6119621e4975616 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 28 Sep 2023 14:33:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 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 f9990f9..b363f05 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
@@ -68,6 +68,7 @@
@Slf4j
public class AllocationServiceImpl extends ServiceImpl<AllocationMapper, Allocation> implements AllocationService {
+ private final Integer NEW_BUILT = 10;
@Autowired
private SysDictTypeMapper sysDictTypeMapper;
@Autowired
@@ -145,19 +146,19 @@
if(Objects.nonNull(allocationCond.getEscalationUnitId())&&allocationCond.getEscalationUnitId().toString().length()==6) {
allocation.setEscalationType(AllocationEscalationTypeEnum.CHECK.getValue());
}
- if(AllocationApproveEnum.NEW_BUILT.value.equals(allocationCond.getState())) {
+ if(NEW_BUILT.equals(allocationCond.getState())) {
allocation.setState(AllocationApproveEnum.UNDER_RECTIFICATION.value);
}
//������������������
allocationMapper.insert(allocation);
redisTemplate.opsForValue().set(RedisConstants.JBD_DATA,i);
- if(AllocationApproveEnum.NEW_BUILT.value.equals(allocationCond.getState())) {
+ if(NEW_BUILT.equals(allocationCond.getState())) {
//������������������
ApproveTable approveTable = new ApproveTable();
approveTable.setRelationId(allocation.getAllocationId());
- approveTable.setState(AllocationApproveEnum.NEW_BUILT.value);
+ approveTable.setState(NEW_BUILT);
approveTable.setApproveModule(FileTableEnum.ALLOCATION_FOUNDATION.value);
- approveTable.setStateName(AllocationApproveEnum.NEW_BUILT.name);
+ approveTable.setStateName("������");
approveTableService.saveResult(approveTable);
}
fileTableService.upDateResult(allocationCond.getFileBaseList(),allocation.getAllocationId(), FileTableEnum.ALLOCATION_FOUNDATION.value);
@@ -181,16 +182,16 @@
if(Objects.nonNull(allocationUpdateCond.getEscalationUnitId())&&allocationUpdateCond.getEscalationUnitId().toString().length()==6) {
allocation.setEscalationType(AllocationEscalationTypeEnum.CHECK.getValue());
}
- if(AllocationApproveEnum.NEW_BUILT.value.equals(allocationUpdateCond.getState())) {
+ if(NEW_BUILT.equals(allocationUpdateCond.getState())) {
//������������������
ApproveTable approveTable = new ApproveTable();
approveTable.setRelationId(allocation.getAllocationId());
- approveTable.setState(AllocationApproveEnum.NEW_BUILT.value);
+ approveTable.setState(NEW_BUILT);
approveTable.setApproveModule(FileTableEnum.ALLOCATION_FOUNDATION.value);
- approveTable.setStateName(AllocationApproveEnum.NEW_BUILT.name);
+ approveTable.setStateName("������");
approveTableService.saveResult(approveTable);
}
- if(AllocationApproveEnum.NEW_BUILT.value.equals(allocationUpdateCond.getState())) {
+ if(NEW_BUILT.equals(allocationUpdateCond.getState())) {
allocation.setState(AllocationApproveEnum.UNDER_RECTIFICATION.value);
}
fileTableService.upDateResult(allocationUpdateCond.getFileBaseList(),allocation.getAllocationId(), FileTableEnum.ALLOCATION_FOUNDATION.value);
@@ -270,7 +271,7 @@
String state = allocation.getState()+"";
if (state.equals("40")||state.equals("50")){
complete++;
- }else if(state.equals("10")||state.equals("20") ||state.equals("30")) {
+ }else {
unComplete++;
}
}
@@ -356,9 +357,9 @@
rsMap.put("unitView",allocationUnitViewDtos);
//������
rsMap.put("total",allocations.size());
- //���������
+ //���������
rsMap.put("complete",complete);
- //������������
+ //���������
rsMap.put("unComplete",unComplete);
//������
rsMap.put("overdue",overdue);
--
Gitblit v1.8.0